Oleksiy/GravityFW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

started adding swing and gate to UI

Browse Source
This commit is contained in:
Oleksiy
2024-10-17 19:39:39 +03:00
parent 5729650a34
commit c5b9ebe868
3 changed files with 49 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Software/Gravity/UI.ino
View File

@ -126,7 +126,7 @@ void updateScreen() {
valueStr = F("MODE:");
} else if (i == 2 && channels[displayTab - 1].mode == 0) {
valueStr = F("OFFSET:");
} else if (i == 2 && channels[displayTab - 1].mode == 1) {
} else if (i == 2 && (channels[displayTab - 1].mode == 1 || channels[displayTab - 1].mode == 4)) {
valueStr = F("SUBDIV:");
} else if (i == 2 && channels[displayTab - 1].mode == 2) {
valueStr = F("EDIT PATTERN");
@ -148,6 +148,10 @@ void updateScreen() {
valueStr = F("RAND");
} else if (i == 1 && channels[displayTab - 1].mode == 2) {
valueStr = F("SEQ");
} else if (i == 1 && channels[displayTab - 1].mode == 3) {
valueStr = F("SWING");
} else if (i == 1 && channels[displayTab - 1].mode == 4) {
valueStr = F("GATE");
} else if (i == 2 && channels[displayTab - 1].mode == 0) { //SubDiv and offset
valueStr = String(channels[displayTab - 1].offset) + F("/");
int PulsesPerStep;
@ -157,10 +161,10 @@ void updateScreen() {
PulsesPerStep = subDivs[channels[displayTab - 1].subDiv] * PPQN;
}
valueStr = valueStr + String(PulsesPerStep); //(playingModes[i] * PPQN) - 1 //String(channelPulsesPerCycle[displayTab-1]+1)
} else if (i == 2 && channels[displayTab - 1].mode == 1 && subDivs[channels[displayTab - 1].subDiv] > 0) {
} else if (i == 2 && (channels[displayTab - 1].mode == 1 || channels[displayTab - 1].mode == 4) && subDivs[channels[displayTab - 1].subDiv] > 0) {
valueStr = F("/");
valueStr = valueStr + String(subDivs[channels[displayTab - 1].subDiv]);
} else if (i == 2 && channels[displayTab - 1].mode == 1 && subDivs[channels[displayTab - 1].subDiv] < 0) {
} else if (i == 2 && (channels[displayTab - 1].mode == 1 || channels[displayTab - 1].mode == 4) && subDivs[channels[displayTab - 1].subDiv] < 0) {
valueStr = F("x");
valueStr = valueStr + String(abs(subDivs[channels[displayTab - 1].subDiv]));
} else if (i == 3 && channels[displayTab - 1].CV1Target == 0 && channels[displayTab - 1].CV2Target == 0) { //MOD
@ -195,7 +199,12 @@ void updateScreen() {
valueStr = F("SKIP CHANCE");
} else if (channels[displayTab - 1].mode == 2) {
valueStr = F("PATTERN");
}
} else if (channels[displayTab - 1].mode == 3) {
valueStr = F("SWING");
} else if (channels[displayTab - 1].mode == 4) {
valueStr = F("GATE");
}
if ((!insideTab && shiftBtnPushed) || (insideTab && menuItem == 0)) {
u8g2.drawButtonUTF8(leftOffset, 41, U8G2_BTN_BW1|U8G2_BTN_INV|U8G2_BTN_HCENTER, width, 0, 3, valueStr.c_str() );
} else {
@ -219,6 +228,10 @@ void updateScreen() {
valueStr = F("B");
valueStr = valueStr + String(channels[displayTab - 1].seqPattern - 7);
}
} else if (channels[displayTab - 1].mode == 3) {
valueStr = String(channels[displayTab - 1].swing) + "%";
} else if (channels[displayTab - 1].mode == 4) {
valueStr = String(channels[displayTab - 1].gate) + "%";
}
u8g2.setFont(stkL);
if ((!insideTab && shiftBtnPushed) || (insideTab && menuItem == 0 && (menuItemSelected || shiftBtnPushed))) {