From c79c8e4ae53ff1145258903197e44eecd0756e91 Mon Sep 17 00:00:00 2001 From: Oleksiy Date: Tue, 1 Aug 2023 23:44:22 +0300 Subject: [PATCH] Minor fixes in menus --- Software/Gravity/UI.ino | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/Software/Gravity/UI.ino b/Software/Gravity/UI.ino index a3dcd1e..69b1d7b 100644 --- a/Software/Gravity/UI.ino +++ b/Software/Gravity/UI.ino @@ -44,9 +44,9 @@ void updateScreen() { } else if ((menuItem != 0 || !insideTab) && masterClockMode == 0) { u8g2.drawButtonUTF8(62 + menuItemWidth + 4, 6, U8G2_BTN_BW0, valueWidth, 2, 2, "INT" ); } - if (menuItem == 0 && masterClockMode == 1) { + if (menuItem == 0 && insideTab && masterClockMode == 1) { u8g2.drawButtonUTF8(62 + menuItemWidth + 4, 6, U8G2_BTN_BW0|U8G2_BTN_INV, 30, 2, 2, "EXT" ); - } else if (menuItem != 0 && masterClockMode == 1) { + } else if ((menuItem != 0 || !insideTab) && masterClockMode == 1) { u8g2.drawButtonUTF8(62 + menuItemWidth + 4, 6, U8G2_BTN_BW0, valueWidth, 2, 2, "EXT" ); } @@ -76,18 +76,31 @@ void updateScreen() { } } - String bpmStr = String(bpm); + String bpmStr; + if (masterClockMode == 0) { + bpmStr = String(bpm); + } else if (masterClockMode == 1) { + bpmStr = "24"; + } char bpmChar[5]; bpmStr.toCharArray(bpmChar, 5); u8g2.setFont(u8g2_font_logisoso24_tn); if (!insideTab && shiftBtnPushed) { u8g2.drawButtonUTF8(28, 26, U8G2_BTN_BW1|U8G2_BTN_INV|U8G2_BTN_HCENTER, 56, 0, 0, bpmChar ); u8g2.setFont(velvetscreen); - u8g2.drawButtonUTF8(29, 40, U8G2_BTN_BW1|U8G2_BTN_HCENTER, 55, 0, 2, "BPM" ); + if (masterClockMode == 0) { + u8g2.drawButtonUTF8(29, 40, U8G2_BTN_BW1|U8G2_BTN_HCENTER, 55, 0, 2, "BPM" ); + } else { + u8g2.drawButtonUTF8(29, 40, U8G2_BTN_BW1|U8G2_BTN_HCENTER, 55, 0, 2, "PPQN" ); + } } else { u8g2.drawButtonUTF8(28, 26, U8G2_BTN_BW0|U8G2_BTN_HCENTER, 56, 0, 0, bpmChar ); u8g2.setFont(velvetscreen); - u8g2.drawButtonUTF8(29, 40, U8G2_BTN_BW0|U8G2_BTN_HCENTER, 55, 0, 2, "BPM" ); + if (masterClockMode == 0) { + u8g2.drawButtonUTF8(29, 40, U8G2_BTN_BW0|U8G2_BTN_HCENTER, 55, 0, 2, "BPM" ); + } else { + u8g2.drawButtonUTF8(29, 40, U8G2_BTN_BW0|U8G2_BTN_HCENTER, 55, 0, 2, "PPQN" ); + } } }