ua1zbe
/
LoRa_APRS_iGate111
mirror of https://github.com/richonguzman/LoRa_APRS_iGate.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added mods to include Telemetry

This commit is contained in:
richonguzman 2024-09-22 22:31:33 -03:00
parent 0e46c64880
commit 72fd2b45ec
4 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
data_embed/index.html
View File

@ -960,19 +960,6 @@
<div class="col-9 mt-2"> <div class="col-9 mt-2">
<div class="row mt-2"> <div class="row mt-2">
<div class="col-6"> <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"> <div class="form-check form-switch">
<input <input
type="checkbox" type="checkbox"
@ -986,6 +973,20 @@
>Send Internal Voltage</label >Send Internal Voltage</label
> >
</div> </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"> <div class="form-check form-switch mt-3">
<input <input
type="checkbox" type="checkbox"
@ -1034,7 +1035,7 @@
>Send External Voltage</label >Send External Voltage</label
> >
</div> </div>
<div class="form-check form-switch mt-3"> <div class="form-check form-switch mt-5">
<input <input
type="checkbox" type="checkbox"
name="battery.monitorExternalVoltage" name="battery.monitorExternalVoltage"

2
src/LoRa_APRS_iGate.cpp
View File

@ -38,7 +38,7 @@ ________________________________________________________________________________
#include "A7670_utils.h" #include "A7670_utils.h"
#endif #endif
String versionDate = "2024.09.22"; String versionDate = "2024.09.23";
Configuration Config; Configuration Config;
WiFiClient espClient; WiFiClient espClient;

4
src/battery_utils.cpp
View File

@ -259,8 +259,8 @@ namespace BATTERY_Utils {
if (telemetryCounter == 1000) { if (telemetryCounter == 1000) {
telemetryCounter = 0; telemetryCounter = 0;
} }
if (Config.battery.sendInternalVoltage) telemetry += generateEncodedTelemetryBytes(3.987/*checkInternalVoltage()*/, false, 0); if (Config.battery.sendInternalVoltage) telemetry += generateEncodedTelemetryBytes(checkInternalVoltage(), false, 0);
if (Config.battery.sendExternalVoltage) telemetry += generateEncodedTelemetryBytes(12.123/*checkExternalVoltage()*/, false, 1); if (Config.battery.sendExternalVoltage) telemetry += generateEncodedTelemetryBytes(checkExternalVoltage(), false, 1);
telemetry += "|"; telemetry += "|";
return telemetry; return telemetry;
} }

2
src/utils.cpp
View File

@ -253,7 +253,7 @@ namespace Utils {
} }
#endif #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(); String encodedTelemetry = BATTERY_Utils::generateEncodedTelemetry();
beaconPacket += encodedTelemetry; beaconPacket += encodedTelemetry;
secondaryBeaconPacket += encodedTelemetry; secondaryBeaconPacket += encodedTelemetry;