From d1e5e21ae3cb17bf67dcefeaec6423af154fca56 Mon Sep 17 00:00:00 2001 From: Armel FAUVEAU Date: Thu, 8 Aug 2024 05:33:02 +0200 Subject: [PATCH] Remove E on second line (because of ChDisp FREQ) --- ui/main.c | 58 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/ui/main.c b/ui/main.c index 6921b0b..1be3346 100644 --- a/ui/main.c +++ b/ui/main.c @@ -903,38 +903,40 @@ void UI_DisplayMain(void) uint8_t countList = 0; uint8_t shiftList = 0; - // show the scan list assigment symbols - const ChannelAttributes_t att = gMR_ChannelAttributes[gEeprom.ScreenChannel[vfo_num]]; - - countList = att.scanlist1 + att.scanlist2 + att.scanlist3; - - if(countList == 0) + if(gMR_ChannelExclude[gEeprom.ScreenChannel[vfo_num]] == false) { - memcpy(p_line0 + 127 - (1 * 6), BITMAP_ScanList0, sizeof(BITMAP_ScanList0)); + // show the scan list assigment symbols + const ChannelAttributes_t att = gMR_ChannelAttributes[gEeprom.ScreenChannel[vfo_num]]; + + countList = att.scanlist1 + att.scanlist2 + att.scanlist3; + + if(countList == 0) + { + memcpy(p_line0 + 127 - (1 * 6), BITMAP_ScanList0, sizeof(BITMAP_ScanList0)); + } + else + { + shiftList = countList; + + if (att.scanlist1) + { + memcpy(p_line0 + 127 - (shiftList * 6), BITMAP_ScanList1, sizeof(BITMAP_ScanList1)); + shiftList--; + } + if (att.scanlist2) + { + memcpy(p_line0 + 127 - (shiftList * 6), BITMAP_ScanList2, sizeof(BITMAP_ScanList2)); + shiftList--; + } + if (att.scanlist3) + { + memcpy(p_line0 + 127 - (shiftList * 6), BITMAP_ScanList3, sizeof(BITMAP_ScanList3)); + } + } } else { - shiftList = countList; - - if (att.scanlist1) - { - memcpy(p_line0 + 127 - (shiftList * 6), BITMAP_ScanList1, sizeof(BITMAP_ScanList1)); - shiftList--; - } - if (att.scanlist2) - { - memcpy(p_line0 + 127 - (shiftList * 6), BITMAP_ScanList2, sizeof(BITMAP_ScanList2)); - shiftList--; - } - if (att.scanlist3) - { - memcpy(p_line0 + 127 - (shiftList * 6), BITMAP_ScanList3, sizeof(BITMAP_ScanList3)); - } - } - - if(gMR_ChannelExclude[gEeprom.ScreenChannel[vfo_num]] == true) - { - memcpy(p_line0 + (2 * 127) + 1 - 6, BITMAP_ScanListE, sizeof(BITMAP_ScanListE)); + memcpy(p_line0 + 127 - (1 * 6), BITMAP_ScanListE, sizeof(BITMAP_ScanListE)); } /*