From 72fd2b45ec3f79a23065691edcd72ae5fc90de19 Mon Sep 17 00:00:00 2001
From: richonguzman <richon2001@hotmail.com>
Date: Sun, 22 Sep 2024 22:31:33 -0300
Subject: [PATCH] added mods to include Telemetry

---
 data_embed/index.html   | 29 +++++++++++++++--------------
 src/LoRa_APRS_iGate.cpp |  2 +-
 src/battery_utils.cpp   |  4 ++--
 src/utils.cpp           |  2 +-
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/data_embed/index.html b/data_embed/index.html
index e36e01e..249ec56 100644
--- a/data_embed/index.html
+++ b/data_embed/index.html
@@ -960,19 +960,6 @@
                             <div class="col-9 mt-2">
                                 <div class="row mt-2">
                                     <div class="col-6">
-                                        <div class="form-check form-switch">
-                                            <input
-                                                type="checkbox"
-                                                name="battery.sendVoltageAsTelemetry"
-                                                id="battery.sendVoltageAsTelemetry"
-                                                class="form-check-input"
-                                            />
-                                            <label
-                                                for="battery.sendVoltageAsTelemetry"
-                                                class="form-label"
-                                                >Send Voltage As Telemetry</label
-                                            >
-                                        </div>
                                         <div class="form-check form-switch">
                                             <input
                                                 type="checkbox"
@@ -986,6 +973,20 @@
                                                 >Send Internal Voltage</label
                                             >
                                         </div>
+                                        <div class="form-check form-switch">
+                                            <input
+                                                type="checkbox"
+                                                name="battery.sendVoltageAsTelemetry"
+                                                id="battery.sendVoltageAsTelemetry"
+                                                class="form-check-input"
+                                            />
+                                            <label
+                                                for="battery.sendVoltageAsTelemetry"
+                                                class="form-label"
+                                                style="font-style: italic;"
+                                                >(Send Voltage As Telemetry)</label   
+                                            >
+                                        </div>
                                         <div class="form-check form-switch mt-3">
                                             <input
                                                 type="checkbox"
@@ -1034,7 +1035,7 @@
                                                 >Send External Voltage</label
                                             >
                                         </div>
-                                        <div class="form-check form-switch mt-3">
+                                        <div class="form-check form-switch mt-5">
                                             <input
                                                 type="checkbox"
                                                 name="battery.monitorExternalVoltage"
diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp
index aa91c30..4637fae 100644
--- a/src/LoRa_APRS_iGate.cpp
+++ b/src/LoRa_APRS_iGate.cpp
@@ -38,7 +38,7 @@ ________________________________________________________________________________
     #include "A7670_utils.h"
 #endif
 
-String          versionDate             = "2024.09.22";
+String          versionDate             = "2024.09.23";
 Configuration   Config;
 WiFiClient      espClient;
 
diff --git a/src/battery_utils.cpp b/src/battery_utils.cpp
index 94a3370..25f1deb 100644
--- a/src/battery_utils.cpp
+++ b/src/battery_utils.cpp
@@ -259,8 +259,8 @@ namespace BATTERY_Utils {
         if (telemetryCounter == 1000) {
             telemetryCounter = 0;
         }
-        if (Config.battery.sendInternalVoltage) telemetry += generateEncodedTelemetryBytes(3.987/*checkInternalVoltage()*/, false, 0);
-        if (Config.battery.sendExternalVoltage) telemetry += generateEncodedTelemetryBytes(12.123/*checkExternalVoltage()*/, false, 1);
+        if (Config.battery.sendInternalVoltage) telemetry += generateEncodedTelemetryBytes(checkInternalVoltage(), false, 0);
+        if (Config.battery.sendExternalVoltage) telemetry += generateEncodedTelemetryBytes(checkExternalVoltage(), false, 1);
         telemetry += "|";
         return telemetry;
     }
diff --git a/src/utils.cpp b/src/utils.cpp
index c1f579a..66c78b7 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -253,7 +253,7 @@ namespace Utils {
                 }
             #endif
 
-            if (Config.battery.sendVoltageAsTelemetry && !Config.bme.active){
+            if (Config.battery.sendVoltageAsTelemetry && !Config.bme.active && (Config.battery.sendInternalVoltage || Config.battery.sendExternalVoltage)){
                 String encodedTelemetry = BATTERY_Utils::generateEncodedTelemetry();
                 beaconPacket += encodedTelemetry;
                 secondaryBeaconPacket += encodedTelemetry;