From 05a5c096c39d6f6d8ab623c19d75b1199e9f8b38 Mon Sep 17 00:00:00 2001 From: richonguzman Date: Mon, 20 May 2024 21:54:55 -0400 Subject: [PATCH] ready to test Objects to Rf --- data_embed/index.html | 32 ++++++++++++++ src/aprs_is_utils.cpp | 2 +- src/configuration.cpp | 4 ++ src/web_utils.cpp | 98 ++++++++++++++++++++++--------------------- 4 files changed, 87 insertions(+), 49 deletions(-) diff --git a/data_embed/index.html b/data_embed/index.html index 8de16f5..fdb2bef 100644 --- a/data_embed/index.html +++ b/data_embed/index.html @@ -424,6 +424,38 @@ > +
+
+ + +
+
+
+
+ + +
+
(); aprs_is.filter = data["aprs_is"]["filter"].as(); + // aprs_is.toRF = data["aprs_is"]["toRF"].as(); + // aprs_is.messagesToRF = data["aprs_is"]["messagesToRF"].as(); aprs_is.objectsToRF = data["aprs_is"]["objectsToRF"].as(); @@ -312,7 +314,9 @@ void Configuration::init() { aprs_is.server = "rotate.aprs2.net"; aprs_is.port = 14580; aprs_is.filter = "m/10"; // new + // aprs_is.toRF = false; // new + // aprs_is.messagesToRF = false; aprs_is.objectsToRF = false; diff --git a/src/web_utils.cpp b/src/web_utils.cpp index 6d69cb8..cc73cef 100644 --- a/src/web_utils.cpp +++ b/src/web_utils.cpp @@ -94,28 +94,30 @@ namespace WEB_Utils { Config.wifiAPs.push_back(wifiap); } - Config.callsign = request->getParam("callsign", true)->value(); + Config.callsign = request->getParam("callsign", true)->value(); // Config.iGateComment = request->getParam("iGateComment", true)->value(); - Config.wifiAutoAP.password = request->getParam("wifi.autoAP.password", true)->value(); - Config.wifiAutoAP.powerOff = request->getParam("wifi.autoAP.powerOff", true)->value().toInt(); + Config.wifiAutoAP.password = request->getParam("wifi.autoAP.password", true)->value(); + Config.wifiAutoAP.powerOff = request->getParam("wifi.autoAP.powerOff", true)->value().toInt(); - Config.digi.mode = request->getParam("digi.mode", true)->value().toInt(); + Config.digi.mode = request->getParam("digi.mode", true)->value().toInt(); // Config.digi.comment = request->getParam("digi.comment", true)->value(); // Config.digi.latitude = request->getParam("digi.latitude", true)->value().toDouble(); // Config.digi.longitude = request->getParam("digi.longitude", true)->value().toDouble(); - Config.tnc.enableServer = request->hasParam("tnc.enableServer", true); - Config.tnc.enableSerial = request->hasParam("tnc.enableSerial", true); - Config.tnc.acceptOwn = request->hasParam("tnc.acceptOwn", true); + Config.tnc.enableServer = request->hasParam("tnc.enableServer", true); + Config.tnc.enableSerial = request->hasParam("tnc.enableSerial", true); + Config.tnc.acceptOwn = request->hasParam("tnc.acceptOwn", true); - Config.aprs_is.active = request->hasParam("aprs_is.active", true); - Config.aprs_is.passcode = request->getParam("aprs_is.passcode", true)->value(); - Config.aprs_is.server = request->getParam("aprs_is.server", true)->value(); - Config.aprs_is.port = request->getParam("aprs_is.port", true)->value().toInt(); + Config.aprs_is.active = request->hasParam("aprs_is.active", true); + Config.aprs_is.passcode = request->getParam("aprs_is.passcode", true)->value(); + Config.aprs_is.server = request->getParam("aprs_is.server", true)->value(); + Config.aprs_is.port = request->getParam("aprs_is.port", true)->value().toInt(); // Config.aprs_is.reportingDistance = request->getParam("aprs_is.reportingDistance", true)->value().toInt(); - Config.aprs_is.filter = request->getParam("aprs_is.filter", true)->value(); - Config.aprs_is.toRF = request->hasParam("aprs_is.toRF", true); + Config.aprs_is.filter = request->getParam("aprs_is.filter", true)->value(); + Config.aprs_is.toRF = request->hasParam("aprs_is.toRF", true); + Config.aprs_is.messagesToRF = request->hasParam("aprs_is.messagesToRF", true); + Config.aprs_is.objectsToRF = request->hasParam("aprs_is.objectsToRF", true); // Config.loramodule.iGateFreq = request->getParam("lora.iGateFreq", true)->value().toInt(); // if (request->hasParam("lora.digirepeaterTxFreq", true)) { @@ -125,60 +127,60 @@ namespace WEB_Utils { // Config.loramodule.digirepeaterRxFreq = request->getParam("lora.digirepeaterRxFreq", true)->value().toInt(); // } - Config.loramodule.txFreq = request->getParam("lora.txFreq", true)->value().toInt(); - Config.loramodule.rxFreq = request->getParam("lora.rxFreq", true)->value().toInt(); - Config.loramodule.spreadingFactor = request->getParam("lora.spreadingFactor", true)->value().toInt(); - Config.loramodule.signalBandwidth = request->getParam("lora.signalBandwidth", true)->value().toInt(); - Config.loramodule.codingRate4 = request->getParam("lora.codingRate4", true)->value().toInt(); - Config.loramodule.power = request->getParam("lora.power", true)->value().toInt(); - Config.loramodule.txActive = request->hasParam("lora.txActive", true); - Config.loramodule.rxActive = request->hasParam("lora.rxActive", true); + Config.loramodule.txFreq = request->getParam("lora.txFreq", true)->value().toInt(); + Config.loramodule.rxFreq = request->getParam("lora.rxFreq", true)->value().toInt(); + Config.loramodule.spreadingFactor = request->getParam("lora.spreadingFactor", true)->value().toInt(); + Config.loramodule.signalBandwidth = request->getParam("lora.signalBandwidth", true)->value().toInt(); + Config.loramodule.codingRate4 = request->getParam("lora.codingRate4", true)->value().toInt(); + Config.loramodule.power = request->getParam("lora.power", true)->value().toInt(); + Config.loramodule.txActive = request->hasParam("lora.txActive", true); + Config.loramodule.rxActive = request->hasParam("lora.rxActive", true); - Config.display.alwaysOn = request->hasParam("display.alwaysOn", true); + Config.display.alwaysOn = request->hasParam("display.alwaysOn", true); if (!Config.display.alwaysOn) { - Config.display.timeout = request->getParam("display.timeout", true)->value().toInt(); + Config.display.timeout = request->getParam("display.timeout", true)->value().toInt(); } - Config.display.turn180 = request->hasParam("display.turn180", true); + Config.display.turn180 = request->hasParam("display.turn180", true); - Config.syslog.active = request->hasParam("syslog.active", true); + Config.syslog.active = request->hasParam("syslog.active", true); if (Config.syslog.active) { - Config.syslog.server = request->getParam("syslog.server", true)->value(); - Config.syslog.port = request->getParam("syslog.port", true)->value().toInt(); + Config.syslog.server = request->getParam("syslog.server", true)->value(); + Config.syslog.port = request->getParam("syslog.port", true)->value().toInt(); } - Config.bme.active = request->hasParam("bme.active", true); - Config.bme.heightCorrection = request->getParam("bme.heightCorrection", true)->value().toInt(); - Config.bme.temperatureCorrection = request->getParam("bme.temperatureCorrection", true)->value().toFloat(); + Config.bme.active = request->hasParam("bme.active", true); + Config.bme.heightCorrection = request->getParam("bme.heightCorrection", true)->value().toInt(); + Config.bme.temperatureCorrection = request->getParam("bme.temperatureCorrection", true)->value().toFloat(); - Config.ota.username = request->getParam("ota.username", true)->value(); - Config.ota.password = request->getParam("ota.password", true)->value(); + Config.ota.username = request->getParam("ota.username", true)->value(); + Config.ota.password = request->getParam("ota.password", true)->value(); - Config.beacon.interval = request->getParam("beacon.interval", true)->value().toInt(); - Config.beacon.sendViaAPRSIS = request->hasParam("beacon.sendViaAPRSIS", true); - Config.beacon.sendViaRF = request->hasParam("beacon.sendViaRF", true); - Config.beacon.latitude = request->getParam("beacon.latitude", true)->value().toDouble(); - Config.beacon.longitude = request->getParam("beacon.longitude", true)->value().toDouble(); - Config.beacon.comment = request->getParam("beacon.comment", true)->value(); - Config.beacon.overlay = request->getParam("beacon.overlay", true)->value(); - Config.beacon.symbol = request->getParam("beacon.symbol", true)->value(); - Config.beacon.path = request->getParam("beacon.path", true)->value(); + Config.beacon.interval = request->getParam("beacon.interval", true)->value().toInt(); + Config.beacon.sendViaAPRSIS = request->hasParam("beacon.sendViaAPRSIS", true); + Config.beacon.sendViaRF = request->hasParam("beacon.sendViaRF", true); + Config.beacon.latitude = request->getParam("beacon.latitude", true)->value().toDouble(); + Config.beacon.longitude = request->getParam("beacon.longitude", true)->value().toDouble(); + Config.beacon.comment = request->getParam("beacon.comment", true)->value(); + Config.beacon.overlay = request->getParam("beacon.overlay", true)->value(); + Config.beacon.symbol = request->getParam("beacon.symbol", true)->value(); + Config.beacon.path = request->getParam("beacon.path", true)->value(); // Config.beaconInterval = request->getParam("other.beaconInterval", true)->value().toInt(); // Config.igateSendsLoRaBeacons = request->hasParam("other.igateSendsLoRaBeacons", true); // Config.igateRepeatsLoRaPackets = request->hasParam("other.igateRepeatsLoRaPackets", true); - Config.rememberStationTime = request->getParam("other.rememberStationTime", true)->value().toInt(); - Config.sendBatteryVoltage = request->hasParam("other.sendBatteryVoltage", true); - Config.externalVoltageMeasurement = request->hasParam("other.externalVoltageMeasurement", true); + Config.rememberStationTime = request->getParam("other.rememberStationTime", true)->value().toInt(); + Config.sendBatteryVoltage = request->hasParam("other.sendBatteryVoltage", true); + Config.externalVoltageMeasurement = request->hasParam("other.externalVoltageMeasurement", true); if (Config.externalVoltageMeasurement) { - Config.externalVoltagePin = request->getParam("other.externalVoltagePin", true)->value().toInt(); + Config.externalVoltagePin = request->getParam("other.externalVoltagePin", true)->value().toInt(); } - Config.lowPowerMode = request->hasParam("other.lowPowerMode", true); - Config.lowVoltageCutOff = request->getParam("other.lowVoltageCutOff", true)->value().toDouble(); + Config.lowPowerMode = request->hasParam("other.lowPowerMode", true); + Config.lowVoltageCutOff = request->getParam("other.lowVoltageCutOff", true)->value().toDouble(); if (Config.bme.active) { Config.beacon.symbol = "_"; @@ -186,7 +188,7 @@ namespace WEB_Utils { Config.writeFile(); - AsyncWebServerResponse *response = request->beginResponse(302, "text/html", ""); + AsyncWebServerResponse *response = request->beginResponse(302, "text/html", ""); response->addHeader("Location", "/"); request->send(response);