From 9f425bf085d41553a13f15caa9247c049caa148f Mon Sep 17 00:00:00 2001 From: Armel FAUVEAU Date: Mon, 24 Jun 2024 19:32:50 +0200 Subject: [PATCH] Fix bitmap --- bitmaps.c | 8 ++------ bitmaps.h | 4 ++-- ui/main.c | 5 +++++ ui/status.c | 4 ++-- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/bitmaps.c b/bitmaps.c index 4d8f034..2aedc33 100644 --- a/bitmaps.c +++ b/bitmaps.c @@ -203,34 +203,30 @@ const uint8_t BITMAP_ScanList4[7] = 0b01111111, }; -const uint8_t BITMAP_ScanList5[11] = +const uint8_t BITMAP_ScanList5[9] = { // 'All List' symbol 0b11111111, 0b11000011, 0b10111101, - 0b10111101, 0b11011011, 0b11100111, 0b11011011, 0b10111101, - 0b10111101, 0b11000011, 0b11111111 }; -const uint8_t BITMAP_ScanList6[11] = +const uint8_t BITMAP_ScanList6[9] = { // 'All' symbol 0b00000000, 0b00111100, 0b01000010, - 0b01000010, 0b00100100, 0b00011000, 0b00100100, 0b01000010, - 0b01000010, 0b00111100, 0b00000000 }; diff --git a/bitmaps.h b/bitmaps.h index b62ec54..b7df281 100644 --- a/bitmaps.h +++ b/bitmaps.h @@ -34,8 +34,8 @@ extern const uint8_t BITMAP_ScanList1[7]; extern const uint8_t BITMAP_ScanList2[7]; extern const uint8_t BITMAP_ScanList3[7]; extern const uint8_t BITMAP_ScanList4[7]; -extern const uint8_t BITMAP_ScanList5[11]; -extern const uint8_t BITMAP_ScanList6[11]; +extern const uint8_t BITMAP_ScanList5[9]; +extern const uint8_t BITMAP_ScanList6[9]; extern const uint8_t BITMAP_compand[6]; #ifndef ENABLE_CUSTOM_MENU_LAYOUT diff --git a/ui/main.c b/ui/main.c index 81388c1..bda93f9 100644 --- a/ui/main.c +++ b/ui/main.c @@ -922,6 +922,11 @@ void UI_DisplayMain(void) memcpy(p_line0 + 128 - (shiftList * 7), BITMAP_ScanList3, sizeof(BITMAP_ScanList3)); } + if(countList == 0) + { + memcpy(p_line0 + 128 - (1 * 7), BITMAP_ScanList4, sizeof(BITMAP_ScanList4)); + } + /* if (att.scanlist1) memcpy(p_line0 + 107, BITMAP_ScanList1, sizeof(BITMAP_ScanList1)); diff --git a/ui/status.c b/ui/status.c index 90ca90e..35be718 100644 --- a/ui/status.c +++ b/ui/status.c @@ -108,10 +108,10 @@ void UI_DisplayStatus() memcpy(line + x + 2, BITMAP_ScanList4, sizeof(BITMAP_ScanList4)); break; case 4: - memcpy(line + x, BITMAP_ScanList5, sizeof(BITMAP_ScanList5)); + memcpy(line + x + 1, BITMAP_ScanList5, sizeof(BITMAP_ScanList5)); break; case 5: - memcpy(line + x, BITMAP_ScanList6, sizeof(BITMAP_ScanList6)); + memcpy(line + x + 1, BITMAP_ScanList6, sizeof(BITMAP_ScanList6)); break; } }