Small update on memory color

This commit is contained in:
Sjef Verhoeven PE5PVB
2023-11-23 13:01:38 +01:00
parent e4e4a6c3ef
commit 504da2a1fc
+20 -9
View File
@@ -1266,7 +1266,7 @@ void ToggleBand(byte nowBand) {
band = BAND_OIRT; band = BAND_OIRT;
} else if (bandFM == FM_BAND_FM) { } else if (bandFM == FM_BAND_FM) {
// do nothing // do nothing
} }
} }
break; break;
} }
@@ -2219,7 +2219,7 @@ void KeyUp() {
case TUNE_MEM: case TUNE_MEM:
memorypos++; memorypos++;
if (memorypos > EE_PRESETS_CNT - 1) memorypos = 0; if (memorypos > EE_PRESETS_CNT - 1) memorypos = 0;
if (!memorystore) { if (!memorystore) {
DoMemoryPosTune(); DoMemoryPosTune();
} else { } else {
@@ -2315,15 +2315,26 @@ bool IsStationEmpty() {
void ShowMemoryPos() { void ShowMemoryPos() {
if (tunemode == TUNE_MEM) { if (tunemode == TUNE_MEM) {
int memposcolor; int memposcolor = 0;
log_e("memoryposstatus %d:",memoryposstatus); int memposcolorsmooth = 0;
log_e("memoryposstatus %d:", memoryposstatus);
switch (memoryposstatus) { switch (memoryposstatus) {
// case MEM_DARK: memposcolor = GreyoutColor; break; case MEM_DARK:
case MEM_DARK: memposcolor = InsignificantColor; break; memposcolor = InsignificantColor;
case MEM_NORMAL: memposcolor = PrimaryColor; break; memposcolorsmooth = InsignificantColorSmooth;
case MEM_EXIST: memposcolor = SignificantColor; break; break;
case MEM_NORMAL:
memposcolor = PrimaryColor;
memposcolorsmooth = PrimaryColorSmooth;
break;
case MEM_EXIST:
memposcolor = SignificantColor;
memposcolorsmooth = SignificantColorSmooth;
break;
} }
if (advancedRDS) tftReplace(-1, String(memoryposold + 1), String(memorypos + 1), 215, 36, SecondaryColor, SecondaryColorSmooth, 16); else tftReplace(-1, String(memoryposold + 1), String(memorypos + 1), 50, 32, memposcolor, PrimaryColorSmooth, 16); if (advancedRDS) tftReplace(-1, String(memoryposold + 1), String(memorypos + 1), 215, 36, SecondaryColor, SecondaryColorSmooth, 16); else tftReplace(-1, String(memoryposold + 1), String(memorypos + 1), 50, 32, memposcolor, memposcolorsmooth, 16);
memoryposold = memorypos; memoryposold = memorypos;
} else { } else {
if (advancedRDS) tftPrint(-1, String(memorypos + 1), 215, 36, BackgroundColor, BackgroundColor, 16); else tftPrint(-1, String(memorypos + 1), 50, 32, BackgroundColor, BackgroundColor, 16); if (advancedRDS) tftPrint(-1, String(memorypos + 1), 215, 36, BackgroundColor, BackgroundColor, 16); else tftPrint(-1, String(memorypos + 1), 50, 32, BackgroundColor, BackgroundColor, 16);