Examples: Companion_Radio: UI-New: Utilize battery from millivolts for battery percentage calculations and add it to the sensors page

Signed-off-by: Luis Garcia <git@luigi311.com>

Author: luigi311

examples/companion_radio/ui-new/UITask.cpp

@@ -1,5 +1,6 @@
 #include "UITask.h"
 #include <helpers/TxtDataHelpers.h>
+#include <helpers/Battery.h>
 #include "../MyMesh.h"
 #include "target.h"
 #ifdef WIFI_SSID
@@ -110,18 +111,7 @@ class HomeScreen : public UIScreen {
 
 
   void renderBatteryIndicator(DisplayDriver& display, uint16_t batteryMilliVolts) {
-    // Convert millivolts to percentage
-#ifndef BATT_MIN_MILLIVOLTS
-  #define BATT_MIN_MILLIVOLTS 3000
-#endif
-#ifndef BATT_MAX_MILLIVOLTS
-  #define BATT_MAX_MILLIVOLTS 4200
-#endif
-    const int minMilliVolts = BATT_MIN_MILLIVOLTS;
-    const int maxMilliVolts = BATT_MAX_MILLIVOLTS;
-    int batteryPercentage = ((batteryMilliVolts - minMilliVolts) * 100) / (maxMilliVolts - minMilliVolts);
-    if (batteryPercentage < 0) batteryPercentage = 0; // Clamp to 0%
-    if (batteryPercentage > 100) batteryPercentage = 100; // Clamp to 100%
+    int batteryPercentage = batteryPercentFromMilliVolts(batteryMilliVolts);
 
     // battery icon
     int iconWidth = 24;
@@ -358,8 +348,20 @@ class HomeScreen : public UIScreen {
             strcpy(name, "gps"); sprintf(buf, "%.4f %.4f", lat, lon);
             break;
           case LPP_VOLTAGE:
-            r.readVoltage(v);
-            strcpy(name, "voltage"); sprintf(buf, "%6.2f", v);
+            r.readVoltage(v);  // v is in volts
+
+            if (channel == TELEM_CHANNEL_SELF) {
+              // This is our own battery voltage
+              uint16_t batteryMilliVolts = (uint16_t)(v * 1000.0f + 0.5f); // convert V -> mV
+              int pct = batteryPercentFromMilliVolts(batteryMilliVolts);
+
+              strcpy(name, "battery");
+              sprintf(buf, "%4.2fV %3d%%", v, pct);
+            } else {
+              // Other voltage sensor
+              strcpy(name, "voltage");
+              sprintf(buf, "%6.2f", v);
+            }
             break;
           case LPP_CURRENT:
             r.readCurrent(v);