diff options
| author | Ivan Zorin <[email protected]> | 2023-11-23 09:33:38 +0300 |
|---|---|---|
| committer | Ivan Zorin <[email protected]> | 2023-11-23 09:33:38 +0300 |
| commit | 1519f655ae3531e65ee8d89214c9b2f9dd8bc9bd (patch) | |
| tree | 29ca000dd740b8b94c1d7436ddd9741581a949dd | |
| parent | 602bd772badf352a40fba49b5779199a2d138df0 (diff) | |
| parent | 0298356efc080749bb756a27ecfd5e20e61c25de (diff) | |
| download | IronOS-1519f655ae3531e65ee8d89214c9b2f9dd8bc9bd.tar.gz IronOS-1519f655ae3531e65ee8d89214c9b2f9dd8bc9bd.zip | |
Manually merge icon set using git cli from discip/animation-loop
| -rw-r--r-- | source/Core/Drivers/Font.h | 14 | ||||
| -rw-r--r-- | source/Core/Src/settingsGUI.cpp | 4 |
2 files changed, 12 insertions, 6 deletions
diff --git a/source/Core/Drivers/Font.h b/source/Core/Drivers/Font.h index 0bd08c82..e8f120f4 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[] = {
- // width = 24
+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, 0x03, 0x00};
+
+const uint8_t RepeatInf[] = {
+ // 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, 0x07, 0x0c, 0x18, 0x18, 0x18, 0x18, 0x0c, 0x06, 0x03, 0x01, 0x00, 0x02, 0x04, 0x0c, 0x18, 0x18, 0x18, 0x18, 0x0c, 0x07, 0x01, 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, 0x03, 0x00};
/*
* 16x16 icons
diff --git a/source/Core/Src/settingsGUI.cpp b/source/Core/Src/settingsGUI.cpp index c551e14d..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 - 24 - 2) + 12, 0, 24, 16, infinityIcon); + OLED::drawArea(OLED_WIDTH - 16 - 2, 0, 16, 16, RepeatOnce); break; case logoMode_t::INFINITY: - OLED::drawArea(OLED_WIDTH - 24 - 2, 0, 24, 16, infinityIcon); + OLED::drawArea(OLED_WIDTH - 16 - 2, 0, 16, 16, RepeatInf); break; default: OLED::printNumber(getSettingValue(SettingsOptions::LOGOTime), 2, FontStyle::LARGE); |