testing for external battery block

richonguzman · Aug 19, 2024 · bd67285 · bd67285
1 parent 9cc26cc
commit bd67285
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 22 deletions.
diff --git a/src/battery_utils.cpp b/src/battery_utils.cpp
@@ -210,9 +210,11 @@ namespace BATTERY_Utils {
                 shouldSleepLowVoltage = true;
             }
         #endif
-        if (Config.battery.monitorExternalVoltage && checkExternalVoltage() < Config.battery.externalSleepVoltage + 0.1) {
-            shouldSleepLowVoltage = true;
-        }
+        #ifndef HELTEC_WP
+            if (Config.battery.monitorExternalVoltage && checkExternalVoltage() < Config.battery.externalSleepVoltage + 0.1) {
+                shouldSleepLowVoltage = true;
+            }
+        #endif
         if (shouldSleepLowVoltage) {
             Utils::checkSleepByLowBatteryVoltage(0);
         }

diff --git a/src/configuration.cpp b/src/configuration.cpp
@@ -137,8 +137,8 @@ bool Configuration::readFile() {
         beacon.comment                  = data["beacon"]["comment"] | "LoRa APRS";
         beacon.interval                 = data["beacon"]["interval"] | 15;
         beacon.overlay                  = data["beacon"]["overlay"] | "L";
-        beacon.symbol                   = data["beacon"]["symbol"] | "a";     
-        beacon.path                     = data["beacon"]["path"] | "WIDE1-1";   
+        beacon.symbol                   = data["beacon"]["symbol"] | "a";
+        beacon.path                     = data["beacon"]["path"] | "WIDE1-1";
         beacon.sendViaAPRSIS            = data["beacon"]["sendViaAPRSIS"] | false;
         beacon.sendViaRF                = data["beacon"]["sendViaRF"] | false;
 

diff --git a/src/utils.cpp b/src/utils.cpp
@@ -152,24 +152,26 @@ namespace Utils {
                 }
             #endif
 
-            if (Config.battery.sendExternalVoltage || Config.battery.monitorExternalVoltage) {
-                float externalVoltage       = BATTERY_Utils::checkExternalVoltage();
-                String externalVoltageInfo  = String(externalVoltage,2) + "V";
-                if (Config.battery.sendExternalVoltage) {
-                    beaconPacket            += " Ext=";
-                    beaconPacket            += externalVoltageInfo;
-                    secondaryBeaconPacket   += " Ext=";
-                    secondaryBeaconPacket   += externalVoltageInfo;
-                    sixthLine               = "    (Ext V=";
-                    sixthLine               += externalVoltageInfo;
-                    sixthLine               += ")";
-                }
-                if (Config.battery.monitorExternalVoltage && externalVoltage < Config.battery.externalSleepVoltage) {
-                    beaconPacket            += " **ExtBatWarning:SLEEP**";
-                    secondaryBeaconPacket   += " **ExtBatWarning:SLEEP**";
-                    shouldSleepLowVoltage   = true;
+            #ifndef HELTEC_WP
+                if (Config.battery.sendExternalVoltage || Config.battery.monitorExternalVoltage) {
+                    float externalVoltage       = BATTERY_Utils::checkExternalVoltage();
+                    String externalVoltageInfo  = String(externalVoltage,2) + "V";
+                    if (Config.battery.sendExternalVoltage) {
+                        beaconPacket            += " Ext=";
+                        beaconPacket            += externalVoltageInfo;
+                        secondaryBeaconPacket   += " Ext=";
+                        secondaryBeaconPacket   += externalVoltageInfo;
+                        sixthLine               = "    (Ext V=";
+                        sixthLine               += externalVoltageInfo;
+                        sixthLine               += ")";
+                    }
+                    if (Config.battery.monitorExternalVoltage && externalVoltage < Config.battery.externalSleepVoltage) {
+                        beaconPacket            += " **ExtBatWarning:SLEEP**";
+                        secondaryBeaconPacket   += " **ExtBatWarning:SLEEP**";
+                        shouldSleepLowVoltage   = true;
+                    }
                 }
-            }
+            #endif
 
             if (Config.aprs_is.active && Config.beacon.sendViaAPRSIS && !backUpDigiMode) {
                 displayShow(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, "SENDING IGATE BEACON", 0);