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

Fix I and II

Browse Source
This commit is contained in:
Armel FAUVEAU
2024-02-29 03:27:09 +01:00
parent 0a985ec0bf
commit 1a648cd836
2 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
bitmaps.c
View File

@@ -171,20 +171,20 @@ const uint8_t BITMAP_ScanList1[6] =
{ // 'I' symbol { // 'I' symbol
0b00000000, 0b00000000,
0b00000000, 0b00000000,
0b01000010, 0b01000001,
0b01111110, 0b01111111,
0b01000010, 0b01000001,
0b00000000 0b00000000
}; };
const uint8_t BITMAP_ScanList2[6] = const uint8_t BITMAP_ScanList2[6] =
{ // 'II' symbol { // 'II' symbol
0b00000000, 0b00000000,
0b01000010, 0b01000001,
0b01111110, 0b01111111,
0b01000010, 0b01000001,
0b01111110, 0b01111111,
0b01000010 0b01000001
}; };
const uint8_t BITMAP_compand[6] = const uint8_t BITMAP_compand[6] =

24
ui/status.c
View File

@@ -80,23 +80,21 @@ void UI_DisplayStatus()
#endif #endif
{ // SCAN indicator { // SCAN indicator
if (gScanStateDir != SCAN_OFF || SCANNER_IsScanning()) { if (gScanStateDir != SCAN_OFF || SCANNER_IsScanning()) {
char * s = "";
if (IS_MR_CHANNEL(gNextMrChannel) && !SCANNER_IsScanning()) { // channel mode if (IS_MR_CHANNEL(gNextMrChannel) && !SCANNER_IsScanning()) { // channel mode
switch(gEeprom.SCAN_LIST_DEFAULT) { switch(gEeprom.SCAN_LIST_DEFAULT) {
case 0: s = "1"; break; case 0:
case 1: s = "2"; break; memcpy(line + x + 2, BITMAP_ScanList1, sizeof(BITMAP_ScanList1));
case 2: s = ""; break; break;
case 1:
memcpy(line + x + 2, BITMAP_ScanList2, sizeof(BITMAP_ScanList2));
break;
case 2:
memcpy(line + x, gFontScanAll, sizeof(gFontScanAll));
break;
} }
} }
else { // frequency mode else { // frequency mode
s = "S"; UI_PrintStringSmallBufferNormal("S", line + x + 1);
}
if ((s != NULL) && (s[0] != '\0')) {
UI_PrintStringSmallBufferNormal(s, line + x + 1);
}
else
{
memcpy(line + x, gFontScanAll, sizeof(gFontScanAll));
} }
x1 = x + 10; x1 = x + 10;
} }
@@ -155,7 +153,7 @@ void UI_DisplayStatus()
if (gEeprom.KEY_LOCK) { if (gEeprom.KEY_LOCK) {
static uint8_t blink = 0; static uint8_t blink = 0;
if(FUNCTION_IsRx()) blink = 0; if(FUNCTION_IsRx() || gCurrentFunction == FUNCTION_TRANSMIT) blink = 0;
if(blink < 5) if(blink < 5)
{ {