BRNSystems/brnQuanFW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Scanlist refactoring

Browse Source
This commit is contained in:
Armel FAUVEAU
2024-06-28 05:13:24 +02:00
parent 1a97a076e1
commit ae6fb50e10
7 changed files with 70 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ui/status.c
View File

@@ -50,7 +50,9 @@ static void convertTime(uint8_t *line, uint8_t type)
m = t / 60;
s = t - (m * 60);
gStatusLine[14] = 0x00; // Quick fix on display (on scanning I, II, etc.)
gStatusLine[0] = 0x00; // Quick fix on display (on scanning I, II, etc.)
gStatusLine[7] = 0x00; // Quick fix on display (on scanning I, II, etc.)
gStatusLine[14] = 0x00; // Quick fix on display (on scanning I, II, etc.)
sprintf(str, "%02d:%02d", m, s);
UI_PrintStringSmallBufferNormal(str, line + 0);
@@ -95,23 +97,25 @@ void UI_DisplayStatus()
if (gScanStateDir != SCAN_OFF || SCANNER_IsScanning()) {
if (IS_MR_CHANNEL(gNextMrChannel) && !SCANNER_IsScanning()) { // channel mode
switch(gEeprom.SCAN_LIST_DEFAULT) {
case 0:
memcpy(line + x + 2, BITMAP_ScanList1, sizeof(BITMAP_ScanList1));
case 0:
memcpy(line + 0, BITMAP_ScanList0, sizeof(BITMAP_ScanList0));
break;
case 1:
memcpy(line + x + 2, BITMAP_ScanList2, sizeof(BITMAP_ScanList2));
case 1:
memcpy(line + 0, BITMAP_ScanList1, sizeof(BITMAP_ScanList1));
break;
case 2:
memcpy(line + x + 2, BITMAP_ScanList3, sizeof(BITMAP_ScanList3));
memcpy(line + 0, BITMAP_ScanList2, sizeof(BITMAP_ScanList2));
break;
case 3:
memcpy(line + x + 2, BITMAP_ScanList4, sizeof(BITMAP_ScanList4));
memcpy(line + 0, BITMAP_ScanList3, sizeof(BITMAP_ScanList3));
break;
case 4:
memcpy(line + x + 0, BITMAP_ScanList5, sizeof(BITMAP_ScanList5));
memcpy(line + 0, BITMAP_ScanList1, sizeof(BITMAP_ScanList1));
memcpy(line + 5, BITMAP_ScanList2, sizeof(BITMAP_ScanList2));
memcpy(line + 10, BITMAP_ScanList3, sizeof(BITMAP_ScanList3));
break;
case 5:
memcpy(line + x + 1, BITMAP_ScanList6, sizeof(BITMAP_ScanList6));
memcpy(line + 0, BITMAP_ScanListAll, sizeof(BITMAP_ScanListAll));
break;
}
}