From 68a001075c3c850d5de800cb15365371d194e2fc Mon Sep 17 00:00:00 2001 From: Oleksiy Date: Sun, 23 Jul 2023 23:19:40 +0300 Subject: [PATCH] More UI stuff --- software/GToE/InputsCheck.ino | 9 ++++++++- software/GToE/UI.ino | 6 +++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/software/GToE/InputsCheck.ino b/software/GToE/InputsCheck.ino index 5ee9ee3..14405cb 100644 --- a/software/GToE/InputsCheck.ino +++ b/software/GToE/InputsCheck.ino @@ -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; diff --git a/software/GToE/UI.ino b/software/GToE/UI.ino index 7b8f0e7..0a325e7 100644 --- a/software/GToE/UI.ino +++ b/software/GToE/UI.ino @@ -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) {