diff --git a/data/igate_conf.json b/data/igate_conf.json index f1d6324..058de8f 100644 --- a/data/igate_conf.json +++ b/data/igate_conf.json @@ -46,8 +46,8 @@ "turn180": false }, "battery": { - "sendBatteryVoltage": false, - "externalVoltageMeasurement": false, + "sendInternalVoltage": false, + "sendExternalVoltage": false, "externalVoltagePin": 34 }, "bme": { diff --git a/data_embed/index.html b/data_embed/index.html index e2cc389..2d8ffcb 100644 --- a/data_embed/index.html +++ b/data_embed/index.html @@ -933,12 +933,12 @@
@@ -948,12 +948,12 @@ > diff --git a/data_embed/script.js b/data_embed/script.js index ae333b0..bc29cb3 100644 --- a/data_embed/script.js +++ b/data_embed/script.js @@ -164,8 +164,8 @@ function loadSettings(settings) { // Beacon document.getElementById("beacon.interval").value = settings.beacon.interval; document.getElementById("other.rememberStationTime").value = settings.other.rememberStationTime; - document.getElementById("battery.sendBatteryVoltage").checked = settings.battery.sendBatteryVoltage; - document.getElementById("battery.externalVoltageMeasurement").checked = settings.battery.externalVoltageMeasurement; + document.getElementById("battery.sendInternalVoltage").checked = settings.battery.sendInternalVoltage; + document.getElementById("battery.sendExternalVoltage").checked = settings.battery.sendExternalVoltage; document.getElementById("battery.externalVoltagePin").value = settings.battery.externalVoltagePin; // document.getElementById("beacon.igateSendsLoRaBeacon").value = settings.beacon.igateSendsLoRaBeacon; // document.getElementById("beacon.igateRepeatLoRaPackets").value = settings.beacon.igateRepeatLoRaPackets; @@ -267,25 +267,25 @@ function updateImage() { } function toggleFields() { - const externalVoltageMeasurementCheckbox = document.querySelector( - 'input[name="battery.externalVoltageMeasurement"]' + const sendExternalVoltageCheckbox = document.querySelector( + 'input[name="battery.sendExternalVoltage"]' ); const externalVoltagePinInput = document.querySelector( 'input[name="battery.externalVoltagePin"]' ); externalVoltagePinInput.disabled = - !externalVoltageMeasurementCheckbox.checked; + !sendExternalVoltageCheckbox.checked; } -const externalVoltageMeasurementCheckbox = document.querySelector( - 'input[name="battery.externalVoltageMeasurement"]' +const sendExternalVoltageCheckbox = document.querySelector( + 'input[name="battery.sendExternalVoltage"]' ); const externalVoltagePinInput = document.querySelector( 'input[name="battery.externalVoltagePin"]' ); -externalVoltageMeasurementCheckbox.addEventListener("change", function () { +sendExternalVoltageCheckbox.addEventListener("change", function () { externalVoltagePinInput.disabled = !this.checked; }); diff --git a/src/configuration.cpp b/src/configuration.cpp index 2a49eca..472327f 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -33,21 +33,14 @@ void Configuration::writeFile() { data["wifi"]["autoAP"]["powerOff"] = wifiAutoAP.powerOff; data["callsign"] = callsign; - // data["stationMode"] = stationMode; // only check for config version - // data["iGateComment"] = iGateComment; - // data["other"]["beaconInterval"] = beaconInterval; - // data["other"]["igateSendsLoRaBeacons"] = igateSendsLoRaBeacons; - // data["other"]["igateRepeatsLoRaPackets"] = igateRepeatsLoRaPackets; - data["other"]["rememberStationTime"] = rememberStationTime; - data["battery"]["sendBatteryVoltage"] = battery.sendBatteryVoltage; - data["battery"]["externalVoltageMeasurement"] = battery.externalVoltageMeasurement; - data["battery"]["externalVoltagePin"] = battery.externalVoltagePin; + data["other"]["rememberStationTime"] = rememberStationTime; + + data["battery"]["sendInternalVoltage"] = battery.sendInternalVoltage; + data["battery"]["sendExternalVoltage"] = battery.sendExternalVoltage; + data["battery"]["externalVoltagePin"] = battery.externalVoltagePin; data["digi"]["mode"] = digi.mode; - // data["digi"]["comment"] = digi.comment; - // data["digi"]["latitude"] = digi.latitude; - // data["digi"]["longitude"] = digi.longitude; data["tnc"]["enableServer"] = tnc.enableServer; data["tnc"]["enableSerial"] = tnc.enableSerial; @@ -58,7 +51,6 @@ void Configuration::writeFile() { data["aprs_is"]["server"] = aprs_is.server; data["aprs_is"]["port"] = aprs_is.port; data["aprs_is"]["filter"] = aprs_is.filter; - //data["aprs_is"]["toRF"] = aprs_is.toRF; data["aprs_is"]["messagesToRF"] = aprs_is.messagesToRF; data["aprs_is"]["objectsToRF"] = aprs_is.objectsToRF; @@ -145,13 +137,9 @@ bool Configuration::readFile() { callsign = data["callsign"].as(); rememberStationTime = data["other"]["rememberStationTime"].as(); - /*sendBatteryVoltage = data["other"]["sendBatteryVoltage"].as(); - externalVoltageMeasurement = data["other"]["externalVoltageMeasurement"].as(); - externalVoltagePin = data["other"]["externalVoltagePin"].as();*/ - - battery.sendBatteryVoltage = data["battery"]["sendBatteryVoltage"].as(); - battery.externalVoltageMeasurement = data["battery"]["externalVoltageMeasurement"].as(); - battery.externalVoltagePin = data["battery"]["externalVoltagePin"].as(); + battery.sendInternalVoltage = data["battery"]["sendInternalVoltage"].as(); + battery.sendExternalVoltage = data["battery"]["sendExternalVoltage"].as(); + battery.externalVoltagePin = data["battery"]["externalVoltagePin"].as(); aprs_is.passcode = data["aprs_is"]["passcode"].as(); aprs_is.server = data["aprs_is"]["server"].as(); @@ -358,16 +346,11 @@ void Configuration::init() { ota.username = ""; ota.password = ""; - // beaconInterval = 15; // deprecated - // igateSendsLoRaBeacons = false; // deprecated - // igateRepeatsLoRaPackets = false; // deprecated + rememberStationTime = 30; - /*sendBatteryVoltage = false; - externalVoltageMeasurement = false; - externalVoltagePin = 34;*/ - - battery.sendBatteryVoltage = false; - battery.externalVoltageMeasurement = false; + + battery.sendInternalVoltage = false; + battery.sendExternalVoltage = false; battery.externalVoltagePin = 34; lowPowerMode = false; diff --git a/src/configuration.h b/src/configuration.h index a281677..c4ee337 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -68,8 +68,8 @@ public: class BATTERY { public: - bool sendBatteryVoltage; - bool externalVoltageMeasurement; + bool sendInternalVoltage; + bool sendExternalVoltage; int externalVoltagePin; }; diff --git a/src/power_utils.cpp b/src/power_utils.cpp index 4b2f448..0de8dba 100644 --- a/src/power_utils.cpp +++ b/src/power_utils.cpp @@ -128,7 +128,7 @@ namespace POWER_Utils { pinMode(INTERNAL_LED_PIN, OUTPUT); #endif - if (Config.battery.externalVoltageMeasurement) { + if (Config.battery.sendExternalVoltage) { pinMode(Config.battery.externalVoltagePin, INPUT); } diff --git a/src/utils.cpp b/src/utils.cpp index 431a45e..4dba2ad 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -122,7 +122,7 @@ namespace Utils { secondaryBeaconPacket += Config.beacon.comment; #ifdef BATTERY_PIN - if (Config.battery.sendBatteryVoltage) { + if (Config.battery.sendInternalVoltage) { String batteryInfo = "Batt=" + String(BATTERY_Utils::checkBattery(),2) + "V"; beaconPacket += " " + batteryInfo; secondaryBeaconPacket += " " + batteryInfo; @@ -130,7 +130,7 @@ namespace Utils { } #endif - if (Config.battery.externalVoltageMeasurement) { + if (Config.battery.sendExternalVoltage) { String externalVoltage = String(BATTERY_Utils::checkExternalVoltage(),2) + "V"; beaconPacket += " Ext=" + externalVoltage; secondaryBeaconPacket += " Ext=" + externalVoltage; diff --git a/src/web_utils.cpp b/src/web_utils.cpp index 688faf4..b7f33fb 100644 --- a/src/web_utils.cpp +++ b/src/web_utils.cpp @@ -156,10 +156,10 @@ namespace WEB_Utils { Config.ota.username = request->getParam("ota.username", true)->value(); Config.ota.password = request->getParam("ota.password", true)->value(); - Config.rememberStationTime = request->getParam("other.rememberStationTime", true)->value().toInt(); - Config.battery.sendBatteryVoltage = request->hasParam("battery.sendBatteryVoltage", true); - Config.battery.externalVoltageMeasurement = request->hasParam("battery.externalVoltageMeasurement", true); - if (Config.battery.externalVoltageMeasurement) { + Config.rememberStationTime = request->getParam("other.rememberStationTime", true)->value().toInt(); + Config.battery.sendInternalVoltage = request->hasParam("battery.sendInternalVoltage", true); + Config.battery.sendExternalVoltage = request->hasParam("battery.sendExternalVoltage", true); + if (Config.battery.sendExternalVoltage) { Config.battery.externalVoltagePin = request->getParam("battery.externalVoltagePin", true)->value().toInt(); }