From 92f74e58810e51f6aad8798bcb780714d1e00cd8 Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Tue, 21 Nov 2023 17:05:23 +0100 Subject: [PATCH 1/9] extend infinity icon --- source/Core/Drivers/Font.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/source/Core/Drivers/Font.h b/source/Core/Drivers/Font.h index 0bd08c82..265a7a12 100644 --- a/source/Core/Drivers/Font.h +++ b/source/Core/Drivers/Font.h @@ -175,11 +175,17 @@ const uint8_t buttonB[] = { // 0xFE, 0x01, 0x79, 0x25, 0x79, 0x01, 0xFE, 0x00, 0x20, 0x20, 0x20, 0x20, 0xDF, 0x07, 0x8F, 0xDF, 0xFF, 0x01, 0xFE, 0x86, 0xDA, 0x86, 0xFE, 0x01, // 0x7F, 0x80, 0xA4, 0xBE, 0xA0, 0x80, 0x7F, 0x00, 0x04, 0x0E, 0x1F, 0x04, 0xFB, 0xFB, 0xFB, 0xFB, 0xFF, 0x80, 0x7F, 0x5B, 0x41, 0x5F, 0x7F, 0x80}; -const uint8_t infinityIcon[] = { +const uint8_t infinityOnce[] = { // width = 24 // height = 16 0x00, 0xc0, 0x70, 0x18, 0x0c, 0x0c, 0x0c, 0x0c, 0x18, 0x10, 0x20, 0x80, 0xc0, 0x60, 0x30, 0x18, 0x0c, 0x0c, 0x0c, 0x0c, 0x18, 0x70, 0xc0, 0x00, - 0x00, 0x01, 0x07, 0x0c, 0x18, 0x18, 0x18, 0x18, 0x0c, 0x06, 0x03, 0x01, 0x00, 0x02, 0x04, 0x0c, 0x18, 0x18, 0x18, 0x18, 0x0c, 0x07, 0x01, 0x00}; + 0x00, 0x01, 0x03, 0x08, 0x04, 0x7e, 0x00, 0x18, 0x0c, 0x06, 0x03, 0x01, 0x00, 0x02, 0x04, 0x0c, 0x18, 0x18, 0x18, 0x18, 0x0c, 0x07, 0x01, 0x00}; + +const uint8_t infinityLoop[] = { + // width = 24 + // height = 16 + 0x00, 0xc0, 0x70, 0x18, 0x0c, 0x0c, 0x0c, 0x0c, 0x18, 0x10, 0x20, 0x80, 0xc0, 0x60, 0x30, 0x18, 0x0c, 0x0c, 0x0c, 0x0c, 0x18, 0x70, 0xc0, 0x00, + 0x00, 0x01, 0x1c, 0x22, 0x41, 0x01, 0x71, 0x62, 0x5c, 0x00, 0x03, 0x01, 0x00, 0x02, 0x04, 0x0c, 0x18, 0x18, 0x18, 0x18, 0x0c, 0x07, 0x01, 0x00}; /* * 16x16 icons From 4f5bbcf370034f90088cd52a4b8b95f15681123a Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Tue, 21 Nov 2023 17:11:21 +0100 Subject: [PATCH 2/9] Update settingsGUI.cpp --- source/Core/Src/settingsGUI.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/Core/Src/settingsGUI.cpp b/source/Core/Src/settingsGUI.cpp index c551e14d..c3208352 100644 --- a/source/Core/Src/settingsGUI.cpp +++ b/source/Core/Src/settingsGUI.cpp @@ -842,10 +842,10 @@ static void displayLogoTime(void) { OLED::print(translatedString(Tr->OffString), FontStyle::LARGE); break; case logoMode_t::ONETIME: - OLED::drawArea((OLED_WIDTH - 24 - 2) + 12, 0, 24, 16, infinityIcon); + OLED::drawArea(OLED_WIDTH - 24 - 2, 0, 24, 16, infinityOnce); break; case logoMode_t::INFINITY: - OLED::drawArea(OLED_WIDTH - 24 - 2, 0, 24, 16, infinityIcon); + OLED::drawArea(OLED_WIDTH - 24 - 2, 0, 24, 16, infinityLoop); break; default: OLED::printNumber(getSettingValue(SettingsOptions::LOGOTime), 2, FontStyle::LARGE); From cf8d6ee78346f6e3dabc454cf79a2d41d64b16ee Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Wed, 22 Nov 2023 00:05:51 +0100 Subject: [PATCH 3/9] Update Font.h --- source/Core/Drivers/Font.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/source/Core/Drivers/Font.h b/source/Core/Drivers/Font.h index 265a7a12..27db5016 100644 --- a/source/Core/Drivers/Font.h +++ b/source/Core/Drivers/Font.h @@ -176,16 +176,16 @@ const uint8_t buttonB[] = { // 0x7F, 0x80, 0xA4, 0xBE, 0xA0, 0x80, 0x7F, 0x00, 0x04, 0x0E, 0x1F, 0x04, 0xFB, 0xFB, 0xFB, 0xFB, 0xFF, 0x80, 0x7F, 0x5B, 0x41, 0x5F, 0x7F, 0x80}; const uint8_t infinityOnce[] = { - // width = 24 + // width = 16 // height = 16 - 0x00, 0xc0, 0x70, 0x18, 0x0c, 0x0c, 0x0c, 0x0c, 0x18, 0x10, 0x20, 0x80, 0xc0, 0x60, 0x30, 0x18, 0x0c, 0x0c, 0x0c, 0x0c, 0x18, 0x70, 0xc0, 0x00, - 0x00, 0x01, 0x03, 0x08, 0x04, 0x7e, 0x00, 0x18, 0x0c, 0x06, 0x03, 0x01, 0x00, 0x02, 0x04, 0x0c, 0x18, 0x18, 0x18, 0x18, 0x0c, 0x07, 0x01, 0x00}; + 0x00, 0xc0, 0x30, 0x08, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x14, 0x18, 0x1c, 0x00, 0xc0, 0x00, + 0x00, 0x03, 0x08, 0x04, 0x7e, 0x00, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x10, 0x0c, 0x03, 0x00}; const uint8_t infinityLoop[] = { - // width = 24 + // width = 16 // height = 16 - 0x00, 0xc0, 0x70, 0x18, 0x0c, 0x0c, 0x0c, 0x0c, 0x18, 0x10, 0x20, 0x80, 0xc0, 0x60, 0x30, 0x18, 0x0c, 0x0c, 0x0c, 0x0c, 0x18, 0x70, 0xc0, 0x00, - 0x00, 0x01, 0x1c, 0x22, 0x41, 0x01, 0x71, 0x62, 0x5c, 0x00, 0x03, 0x01, 0x00, 0x02, 0x04, 0x0c, 0x18, 0x18, 0x18, 0x18, 0x0c, 0x07, 0x01, 0x00}; + 0x00, 0xc0, 0x30, 0x08, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x14, 0x18, 0x1c, 0x00, 0xc0, 0x00, + 0x00, 0x33, 0x48, 0x48, 0x30, 0x48, 0x48, 0x30, 0x00, 0x40, 0x20, 0x20, 0x10, 0x0c, 0x03, 0x00}; /* * 16x16 icons From faf2c6733ed4d48429f05a97ee5fa37c1de15364 Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Wed, 22 Nov 2023 00:07:10 +0100 Subject: [PATCH 4/9] Update settingsGUI.cpp --- source/Core/Src/settingsGUI.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/Core/Src/settingsGUI.cpp b/source/Core/Src/settingsGUI.cpp index c3208352..351c5266 100644 --- a/source/Core/Src/settingsGUI.cpp +++ b/source/Core/Src/settingsGUI.cpp @@ -842,10 +842,10 @@ static void displayLogoTime(void) { OLED::print(translatedString(Tr->OffString), FontStyle::LARGE); break; case logoMode_t::ONETIME: - OLED::drawArea(OLED_WIDTH - 24 - 2, 0, 24, 16, infinityOnce); + OLED::drawArea(OLED_WIDTH - 16 - 2, 0, 16, 16, infinityOnce); break; case logoMode_t::INFINITY: - OLED::drawArea(OLED_WIDTH - 24 - 2, 0, 24, 16, infinityLoop); + OLED::drawArea(OLED_WIDTH - 16 - 2, 0, 16, 16, infinityLoop); break; default: OLED::printNumber(getSettingValue(SettingsOptions::LOGOTime), 2, FontStyle::LARGE); From 37420d3ee108fdd4fb5179660d3cce6c62ed6603 Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Wed, 22 Nov 2023 09:20:02 +0100 Subject: [PATCH 5/9] Update Font.h --- source/Core/Drivers/Font.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/Core/Drivers/Font.h b/source/Core/Drivers/Font.h index 27db5016..9672891c 100644 --- a/source/Core/Drivers/Font.h +++ b/source/Core/Drivers/Font.h @@ -175,13 +175,13 @@ const uint8_t buttonB[] = { // 0xFE, 0x01, 0x79, 0x25, 0x79, 0x01, 0xFE, 0x00, 0x20, 0x20, 0x20, 0x20, 0xDF, 0x07, 0x8F, 0xDF, 0xFF, 0x01, 0xFE, 0x86, 0xDA, 0x86, 0xFE, 0x01, // 0x7F, 0x80, 0xA4, 0xBE, 0xA0, 0x80, 0x7F, 0x00, 0x04, 0x0E, 0x1F, 0x04, 0xFB, 0xFB, 0xFB, 0xFB, 0xFF, 0x80, 0x7F, 0x5B, 0x41, 0x5F, 0x7F, 0x80}; -const uint8_t infinityOnce[] = { +const uint8_t RepeatOnce[] = { // width = 16 // height = 16 0x00, 0xc0, 0x30, 0x08, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x14, 0x18, 0x1c, 0x00, 0xc0, 0x00, 0x00, 0x03, 0x08, 0x04, 0x7e, 0x00, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x10, 0x0c, 0x03, 0x00}; -const uint8_t infinityLoop[] = { +const uint8_t RepeatInf[] = { // width = 16 // height = 16 0x00, 0xc0, 0x30, 0x08, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x14, 0x18, 0x1c, 0x00, 0xc0, 0x00, From 00c3d150dd56b56fb3cc96e983053a25634cb381 Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Wed, 22 Nov 2023 09:21:24 +0100 Subject: [PATCH 6/9] Update settingsGUI.cpp --- source/Core/Src/settingsGUI.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/Core/Src/settingsGUI.cpp b/source/Core/Src/settingsGUI.cpp index 351c5266..cc6910ac 100644 --- a/source/Core/Src/settingsGUI.cpp +++ b/source/Core/Src/settingsGUI.cpp @@ -842,10 +842,10 @@ static void displayLogoTime(void) { OLED::print(translatedString(Tr->OffString), FontStyle::LARGE); break; case logoMode_t::ONETIME: - OLED::drawArea(OLED_WIDTH - 16 - 2, 0, 16, 16, infinityOnce); + OLED::drawArea(OLED_WIDTH - 16 - 2, 0, 16, 16, RepeatOnce); break; case logoMode_t::INFINITY: - OLED::drawArea(OLED_WIDTH - 16 - 2, 0, 16, 16, infinityLoop); + OLED::drawArea(OLED_WIDTH - 16 - 2, 0, 16, 16, RepeatInf); break; default: OLED::printNumber(getSettingValue(SettingsOptions::LOGOTime), 2, FontStyle::LARGE); From 9bfb36e349976c743acdfb57cffbba95eadc1989 Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Wed, 22 Nov 2023 18:34:25 +0100 Subject: [PATCH 7/9] Update Font.h --- source/Core/Drivers/Font.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/Core/Drivers/Font.h b/source/Core/Drivers/Font.h index 9672891c..2971dcb5 100644 --- a/source/Core/Drivers/Font.h +++ b/source/Core/Drivers/Font.h @@ -178,14 +178,14 @@ const uint8_t buttonB[] = { const uint8_t RepeatOnce[] = { // width = 16 // height = 16 - 0x00, 0xc0, 0x30, 0x08, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x14, 0x18, 0x1c, 0x00, 0xc0, 0x00, - 0x00, 0x03, 0x08, 0x04, 0x7e, 0x00, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x10, 0x0c, 0x03, 0x00}; + 0x00, 0xc0, 0xf0, 0x78, 0x1c, 0x0c, 0x0e, 0x06, 0x06, 0x0e, 0x2c, 0x3c, 0x38, 0x3c, 0x00, 0x00, + 0x00, 0x01, 0x08, 0x04, 0x7e, 0x00, 0x00, 0x60, 0x60, 0x70, 0x30, 0x38, 0x1e, 0x0f, 0x02, 0x00}; const uint8_t RepeatInf[] = { // width = 16 // height = 16 - 0x00, 0xc0, 0x30, 0x08, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x14, 0x18, 0x1c, 0x00, 0xc0, 0x00, - 0x00, 0x33, 0x48, 0x48, 0x30, 0x48, 0x48, 0x30, 0x00, 0x40, 0x20, 0x20, 0x10, 0x0c, 0x03, 0x00}; + 0x00, 0xc0, 0xf0, 0x78, 0x1c, 0x0c, 0x0e, 0x06, 0x06, 0x0e, 0x2c, 0x3c, 0x38, 0x3c, 0x00, 0x00, + 0x00, 0x31, 0x49, 0x48, 0x30, 0x48, 0x48, 0x30, 0x00, 0x00, 0x30, 0x38, 0x1e, 0x0f, 0x02, 0x00}; /* * 16x16 icons From 229ae9b30e9ad5fea0ba2b57664c7d346c4eb33c Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Wed, 22 Nov 2023 18:41:02 +0100 Subject: [PATCH 8/9] Update Font.h --- source/Core/Drivers/Font.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/Core/Drivers/Font.h b/source/Core/Drivers/Font.h index 2971dcb5..9548c676 100644 --- a/source/Core/Drivers/Font.h +++ b/source/Core/Drivers/Font.h @@ -179,7 +179,7 @@ const uint8_t RepeatOnce[] = { // width = 16 // height = 16 0x00, 0xc0, 0xf0, 0x78, 0x1c, 0x0c, 0x0e, 0x06, 0x06, 0x0e, 0x2c, 0x3c, 0x38, 0x3c, 0x00, 0x00, - 0x00, 0x01, 0x08, 0x04, 0x7e, 0x00, 0x00, 0x60, 0x60, 0x70, 0x30, 0x38, 0x1e, 0x0f, 0x02, 0x00}; + 0x00, 0x01, 0x08, 0x04, 0x7e, 0x00, 0x00, 0x60, 0x60, 0x70, 0x30, 0x38, 0x1e, 0x0f, 0x03, 0x00}; const uint8_t RepeatInf[] = { // width = 16 From 8eebb01047778a14000613c114ee3683eaba3aed Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Wed, 22 Nov 2023 18:45:41 +0100 Subject: [PATCH 9/9] Update Font.h --- source/Core/Drivers/Font.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/Core/Drivers/Font.h b/source/Core/Drivers/Font.h index 9548c676..e8f120f4 100644 --- a/source/Core/Drivers/Font.h +++ b/source/Core/Drivers/Font.h @@ -185,7 +185,7 @@ const uint8_t RepeatInf[] = { // width = 16 // height = 16 0x00, 0xc0, 0xf0, 0x78, 0x1c, 0x0c, 0x0e, 0x06, 0x06, 0x0e, 0x2c, 0x3c, 0x38, 0x3c, 0x00, 0x00, - 0x00, 0x31, 0x49, 0x48, 0x30, 0x48, 0x48, 0x30, 0x00, 0x00, 0x30, 0x38, 0x1e, 0x0f, 0x02, 0x00}; + 0x00, 0x31, 0x49, 0x48, 0x30, 0x48, 0x48, 0x30, 0x00, 0x00, 0x30, 0x38, 0x1e, 0x0f, 0x03, 0x00}; /* * 16x16 icons