oleksiy/GravityHW
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplified CV modulation menu (needs testing)

Browse Source
This commit is contained in:
Oleksiy
2023-08-22 23:15:36 +03:00
parent e51337abf2
commit 4c9a4e966f
2 changed files with 59 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Software/Gravity/UI.ino
View File

@ -133,7 +133,7 @@ void updateScreen() {
//Channel Tabs
else {
//Menu items
lastMenuItem = 4;
lastMenuItem = 3;
width = 32;
leftOffset = 62;
for (byte i = 1; i <= lastMenuItem; i++) {
@ -146,10 +146,8 @@ void updateScreen() {
} else if (i == 2 && channels[displayTab - 1].mode == 2) {
valueStr = "EDIT PATTERN";
} else if (i == 3) {
valueStr = "CV1:";
} else if (i == 4) {
valueStr = "CV2:";
}
valueStr = "MOD:";
}
valueStr.toCharArray(valueChar, 16);
if (menuItem == i && insideTab) {
u8g2.drawButtonUTF8(leftOffset, 8 + (i-1) *11, U8G2_BTN_BW1|U8G2_BTN_INV, width, 1, 2, valueChar );
@ -173,22 +171,12 @@ void updateScreen() {
valueStr = "/" + String(subDivs[channels[displayTab - 1].subDiv]);
} else if (i == 2 && channels[displayTab - 1].mode == 1 && subDivs[channels[displayTab - 1].subDiv] < 0) {
valueStr = "x" + String(abs(subDivs[channels[displayTab - 1].subDiv]));
} else if (i == 3 && channels[displayTab - 1].CV1Target == 0) { //CV1
} else if (i == 3 && channels[displayTab - 1].CV1Target == 0 && channels[displayTab - 1].CV2Target == 0) { //MOD
valueStr = "OFF";
} else if (i == 3 && channels[displayTab - 1].CV1Target == 1) {
valueStr = "SUBDIV";
} else if (i == 3 && channels[displayTab - 1].CV1Target == 2) {
valueStr = "RAND";
} else if (i == 3 && channels[displayTab - 1].CV1Target == 3) {
valueStr = "PATT";
} else if (i == 4 && channels[displayTab - 1].CV2Target == 0) { //CV2
valueStr = "OFF";
} else if (i == 4 && channels[displayTab - 1].CV2Target == 1) {
valueStr = "SUBDIV";
} else if (i == 4 && channels[displayTab - 1].CV2Target == 2) {
valueStr = "RAND";
} else if (i == 4 && channels[displayTab - 1].CV2Target == 3) {
valueStr = "PATT";
} else if (i == 3 && channels[displayTab - 1].CV1Target != 0 && channels[displayTab - 1].CV2Target == 0) {
valueStr = "CV1";
} else if (i == 3 && channels[displayTab - 1].CV1Target == 0 && channels[displayTab - 1].CV2Target != 0) {
valueStr = "CV2";
}
valueStr.toCharArray(valueChar, 16);