From 0390cf792aeb57333318a8aa3d28f82ee78b4f24 Mon Sep 17 00:00:00 2001
From: OneOfEleven <OneOfEleven@users.noreply.github.com>
Date: Mon, 18 Sep 2023 18:41:26 +0100
Subject: [PATCH] On-screen charge level now has compile option

---
 Makefile            |   4 ++++
 README.md           |   1 +
 firmware            | Bin 165412 -> 165412 bytes
 firmware.bin        | Bin 49360 -> 49360 bytes
 firmware.packed.bin | Bin 49378 -> 49378 bytes
 ui/main.c           |  22 ++++++++++++----------
 6 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index e3b5714..3b59c09 100644
--- a/Makefile
+++ b/Makefile
@@ -19,6 +19,7 @@ ENABLE_MAIN_KEY_HOLD          := 1
 ENABLE_BOOT_BEEPS             := 0
 ENABLE_DTMF_DECODER           := 1
 ENABLE_COMPANDER              := 1
+ENABLE_SHOW_CHARGE_LEVEL      := 1
 #ENABLE_SINGLE_VFO_CHAN       := 1
 #ENABLE_BAND_SCOPE            := 1
 
@@ -189,6 +190,9 @@ endif
 ifeq ($(ENABLE_COMPANDER),1)
 	CFLAGS  += -DENABLE_COMPANDER
 endif
+ifeq ($(ENABLE_SHOW_CHARGE_LEVEL),1)
+	CFLAGS  += -DENABLE_SHOW_CHARGE_LEVEL
+endif
 ifeq ($(ENABLE_DTMF_DECODER),1)
 	CFLAGS  += -DENABLE_DTMF_DECODER
 endif
diff --git a/README.md b/README.md
index b59f2f9..2b00b90 100644
--- a/README.md
+++ b/README.md
@@ -30,6 +30,7 @@ ENABLE_MAIN_KEY_HOLD          := 1       initial F-key press not needed, instead
 ENABLE_BOOT_BEEPS             := 0       give user audio feedback on volume knob position at boot-up
 ENABLE_DTMF_DECODER           := 1       live on-screen DTMF decoder
 ENABLE_COMPANDER              := 1       compander option - setting not yet saved
+ENABLE_SHOW_CHARGE_LEVEL      := 1       show the charge level when the radio is on charge 
 #ENABLE_SINGLE_VFO_CHAN       := 1       not yet implemented - single VFO on display when possible
 #ENABLE_BAND_SCOPE            := 1       not yet implemented - spectrum/pan-adapter
 ```
diff --git a/firmware b/firmware
index 2ed331254bdaec99c2d6f23486eefcd93f0771cf..aa76bcb43aacf1a6023173709fb13802b7c7b340 100644
GIT binary patch
delta 40
qcmZ3|!?mP`t6>YH_HHplGgH%~6boK127gz#a9t>OyW?)g$EN@UWDObs

delta 40
qcmZ3|!?mP`t6>YH_HHo)Gjk)OL?d1<27gz#a9t>OyW?)g$EN`N(hQ^k

diff --git a/firmware.bin b/firmware.bin
index 98f615d245ed5e7bd71a8d091d390e43800cf7f7..464ecc689bc104366b6471b4ca7bd0ef425ac440 100644
GIT binary patch
delta 37
ncmcc6$b6xZd4u+DF+(#`)1(v&UM>cISGRCoD0j2t?tWGP=oAa9

delta 37
ncmcc6$b6xZd4u+DF#|JmBcntkUM>cISGRCoD0j2t?tWGP;Rg#f

diff --git a/firmware.packed.bin b/firmware.packed.bin
index 04254d225474a2f373276faae3216798eafeb293..5fdf81f98b8813f9234a69e3d357e528c6516c24 100644
GIT binary patch
delta 40
ycmV+@0N4NGfdk@!1F$>07PT!C)GS|DYwVyU_4$#AK@5*A{6iwMQM-=?0@dbzT@uj%

delta 40
ycmV+@0N4NGfdk@!1F$>07PKu9(|lT8YwVyU_4$#AKn#s4tVSraQM-=?0!XTXU=j!b

diff --git a/ui/main.c b/ui/main.c
index 497e659..a85ada8 100644
--- a/ui/main.c
+++ b/ui/main.c
@@ -465,16 +465,18 @@ void UI_DisplayMain(void)
 	#endif
 			if (gChargingWithTypeC)
 			{	// charging .. show the battery state
-				const uint16_t volts = (gBatteryVoltageAverage < gMin_bat_v) ? gMin_bat_v :
-				                       (gBatteryVoltageAverage > gMax_bat_v) ? gMax_bat_v :
-				                        gBatteryVoltageAverage;
-
-				sprintf(String, "Charge %u.%02uV %u%%",
-						gBatteryVoltageAverage / 100,
-						gBatteryVoltageAverage % 100,
-						(100 * (volts - gMin_bat_v)) / (gMax_bat_v - gMin_bat_v));
-
-				UI_PrintStringSmall(String, 2, 0, 3);
+				#ifdef ENABLE_SHOW_CHARGE_LEVEL
+					const uint16_t volts = (gBatteryVoltageAverage < gMin_bat_v) ? gMin_bat_v :
+										(gBatteryVoltageAverage > gMax_bat_v) ? gMax_bat_v :
+											gBatteryVoltageAverage;
+	
+					sprintf(String, "Charge %u.%02uV %u%%",
+							gBatteryVoltageAverage / 100,
+							gBatteryVoltageAverage % 100,
+							(100 * (volts - gMin_bat_v)) / (gMax_bat_v - gMin_bat_v));
+	
+					UI_PrintStringSmall(String, 2, 0, 3);
+				#endif
 			}
 		}