From 943854b7339de34d2dbb0093bc85514beb7e8267 Mon Sep 17 00:00:00 2001 From: Oleksiy Date: Fri, 15 Dec 2023 00:19:09 +0200 Subject: [PATCH] renamed the big font --- Software/Gravity/Gravity.ino | 2 +- Software/Gravity/UI.ino | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Software/Gravity/Gravity.ino b/Software/Gravity/Gravity.ino index 77b06f9..b388829 100644 --- a/Software/Gravity/Gravity.ino +++ b/Software/Gravity/Gravity.ino @@ -167,7 +167,7 @@ const uint8_t velvetscreen[437] U8G2_FONT_SECTION("velvetscreen") = "\7p\10\255\364V\266\323\2q\7\255\364\216\257\5r\10\253d\242\32*\2t\6\255t\376#w\11" "\255\364V\245FN\13x\6\233dR\7\0\0\0\4\377\377\0"; -const uint8_t fabryka[499] U8G2_FONT_SECTION("fabryka") = +const uint8_t stkL[499] U8G2_FONT_SECTION("stk-l") = "\22\0\4\4\4\5\2\1\6\17\27\1\0\27\0\0\0\1\77\0\0\1\326%'\17\37\313\330R#&" "\32!F\14\211I\310\24!\65\204(MF\21)Cd\304\10\62b\14\215\60Vb\334\20\0/\14" "\272\336\336d\244\350\263q\343\0\60\37|\377\12\32\25\17\2\35\263\253ChD\30\21bB\14\242S" diff --git a/Software/Gravity/UI.ino b/Software/Gravity/UI.ino index 3033fc2..601ea51 100644 --- a/Software/Gravity/UI.ino +++ b/Software/Gravity/UI.ino @@ -98,17 +98,17 @@ void updateScreen() { width = 55; if (masterClockMode == 0) { if ((!insideTab && !shiftBtnPushed) || (insideTab && menuItem != 0)) { //default view, nothing is selected or editable - u8g2.setFont(fabryka); + u8g2.setFont(stkL); u8g2.drawButtonUTF8(leftOffset-1, 28, U8G2_BTN_BW0|U8G2_BTN_HCENTER, width, 0, 3, bpmChar ); u8g2.setFont(velvetscreen); u8g2.drawButtonUTF8(leftOffset, 40, U8G2_BTN_BW0|U8G2_BTN_HCENTER, width, 0, 2, "BPM" ); } else if ((!insideTab && shiftBtnPushed) || (insideTab && menuItem == 0 && (menuItemSelected || shiftBtnPushed))) { //show value as editable - u8g2.setFont(fabryka); + u8g2.setFont(stkL); u8g2.drawButtonUTF8(leftOffset-1, 28, U8G2_BTN_BW1|U8G2_BTN_HCENTER, width, 0, 3, bpmChar ); u8g2.setFont(velvetscreen); u8g2.drawButtonUTF8(leftOffset, 40, U8G2_BTN_BW1|U8G2_BTN_INV|U8G2_BTN_HCENTER, width, 0, 2, "BPM" ); } else if (insideTab && menuItem == 0 && !menuItemSelected) { //show as selected menu item - u8g2.setFont(fabryka); + u8g2.setFont(stkL); u8g2.drawButtonUTF8(leftOffset-1, 28, U8G2_BTN_BW1|U8G2_BTN_INV|U8G2_BTN_HCENTER, width, 0, 3, bpmChar ); u8g2.setFont(velvetscreen); u8g2.drawButtonUTF8(leftOffset, 40, U8G2_BTN_BW1|U8G2_BTN_INV|U8G2_BTN_HCENTER, width, 0, 2, "BPM" ); @@ -116,7 +116,7 @@ void updateScreen() { } if (masterClockMode != 0) { //EXT and MIDI - u8g2.setFont(fabryka); + u8g2.setFont(stkL); u8g2.drawButtonUTF8(leftOffset, 28, U8G2_BTN_BW0|U8G2_BTN_HCENTER, width, 0, 0, bpmChar ); //u8g2.setFont(velvetscreen); //u8g2.drawButtonUTF8(leftOffset, 40, U8G2_BTN_BW0|U8G2_BTN_HCENTER, width, 0, 2, "PPQN" ); @@ -227,7 +227,7 @@ void updateScreen() { } } valueStr.toCharArray(valueChar, 16); - u8g2.setFont(fabryka); + u8g2.setFont(stkL); if ((!insideTab && shiftBtnPushed) || (insideTab && menuItem == 0 && (menuItemSelected || shiftBtnPushed))) { u8g2.drawButtonUTF8(leftOffset, 28, U8G2_BTN_BW1|U8G2_BTN_HCENTER, width, 0, 3, valueChar ); } else if (insideTab && menuItem == 0 && !menuItemSelected) {