diff --git a/ui/main.c b/ui/main.c index 1be3346..6921b0b 100644 --- a/ui/main.c +++ b/ui/main.c @@ -903,40 +903,38 @@ void UI_DisplayMain(void) uint8_t countList = 0; uint8_t shiftList = 0; - if(gMR_ChannelExclude[gEeprom.ScreenChannel[vfo_num]] == false) + // 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) { - // 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)); - } - } + memcpy(p_line0 + 127 - (1 * 6), BITMAP_ScanList0, sizeof(BITMAP_ScanList0)); } else { - memcpy(p_line0 + 127 - (1 * 6), BITMAP_ScanListE, sizeof(BITMAP_ScanListE)); + 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)); } /*