Charging message fixed

egzumer · Sep 30, 2023 · 1879f3a · 1879f3a
1 parent 1548c63
commit 1879f3a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -20,7 +20,7 @@ ENABLE_CTCSS_TAIL_PHASE_SHIFT := 1
 ENABLE_MAIN_KEY_HOLD          := 1
 ENABLE_BOOT_BEEPS             := 0
 ENABLE_COMPANDER              := 1
-ENABLE_SHOW_CHARGE_LEVEL      := 0
+ENABLE_SHOW_CHARGE_LEVEL      := 1
 ENABLE_REVERSE_BAT_SYMBOL     := 1
 ENABLE_NO_SCAN_TIMEOUT        := 1
 ENABLE_AM_FIX                 := 1

diff --git a/ui/main.c b/ui/main.c
@@ -703,13 +703,10 @@ void UI_DisplayMain(void)
 		#endif
 
 		#if defined(ENABLE_AM_FIX) && defined(ENABLE_AM_FIX_SHOW_DATA)
-			if (gEeprom.VfoInfo[gEeprom.RX_CHANNEL].AM_mode && gSetting_AM_fix)
+			if (rx && gEeprom.VfoInfo[gEeprom.RX_CHANNEL].AM_mode && gSetting_AM_fix)
 			{
-				if (rx)
-				{
-					AM_fix_print_data(gEeprom.RX_CHANNEL, String);
-					UI_PrintStringSmall(String, 2, 0, 3);
-				}
+				AM_fix_print_data(gEeprom.RX_CHANNEL, String);
+				UI_PrintStringSmall(String, 2, 0, 3);
 			}
 			else
 		#endif
@@ -720,7 +717,7 @@ void UI_DisplayMain(void)
 			else
 		#endif
 
-		if (rx || gCurrentFunction == FUNCTION_FOREGROUND)
+		if (rx || gCurrentFunction == FUNCTION_FOREGROUND || gCurrentFunction == FUNCTION_POWER_SAVE)
 		{
 			if (gSetting_live_DTMF_decoder && gDTMF_RX_live[0] >= 32)
 			{	// show live DTMF decode