From a20f1ce28e8214acbbea7550b3618537ff134fa7 Mon Sep 17 00:00:00 2001 From: mrkusypl Date: Mon, 27 Apr 2026 16:26:49 +0200 Subject: [PATCH] Code refactoring (68 B) --- App/ui/menu.c | 30 +++++++++++++------------- App/ui/welcome.c | 56 ++++++++++++++++++++++++++++++++++-------------- 2 files changed, 55 insertions(+), 31 deletions(-) diff --git a/App/ui/menu.c b/App/ui/menu.c index d055dc7a..dbf076c8 100644 --- a/App/ui/menu.c +++ b/App/ui/menu.c @@ -963,7 +963,7 @@ void UI_DisplayMenu(void) UI_PrintString(edit, menu_item_x1, menu_item_x2, 2, 8); if (edit_index < 10) { // UI_PrintString("^", menu_item_x1 - 1 + (8 * edit_index),0, 4, 8); // show the cursor - uint8_t x = 49; + uint8_t x = menu_item_x1 - 1; for (uint8_t i = 0; i < 10; i++) { if (i != edit_index) @@ -1146,7 +1146,7 @@ void UI_DisplayMenu(void) // Page 0: firmware identity. #ifdef ENABLE_FEAT_F4HWN sprintf(String, "%s\n%s", AUTHOR_STRING_2, VERSION_STRING_2); - UI_PrintStringSmallNormal(Edition, 54, 127, 6); + UI_PrintStringSmallNormal(Edition, menu_item_x1 - 1, menu_item_x2, 6); #else sprintf(String, "%u.%02uV\n%u%%", gBatteryVoltageAverage / 100, gBatteryVoltageAverage % 100, @@ -1156,10 +1156,10 @@ void UI_DisplayMenu(void) } #ifdef ENABLE_FEAT_F4HWN if (page == p++) { - UI_PrintStringSmallNormalInverse("BUILD", 70, 0, 1); - UI_PrintStringSmallNormal(BuildDate, 49, 127, 3); - UI_PrintStringSmallNormal(BuildTime, 49, 127, 4); - UI_PrintStringSmallNormal(BuildCommit, 49, 127, 6); + strcpy(top_right_badge, "BUILD"); + UI_PrintStringSmallNormal(BuildDate, menu_item_x1 - 1, menu_item_x2, 3); + UI_PrintStringSmallNormal(BuildTime, menu_item_x1 - 1, menu_item_x2, 4); + UI_PrintStringSmallNormal(BuildCommit, menu_item_x1 - 1, menu_item_x2, 6); already_printed = true; break; @@ -1168,14 +1168,14 @@ void UI_DisplayMenu(void) if (page == p++) { char val[16]; - UI_PrintStringSmallNormalInverse("BATTERY", 63, 0, 1); + strcpy(top_right_badge, "BATTERY"); sprintf(val, "%u.%02uV %u%%", gBatteryVoltageAverage / 100, gBatteryVoltageAverage % 100, BATTERY_VoltsToPercent(gBatteryVoltageAverage)); - UI_PrintStringSmallNormal(val, 49, 127, 3); + UI_PrintStringSmallNormal(val, menu_item_x1 - 1, menu_item_x2, 3); - UI_PrintStringSmallNormal(gSubMenu_BATTYP[gEeprom.BATTERY_TYPE], 49, 127, 5); + UI_PrintStringSmallNormal(gSubMenu_BATTYP[gEeprom.BATTERY_TYPE], menu_item_x1 - 1, menu_item_x2, 5); already_printed = true; break; @@ -1189,17 +1189,17 @@ void UI_DisplayMenu(void) char val[16]; - // MEMORY title capsule (6 chars → 45 px wide) centered in right zone, fb line 1. - UI_PrintStringSmallNormalInverse("MEMORY", 67, 0, 1); + // MEMORY title capsule centered in right zone, fb line 1. + strcpy(top_right_badge, "MEMORY"); // Flash + SRAM values stacked below, normal small font, with a fb-line of breathing space. sprintf(val, "FLASH %u.%u%%", (unsigned)(flash_pct / 100), (unsigned)((flash_pct / 10) % 10)); - UI_PrintStringSmallNormal(val, 49, 127, 3); + UI_PrintStringSmallNormal(val, menu_item_x1 - 1, menu_item_x2, 3); sprintf(val, "SRAM %u.%u%%", (unsigned)(ram_pct / 100), (unsigned)((ram_pct / 10) % 10)); - UI_PrintStringSmallNormal(val, 49, 127, 5); + UI_PrintStringSmallNormal(val, menu_item_x1 - 1, menu_item_x2, 5); already_printed = true; break; @@ -1210,8 +1210,8 @@ void UI_DisplayMenu(void) // Capsule label above QR (small-font Inverse style at fb line 1). if (page == p || page == p + 1) { const bool is_wiki = (page == (p + 1)); - - UI_PrintStringSmallNormalInverse(is_wiki ? "WIKI" : "CODE", 74, 0, 1); + + strcpy(top_right_badge, is_wiki ? "WIKI" : "CODE"); UI_DrawQRCode(is_wiki, 72, 28); already_printed = true; diff --git a/App/ui/welcome.c b/App/ui/welcome.c index eb585d09..3188484c 100644 --- a/App/ui/welcome.c +++ b/App/ui/welcome.c @@ -39,24 +39,43 @@ // Stored in framebuffer column-major format: 5 fb-lines x 33 columns. // Each byte packs 8 vertical pixels (bit 0 = top). Last fb-line uses // only bit 0 (row 32); bits 1..7 are always 0. -static const uint8_t BITMAP_QR_GitHub[5][33] = { - { 0x7F, 0x41, 0x5D, 0x5D, 0x5D, 0x41, 0x7F, 0x00, 0x6A, 0xB8, 0xCB, 0xA0, 0x6D, 0x07, 0xCB, 0x1F, 0xD2, 0x18, 0x59, 0x15, 0x79, 0x86, 0xCE, 0x15, 0x43, 0x00, 0x7F, 0x41, 0x5D, 0x5D, 0x5D, 0x41, 0x7F }, - { 0x87, 0xA3, 0x69, 0xC3, 0x19, 0x0E, 0x55, 0x1F, 0x43, 0x11, 0x16, 0xC1, 0x5A, 0x0E, 0x96, 0x3E, 0xA5, 0x15, 0x06, 0x2A, 0xFE, 0xCE, 0xCA, 0x3A, 0x70, 0xD9, 0xEA, 0xF5, 0x5C, 0x15, 0x8A, 0x67, 0x22 }, - { 0xE0, 0x0B, 0x1D, 0x28, 0xF5, 0x87, 0x55, 0xEB, 0xA8, 0x11, 0xA3, 0xC1, 0x5A, 0x0E, 0x96, 0x3E, 0xA5, 0x15, 0x84, 0x2B, 0x72, 0xE8, 0xE9, 0x23, 0x11, 0xCD, 0xE6, 0xC1, 0x91, 0xE6, 0x88, 0x77, 0x22 }, - { 0xFD, 0x04, 0x75, 0x75, 0x75, 0x04, 0xFD, 0x01, 0xF7, 0xE0, 0xD6, 0xC1, 0x5A, 0x0E, 0x96, 0x3E, 0xA5, 0x37, 0x22, 0x2B, 0xEA, 0xAA, 0xA7, 0x8D, 0x5F, 0x31, 0x55, 0xB1, 0x3F, 0xCE, 0xCA, 0x2C, 0x2B }, - { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00 } +// +// static const uint8_t BITMAP_QR_GitHub[5][33] = { +// { 0x7F, 0x41, 0x5D, 0x5D, 0x5D, 0x41, 0x7F, 0x00, 0x6A, 0xB8, 0xCB, 0xA0, 0x6D, 0x07, 0xCB, 0x1F, 0xD2, 0x18, 0x59, 0x15, 0x79, 0x86, 0xCE, 0x15, 0x43, 0x00, 0x7F, 0x41, 0x5D, 0x5D, 0x5D, 0x41, 0x7F }, +// { 0x87, 0xA3, 0x69, 0xC3, 0x19, 0x0E, 0x55, 0x1F, 0x43, 0x11, 0x16, 0xC1, 0x5A, 0x0E, 0x96, 0x3E, 0xA5, 0x15, 0x06, 0x2A, 0xFE, 0xCE, 0xCA, 0x3A, 0x70, 0xD9, 0xEA, 0xF5, 0x5C, 0x15, 0x8A, 0x67, 0x22 }, +// { 0xE0, 0x0B, 0x1D, 0x28, 0xF5, 0x87, 0x55, 0xEB, 0xA8, 0x11, 0xA3, 0xC1, 0x5A, 0x0E, 0x96, 0x3E, 0xA5, 0x15, 0x84, 0x2B, 0x72, 0xE8, 0xE9, 0x23, 0x11, 0xCD, 0xE6, 0xC1, 0x91, 0xE6, 0x88, 0x77, 0x22 }, +// { 0xFD, 0x04, 0x75, 0x75, 0x75, 0x04, 0xFD, 0x01, 0xF7, 0xE0, 0xD6, 0xC1, 0x5A, 0x0E, 0x96, 0x3E, 0xA5, 0x37, 0x22, 0x2B, 0xEA, 0xAA, 0xA7, 0x8D, 0x5F, 0x31, 0x55, 0xB1, 0x3F, 0xCE, 0xCA, 0x2C, 0x2B }, +// { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00 } +// }; + +static const uint8_t BITMAP_QR_GitHub_Compressed[137] = { + 0x7F, 0x41, 0x5D, 0x5D, 0x5D, 0x41, 0x7F, 0x00, 0x6A, 0xB8, 0xCB, 0xA0, 0x6D, 0x07, 0xCB, 0x1F, 0xD2, 0x18, 0x59, 0x15, 0x79, 0x86, 0xCE, 0x15, 0x43, 0x00, 0x7F, 0x41, 0x5D, 0x5D, 0x5D, 0x41, 0x7F, + 0x87, 0xA3, 0x69, 0xC3, 0x19, 0x0E, 0x55, 0x1F, 0x43, 0x11, 0x16, 0xC1, 0x5A, 0x0E, 0x96, 0x3E, 0xA5, 0x15, 0x06, 0x2A, 0xFE, 0xCE, 0xCA, 0x3A, 0x70, 0xD9, 0xEA, 0xF5, 0x5C, 0x15, 0x8A, 0x67, 0x22, + 0xE0, 0x0B, 0x1D, 0x28, 0xF5, 0x87, 0x55, 0xEB, 0xA8, 0x11, 0xA3, 0xC1, 0x5A, 0x0E, 0x96, 0x3E, 0xA5, 0x15, 0x84, 0x2B, 0x72, 0xE8, 0xE9, 0x23, 0x11, 0xCD, 0xE6, 0xC1, 0x91, 0xE6, 0x88, 0x77, 0x22, + 0xFD, 0x04, 0x75, 0x75, 0x75, 0x04, 0xFD, 0x01, 0xF7, 0xE0, 0xD6, 0xC1, 0x5A, 0x0E, 0x96, 0x3E, 0xA5, 0x37, 0x22, 0x2B, 0xEA, 0xAA, 0xA7, 0x8D, 0x5F, 0x31, 0x55, 0xB1, 0x3F, 0xCE, 0xCA, 0x2C, 0x2B, + 0x7F, 0x09, 0x8C, 0xA3, 0x00 }; + // QR code (version 4, 33x33 modules, EC level L) encoding: // https://github.com/armel/uv-k1-k5v3-firmware-custom/wiki // Stored in framebuffer column-major format: 5 fb-lines x 33 columns. // Last fb-line uses only bit 0 (row 32); bits 1..7 are always 0. -static const uint8_t BITMAP_QR_GitHub_Wiki[5][33] = { - { 0x7F, 0x41, 0x5D, 0x5D, 0x5D, 0x41, 0x7F, 0x00, 0x6A, 0x0F, 0x74, 0x0E, 0xD2, 0xB0, 0x74, 0xB1, 0x6D, 0x18, 0x59, 0x15, 0x79, 0x86, 0xCE, 0x15, 0x43, 0x00, 0x7F, 0x41, 0x5D, 0x5D, 0x5D, 0x41, 0x7F }, - { 0xCD, 0x5D, 0x83, 0x65, 0xE7, 0xC6, 0x55, 0xBD, 0x6B, 0x3F, 0xA9, 0x1C, 0xA5, 0xE0, 0x69, 0xE3, 0x4A, 0x15, 0x06, 0x2A, 0xFE, 0xCE, 0xCA, 0x3A, 0x70, 0xD9, 0xEA, 0xF5, 0x5C, 0x15, 0x8A, 0x67, 0x22 }, - { 0xFF, 0x25, 0xAE, 0xB6, 0x30, 0xF8, 0x55, 0xDD, 0x07, 0xB6, 0xC2, 0x1C, 0xA5, 0xE0, 0x69, 0xC4, 0x66, 0x15, 0x84, 0x2B, 0x72, 0xE8, 0xE9, 0x23, 0x11, 0xCD, 0xE6, 0xC1, 0x91, 0xE6, 0x88, 0x77, 0x22 }, - { 0xFD, 0x04, 0x74, 0x74, 0x74, 0x05, 0xFD, 0x01, 0xF7, 0xAE, 0x81, 0x1C, 0xA5, 0xE0, 0x69, 0x54, 0xFE, 0x37, 0x22, 0x2B, 0xEA, 0xAA, 0xA7, 0x8D, 0x5F, 0x31, 0x55, 0xB1, 0x3F, 0xCE, 0xCA, 0x24, 0x33 }, - { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00 } +// +// static const uint8_t BITMAP_QR_GitHub_Wiki[5][33] = { +// { 0x7F, 0x41, 0x5D, 0x5D, 0x5D, 0x41, 0x7F, 0x00, 0x6A, 0x0F, 0x74, 0x0E, 0xD2, 0xB0, 0x74, 0xB1, 0x6D, 0x18, 0x59, 0x15, 0x79, 0x86, 0xCE, 0x15, 0x43, 0x00, 0x7F, 0x41, 0x5D, 0x5D, 0x5D, 0x41, 0x7F }, +// { 0xCD, 0x5D, 0x83, 0x65, 0xE7, 0xC6, 0x55, 0xBD, 0x6B, 0x3F, 0xA9, 0x1C, 0xA5, 0xE0, 0x69, 0xE3, 0x4A, 0x15, 0x06, 0x2A, 0xFE, 0xCE, 0xCA, 0x3A, 0x70, 0xD9, 0xEA, 0xF5, 0x5C, 0x15, 0x8A, 0x67, 0x22 }, +// { 0xFF, 0x25, 0xAE, 0xB6, 0x30, 0xF8, 0x55, 0xDD, 0x07, 0xB6, 0xC2, 0x1C, 0xA5, 0xE0, 0x69, 0xC4, 0x66, 0x15, 0x84, 0x2B, 0x72, 0xE8, 0xE9, 0x23, 0x11, 0xCD, 0xE6, 0xC1, 0x91, 0xE6, 0x88, 0x77, 0x22 }, +// { 0xFD, 0x04, 0x74, 0x74, 0x74, 0x05, 0xFD, 0x01, 0xF7, 0xAE, 0x81, 0x1C, 0xA5, 0xE0, 0x69, 0x54, 0xFE, 0x37, 0x22, 0x2B, 0xEA, 0xAA, 0xA7, 0x8D, 0x5F, 0x31, 0x55, 0xB1, 0x3F, 0xCE, 0xCA, 0x24, 0x33 }, +// { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00 } +// }; + +static const uint8_t BITMAP_QR_GitHub_Wiki_Compressed[137] = { + 0x7F, 0x41, 0x5D, 0x5D, 0x5D, 0x41, 0x7F, 0x00, 0x6A, 0x0F, 0x74, 0x0E, 0xD2, 0xB0, 0x74, 0xB1, 0x6D, 0x18, 0x59, 0x15, 0x79, 0x86, 0xCE, 0x15, 0x43, 0x00, 0x7F, 0x41, 0x5D, 0x5D, 0x5D, 0x41, 0x7F, + 0xCD, 0x5D, 0x83, 0x65, 0xE7, 0xC6, 0x55, 0xBD, 0x6B, 0x3F, 0xA9, 0x1C, 0xA5, 0xE0, 0x69, 0xE3, 0x4A, 0x15, 0x06, 0x2A, 0xFE, 0xCE, 0xCA, 0x3A, 0x70, 0xD9, 0xEA, 0xF5, 0x5C, 0x15, 0x8A, 0x67, 0x22, + 0xFF, 0x25, 0xAE, 0xB6, 0x30, 0xF8, 0x55, 0xDD, 0x07, 0xB6, 0xC2, 0x1C, 0xA5, 0xE0, 0x69, 0xC4, 0x66, 0x15, 0x84, 0x2B, 0x72, 0xE8, 0xE9, 0x23, 0x11, 0xCD, 0xE6, 0xC1, 0x91, 0xE6, 0x88, 0x77, 0x22, + 0xFD, 0x04, 0x74, 0x74, 0x74, 0x05, 0xFD, 0x01, 0xF7, 0xAE, 0x81, 0x1C, 0xA5, 0xE0, 0x69, 0x54, 0xFE, 0x37, 0x22, 0x2B, 0xEA, 0xAA, 0xA7, 0x8D, 0x5F, 0x31, 0x55, 0xB1, 0x3F, 0xCE, 0xCA, 0x24, 0x33, + 0x7F, 0x53, 0x8E, 0xA3, 0x00 }; #endif @@ -146,8 +165,11 @@ static void QR_Draw(const uint8_t *bitmap, uint8_t size, uint8_t origin_x, uint8 { for (uint8_t qy = 0; qy < size; qy++) { for (uint8_t qx = 0; qx < size; qx++) { - const uint16_t idx = (uint16_t)(qy >> 3) * (uint16_t)size + (uint16_t)qx; - if ((bitmap[idx] >> (qy & 7u)) & 1u) { + // const uint16_t idx = (uint16_t)(qy >> 3) * (uint16_t)size + (uint16_t)qx; + // if ((bitmap[idx] >> (qy & 7u)) & 1u) { + if (qy < 32 ? + ((bitmap[(uint16_t)(qy >> 3) * (uint16_t)size + (uint16_t)qx] >> (qy & 7u)) & 1u) : + ((bitmap[132 + (qx >> 3)] >> (qx & 7u)) & 1u)) { QR_SetPixel((uint8_t)(origin_x + qx), (uint8_t)(origin_y + qy)); } @@ -157,8 +179,10 @@ static void QR_Draw(const uint8_t *bitmap, uint8_t size, uint8_t origin_x, uint8 void UI_DrawQRCode(bool wiki, uint8_t origin_x, uint8_t origin_y) { - QR_Draw(wiki ? (const uint8_t *)BITMAP_QR_GitHub_Wiki - : (const uint8_t *)BITMAP_QR_GitHub, +// QR_Draw(wiki ? (const uint8_t *)BITMAP_QR_GitHub_Wiki +// : (const uint8_t *)BITMAP_QR_GitHub, + QR_Draw(wiki ? (const uint8_t *)BITMAP_QR_GitHub_Wiki_Compressed + : (const uint8_t *)BITMAP_QR_GitHub_Compressed, 33, origin_x, origin_y); } #endif