mirrors/uv-k5-firmware-custom
0
Fork 0
mirror of https://github.com/OneOfEleven/uv-k5-firmware-custom.git synced 2025-04-28 22:31:25 +03:00
Code Issues Releases Activity

Scanlist update

Browse Source
This commit is contained in:
OneOfEleven 2023-10-04 18:54:26 +01:00
parent 429ac36ffe
commit b26b1fab95
7 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/action.c
View File

@ -200,7 +200,7 @@ void ACTION_Scan(bool bRestart)
#endif #endif
// clear the other vfo's rssi level (to hide the antenna symbol) // clear the other vfo's rssi level (to hide the antenna symbol)
gVFO_RSSI_bar_level[gEeprom.RX_CHANNEL == 0] = 0; gVFO_RSSI_bar_level[(gEeprom.RX_CHANNEL + 1) & 1u] = 0;
// let the user see DW is not active // let the user see DW is not active
gDualWatchActive = false; gDualWatchActive = false;
@ -212,6 +212,12 @@ void ACTION_Scan(bool bRestart)
if (!bRestart) if (!bRestart)
{ // scanning { // scanning
// swap scan lists
gEeprom.SCAN_LIST_DEFAULT = (gEeprom.SCAN_LIST_DEFAULT + 1) & 1u;
gUpdateStatus = true;
}
else
{ // stop scanning
gMonitor = false; gMonitor = false;
SCANNER_Stop(); SCANNER_Stop();

1
app/main.c
View File

@ -651,6 +651,7 @@ static void MAIN_Key_STAR(bool bKeyPressed, bool bKeyHeld)
return; return;
ACTION_Scan(false); ACTION_Scan(false);
return; return;
} }

41
bitmaps.c
View File

@ -282,21 +282,28 @@ const uint8_t BITMAP_TDR2[12] =
}; };
#endif #endif
const uint8_t BITMAP_SC[12] = const uint8_t BITMAP_SC1[8] =
{ // "SC" { // "I"
0b00000000, 0b01000001,
0b01000110, 0b01000001,
0b01001001, 0b01000001,
0b01001001, 0b01111111,
0b01001001, 0b01000001,
0b00110001, 0b01000001,
0b01000001,
0b00000000
};
0b00000000, const uint8_t BITMAP_SC2[8] =
0b00111110, { // "II"
0b01000001, 0b01000001,
0b01000001, 0b01000001,
0b01111111,
0b01000001, 0b01000001,
0b00100010 0b01111111,
0b01000001,
0b01000001,
0b00000000
}; };
const uint8_t BITMAP_Antenna[5] = const uint8_t BITMAP_Antenna[5] =
@ -385,17 +392,7 @@ const uint8_t BITMAP_VFO_NotDefault[8] =
0b00010100, 0b00010100,
0b00001000 0b00001000
}; };
/*
const uint8_t BITMAP_ScanList[6] =
{ // diamond symbol
0b00001000,
0b00011100,
0b00111110,
0b00111110,
0b00011100,
0b00001000
};
*/
const uint8_t BITMAP_ScanList1[6] = const uint8_t BITMAP_ScanList1[6] =
{ // 'I' symbol { // 'I' symbol
0b00000000, 0b00000000,

4
bitmaps.h
View File

@ -46,7 +46,8 @@ extern const uint8_t BITMAP_TDR2[12];
extern const uint8_t BITMAP_NOAA[12]; extern const uint8_t BITMAP_NOAA[12];
#endif #endif
extern const uint8_t BITMAP_SC[12]; extern const uint8_t BITMAP_SC1[8];
extern const uint8_t BITMAP_SC2[8];
extern const uint8_t BITMAP_Antenna[5]; extern const uint8_t BITMAP_Antenna[5];
extern const uint8_t BITMAP_AntennaLevel1[3]; extern const uint8_t BITMAP_AntennaLevel1[3];
@ -61,7 +62,6 @@ extern const uint8_t BITMAP_MARKER[8];
extern const uint8_t BITMAP_VFO_Default[8]; extern const uint8_t BITMAP_VFO_Default[8];
extern const uint8_t BITMAP_VFO_NotDefault[8]; extern const uint8_t BITMAP_VFO_NotDefault[8];
//extern const uint8_t BITMAP_ScanList[6];
extern const uint8_t BITMAP_ScanList1[6]; extern const uint8_t BITMAP_ScanList1[6];
extern const uint8_t BITMAP_ScanList2[6]; extern const uint8_t BITMAP_ScanList2[6];

BIN
firmware.bin
View File

Binary file not shown.

BIN
firmware.packed.bin
View File

Binary file not shown.

9
ui/status.c
View File

@ -96,10 +96,13 @@ void UI_DisplayStatus(const bool test_display)
// SCAN indicator // SCAN indicator
if (gScanState != SCAN_OFF || gScreenToDisplay == DISPLAY_SCANNER || test_display) if (gScanState != SCAN_OFF || gScreenToDisplay == DISPLAY_SCANNER || test_display)
{ {
memmove(line + x, BITMAP_SC, sizeof(BITMAP_SC)); if (gEeprom.SCAN_LIST_DEFAULT == 0)
x1 = x + sizeof(BITMAP_SC); memmove(line + x, BITMAP_SC1, sizeof(BITMAP_SC1));
else
memmove(line + x, BITMAP_SC2, sizeof(BITMAP_SC2));
x1 = x + sizeof(BITMAP_SC1);
} }
x += sizeof(BITMAP_SC); x += sizeof(BITMAP_SC1);
#ifdef ENABLE_VOICE #ifdef ENABLE_VOICE
// VOICE indicator // VOICE indicator