More UI stuff

This commit is contained in:
2023-07-23 23:19:40 +03:00
parent ddce619aed
commit 68a001075c
2 changed files with 11 additions and 4 deletions

View File

@ -59,7 +59,14 @@ void checkInputs() {
} else if (menuItem > lastMenuItem) {
menuItem = lastMenuItem;
}
} else if (insideTab && shiftBtnPushed && displayTab !=0 && menuItem == 1) { //RANDOM
} else if (insideTab && shiftBtnPushed && displayTab == 0 && menuItem == 0) { //Master Clock Mode
masterClockMode = masterClockMode + change;
if (masterClockMode > 100) {
masterClockMode = 1;
} else if (masterClockMode > 1) {
masterClockMode = 0;
}
} else if (insideTab && shiftBtnPushed && displayTab != 0 && menuItem == 1) { //RANDOM
channels[displayTab - 1].random = channels[displayTab - 1].random + change;
if (channels[displayTab - 1].random > 1000) {
channels[displayTab - 1].random = 0;

View File

@ -124,7 +124,7 @@ void updateScreen() {
if (masterClockMode == 0) {
display.println(F("INT"));
} else if (masterClockMode == 1) {
display.println(F("EXT-24"));
display.println(F("EXT"));
}
if (masterClockMode == 0) {
if (menuItem == 1) {
@ -202,12 +202,12 @@ void updateScreen() {
display.print(" ");
}
display.println(bpm);
display.setCursor(21, 24);
display.setCursor(19, 26);
display.setTextSize(2);
display.println(F("BPM"));
} else if (displayTab == 0 && masterClockMode == 1) {
display.println(F(" 24"));
display.setCursor(8, 24);
display.setCursor(8, 26);
display.setTextSize(2);
display.println(F("PPQN"));
} else if (displayTab == 0 && masterClockMode == 2) {