From 1c5361613c5f8e54eebc40563779cf679e913be8 Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Wed, 19 Jan 2022 23:09:16 +0100 Subject: [PATCH] Update Font.h --- source/Core/Drivers/Font.h | 74 ++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 40 deletions(-) diff --git a/source/Core/Drivers/Font.h b/source/Core/Drivers/Font.h index 0a6ec3e2..e49ca381 100644 --- a/source/Core/Drivers/Font.h +++ b/source/Core/Drivers/Font.h @@ -131,9 +131,10 @@ const uint8_t buttonA[] = { 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x04, 0x02, 0x02, 0x01, 0x81, 0x49, 0x31, 0x01, 0xc1, 0x25, 0x19, 0x01, 0xc1, 0x25, 0x19, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x04, 0x18, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x18, 0x20, 0x40, 0x40, 0x80, 0x89, 0x8a, 0x88, 0x94, 0x8c, 0x94, 0xae, 0x80, 0xbe, 0x8e, 0xa6, 0x8e, 0xa6, 0x8e, 0xa6, 0x8e, 0xa6, 0x8a, 0xa6, 0x8a, 0xa6, 0x8a, 0xa6, 0x8a, 0x46, 0x4a, 0x22, 0x18, 0x07, 0x00, 0x00, 0x00}; + const uint8_t disconnectedTip[] = { - // - // 42 x 16 + // width = 42 + // height = 16 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xc0, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xcc, 0x9c, 0x38, 0x70, 0xe0, 0xc0, 0x80, 0x20, 0x70, 0x38, 0x1c, 0xcc, 0x40, 0x80, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xc0, 0x60, 0xe0, 0x00, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x05, 0x00, 0x07, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x31, 0x38, 0x1c, 0x0e, 0x04, 0x01, 0x03, 0x07, 0x0e, 0x1c, 0x39, 0x30, 0x01, 0x03, 0x00, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x04, 0x09, 0x0f, 0x00}; @@ -146,9 +147,10 @@ const uint8_t buttonA[] = { 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x04, 0x02, 0x02, 0x01, 0x81, 0x49, 0x31, 0x01, 0xc1, 0x25, 0x19, 0x01, 0xc1, 0x25, 0x19, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x04, 0x18, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x18, 0x20, 0x40, 0x40, 0x80, 0x81, 0x8a, 0x88, 0x88, 0x8c, 0x95, 0x80, 0x9c, 0xa6, 0x8e, 0xa6, 0x8c, 0x80, 0x94, 0x8c, 0x94, 0x8c, 0x94, 0x8c, 0x94, 0x80, 0x88, 0x88, 0x88, 0x48, 0x48, 0x20, 0x18, 0x07, 0x00, 0x00, 0x00}; + const uint8_t disconnectedTip[] = { - // - // 42 x 16 + // width = 42 + // height = 16 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x80, 0xc0, 0xc0, 0xc0, 0x80, 0x00, 0x80, 0x80, 0x80, 0x8c, 0x9c, 0x38, 0x70, 0xe0, 0xc0, 0x80, 0x20, 0x70, 0x38, 0x1c, 0x0c, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xa0, 0xe0, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x03, 0x04, 0x01, 0x04, 0x01, 0x00, 0x02, 0x01, 0x02, 0x31, 0x38, 0x1c, 0x0e, 0x04, 0x01, 0x03, 0x07, 0x0e, 0x1c, 0x39, 0x31, 0x01, 0x01, 0x00, 0x02, 0x01, 0x02, 0x01, 0x04, 0x01, 0x04, 0x01, 0x0a, 0x01, 0x0f, 0x00}; @@ -161,9 +163,10 @@ const uint8_t buttonA[] = { 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x04, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x81, 0x41, 0x41, 0x21, 0x01, 0xe9, 0x71, 0x01, 0xd9, 0x71, 0x01, 0x2d, 0x19, 0x01, 0x11, 0xa1, 0xa1, 0xc1, 0x01, 0x01, 0x01, 0x02, 0x02, 0x04, 0x18, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x18, 0x20, 0x40, 0x40, 0x80, 0x80, 0x80, 0x80, 0x83, 0x8d, 0x9f, 0xaa, 0x9e, 0x94, 0xbd, 0xa8, 0xa8, 0x94, 0x94, 0x8a, 0x8a, 0xa5, 0x95, 0x8e, 0x86, 0x81, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x18, 0x07, 0x00, 0x00, 0x00}; + const uint8_t disconnectedTip[] = { - // - // 42 x 16 + // width = 42 + // height = 16 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x10, 0x08, 0xc8, 0xc4, 0x04, 0x08, 0x08, 0x10, 0x10, 0x20, 0x20, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0c, 0x10, 0x20, 0x00, 0x00, 0x00, 0x00, 0x37, 0x37, 0x00, 0x00, 0x00, 0x20, 0x10, 0x08, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; @@ -176,26 +179,27 @@ const uint8_t buttonB[] = { 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x04, 0x18, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x18, 0x20, 0x40, 0x40, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xbf, 0x80, 0x80, 0x8e, 0xaa, 0x8e, 0x80, 0x83, 0xba, 0x83, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x18, 0x07, 0x00, 0x00, 0x00, 0x00}; -// 16 x 16 -const uint8_t brightnessIcon[] - = {0x80, 0x86, 0x8E, 0x9C, 0x18, 0xC0, 0xE0, 0xEF, 0xEF, 0xE0, 0xC0, 0x18, 0x9C, 0x8E, 0x86, 0x80, 0x01, 0x61, 0x71, 0x39, 0x18, 0x03, 0x07, 0xF7, 0xF7, 0x07, 0x03, 0x18, 0x39, 0x71, 0x61, 0x01}; +const uint8_t brightnessIcon[] = { + // width = 16 + // height = 16 + 0x80, 0x86, 0x8E, 0x9C, 0x18, 0xC0, 0xE0, 0xEF, 0xEF, 0xE0, 0xC0, 0x18, 0x9C, 0x8E, 0x86, 0x80, + 0x01, 0x61, 0x71, 0x39, 0x18, 0x03, 0x07, 0xF7, 0xF7, 0x07, 0x03, 0x18, 0x39, 0x71, 0x61, 0x01}; -// 24 x 16 -const uint8_t invertDisplayIcon[] = {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 invertDisplayIcon[] = { + // width = 24 + // height = 16 + 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}; /* * 16x16 icons * 32 * 3 = Frame size * Frame count * */ const uint8_t SettingsMenuIcons[][32 * 3] = { - // Power // 3 frames - // width = 16 - // height = 16 { - // Power 1 frame + // Power 1st frame // width = 16 // height = 16 0x00, @@ -231,7 +235,7 @@ const uint8_t SettingsMenuIcons[][32 * 3] = { 0x00, 0x00, - // Power 2 frame + // Power 2nd frame // width = 16 // height = 16 0x00, @@ -306,10 +310,8 @@ const uint8_t SettingsMenuIcons[][32 * 3] = { // Soldering // 3 frames - // width = 16 - // height = 16 { - // Soldering 1 frame + // Soldering 1st frame // width = 16 // height = 16 0x00, @@ -345,7 +347,7 @@ const uint8_t SettingsMenuIcons[][32 * 3] = { 0x00, 0x00, - // Soldering 2 frame + // Soldering 2nd frame // width = 16 // height = 16 0x00, @@ -420,10 +422,8 @@ const uint8_t SettingsMenuIcons[][32 * 3] = { // Sleep // 3 frames - // width = 16 - // height = 16 { - // Sleep 1 frame + // Sleep 1st frame // width = 16 // height = 16 0x00, @@ -459,7 +459,7 @@ const uint8_t SettingsMenuIcons[][32 * 3] = { 0x00, 0x00, - // Sleep 2 frame + // Sleep 2nd frame // width = 16 // height = 16 0x00, @@ -534,10 +534,8 @@ const uint8_t SettingsMenuIcons[][32 * 3] = { // UI // 3 frames - // width = 16 - // height = 16 { - // UI 1 frame + // UI 1st frame // width = 16 // height = 16 0x00, @@ -573,7 +571,7 @@ const uint8_t SettingsMenuIcons[][32 * 3] = { 0x61, 0x00, - // UI 2 frame + // UI 2nd frame // width = 16 // height = 16 0x00, @@ -648,11 +646,9 @@ const uint8_t SettingsMenuIcons[][32 * 3] = { // Advanced // 3 frames - /// width = 16 - // height = 16 { - // Advanced 1 frame - /// width = 16 + // Advanced 1st frame + // width = 16 // height = 16 0x00, 0xfe, @@ -687,8 +683,8 @@ const uint8_t SettingsMenuIcons[][32 * 3] = { 0x22, 0x0c, - // Advanced 2 frame - /// width = 16 + // Advanced 2nd frame + // width = 16 // height = 16 0xe0, 0xae, @@ -724,7 +720,7 @@ const uint8_t SettingsMenuIcons[][32 * 3] = { 0x1c, // Advanced final frame - /// width = 16 + // width = 16 // height = 16 0x00, 0x7e, @@ -763,10 +759,8 @@ const uint8_t SettingsMenuIcons[][32 * 3] = { // Calibration (Not used, kept for future menu layouts) // 3 frames - // width = 16 - // height = 16 { - // Calibration 1 frame (Not used, kept for future menu layouts) + // Calibration 1st frame (Not used, kept for future menu layouts) // width = 16 // height = 16 0x00, @@ -802,7 +796,7 @@ const uint8_t SettingsMenuIcons[][32 * 3] = { 0x00, 0x00, - // Calibration 2 frame (Not used, kept for future menu layouts) + // Calibration 2nd frame (Not used, kept for future menu layouts) // width = 16 // height = 16 0x00,