Status refactoring

This commit is contained in:
Armel FAUVEAU
2024-12-10 01:50:43 +01:00
parent 1d033e995b
commit 532a3fb058

View File

@@ -61,23 +61,27 @@ void UI_DisplayStatus()
uint8_t *line = gStatusLine; uint8_t *line = gStatusLine;
unsigned int x = 0; unsigned int x = 0;
// **************
// POWER-SAVE indicator #ifdef ENABLE_NOAA
// NOAA indicator
if (!(gScanStateDir != SCAN_OFF || SCANNER_IsScanning()) && gIsNoaaMode) { // NOASS SCAN indicator
memcpy(line + x, BITMAP_NOAA, sizeof(BITMAP_NOAA));
}
// Power Save indicator
else if (gCurrentFunction == FUNCTION_POWER_SAVE) {
memcpy(line + x, gFontPowerSave, sizeof(gFontPowerSave));
}
x += 8;
#else
// Power Save indicator
if (gCurrentFunction == FUNCTION_POWER_SAVE) { if (gCurrentFunction == FUNCTION_POWER_SAVE) {
memcpy(line + x, gFontPowerSave, sizeof(gFontPowerSave)); memcpy(line + x, gFontPowerSave, sizeof(gFontPowerSave));
} }
x += 8; x += 8;
unsigned int x1 = x;
#ifdef ENABLE_NOAA
if (gIsNoaaMode) { // NOASS SCAN indicator
memcpy(line + x, BITMAP_NOAA, sizeof(BITMAP_NOAA));
x1 = x + sizeof(BITMAP_NOAA);
}
x += sizeof(BITMAP_NOAA);
#endif #endif
unsigned int x1 = x;
#ifdef ENABLE_DTMF_CALLING #ifdef ENABLE_DTMF_CALLING
if (gSetting_KILLED) { if (gSetting_KILLED) {
memset(line + x, 0xFF, 10); memset(line + x, 0xFF, 10);