diff --git a/data_embed/bootstrap.css.gz b/data_embed/bootstrap.css.gz index 35d0f6a..f3831bd 100644 Binary files a/data_embed/bootstrap.css.gz and b/data_embed/bootstrap.css.gz differ diff --git a/data_embed/bootstrap.js.gz b/data_embed/bootstrap.js.gz index d689c4f..31ceff1 100644 Binary files a/data_embed/bootstrap.js.gz and b/data_embed/bootstrap.js.gz differ diff --git a/data_embed/favicon.png.gz b/data_embed/favicon.png.gz index f3954cf..4c5dac5 100644 Binary files a/data_embed/favicon.png.gz and b/data_embed/favicon.png.gz differ diff --git a/data_embed/index.html b/data_embed/index.html index f5cfda7..c63dc5b 100644 --- a/data_embed/index.html +++ b/data_embed/index.html @@ -142,15 +142,15 @@
+
+
+
+ + + + + NOTIFICATIONS +
+
+
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+ +
+ + Pin +
+
+
+ +
+ + Pin +
+
+
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+ +
+ + Pin +
+
+
+ +
+ + Pin +
+
+
+ +
+ + Pin +
+
+
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+
+
diff --git a/data_embed/index.html.gz b/data_embed/index.html.gz index 39c5da4..edb6007 100644 Binary files a/data_embed/index.html.gz and b/data_embed/index.html.gz differ diff --git a/data_embed/script.js b/data_embed/script.js index 4e7c93e..ecb5f9c 100644 --- a/data_embed/script.js +++ b/data_embed/script.js @@ -67,7 +67,9 @@ logCheckbox.addEventListener("change", function () { function loadSettings(settings) { currentSettings = settings; - // Display + // BEACONS + + // DISPLAY document.getElementById("display.showSymbol").checked = settings.display.showSymbol; document.getElementById("display.ecoMode").checked = settings.display.ecoMode; document.getElementById("display.timeout").value = settings.display.timeout; @@ -82,18 +84,48 @@ function loadSettings(settings) { document.getElementById("battery.voltageAsTelemetry").checked = settings.battery.voltageAsTelemetry; document.getElementById("battery.sendVoltageAlways").checked = settings.battery.sendVoltageAlways; + // OTHER + /*document.getElementById("simplifiedTrackerMode").checked = settings.simplifiedTrackerMode; + document.getElementById("sendCommentAfterXBeacons").value = settings.sendCommentAfterXBeacons; + document.getElementById("path").value = settings.path; + document.getElementById("nonSmartBeaconRate").value = settings.nonSmartBeaconRate;*/ + document.getElementById("rememberStationTime").value = settings.rememberStationTime; + /*document.getElementById("maxDistanceToTracker").value = settings.maxDistanceToTracker; + document.getElementById("standingUpdateTime").value = settings.standingUpdateTime; + document.getElementById("sendAltitude").checked = settings.sendAltitude ; + document.getElementById("disableGPS").checked = settings.disableGPS;*/ + + // WINLINK + document.getElementById("winlink.password").value = settings.winlink.password; + // TELEMETRY BME/WX document.getElementById("bme.active").checked = settings.bme.active; document.getElementById("bme.temperatureCorrection").value = settings.bme.temperatureCorrection.toFixed(1); document.getElementById("bme.sendTelemetry").checked = settings.bme.sendTelemetry; + // NOTIFICATION + document.getElementById("notification.ledTx").checked = settings.notification.ledTx; + document.getElementById("notification.ledTxPin").value = settings.notification.ledTxPin; + document.getElementById("notification.ledMessage").checked = settings.notification.ledMessage; + document.getElementById("notification.ledMessagePin").value = settings.notification.ledMessagePin; + document.getElementById("notification.ledFlashlight").checked = settings.notification.ledFlashlight; + document.getElementById("notification.ledFlashlightPin").value = settings.notification.ledFlashlightPin; + document.getElementById("notification.buzzerActive").checked = settings.notification.buzzerActive; + document.getElementById("notification.buzzerPinTone").value = settings.notification.buzzerPinTone; + document.getElementById("notification.buzzerPinVcc").value = settings.notification.buzzerPinVcc; + document.getElementById("notification.bootUpBeep").checked = settings.notification.bootUpBeep; + document.getElementById("notification.txBeep").checked = settings.notification.txBeep; + document.getElementById("notification.messageRxBeep").checked = settings.notification.messageRxBeep; + document.getElementById("notification.stationBeep").checked = settings.notification.stationBeep; + document.getElementById("notification.lowBatteryBeep").checked = settings.notification.lowBatteryBeep; + document.getElementById("notification.shutDownBeep").checked = settings.notification.shutDownBeep; + + // LORA + // BLUETOOTH document.getElementById("bluettooth.active").checked = settings.bluetooth.active; document.getElementById("bluettooth.type").value = settings.bluetooth.type; - - // WINLINK - document.getElementById("winlink.password").value = settings.winlink.password; - + // PTT Trigger document.getElementById("ptt.active").checked = settings.ptt.active; document.getElementById("ptt.io_pin").value = settings.ptt.io_pin; diff --git a/data_embed/script.js.gz b/data_embed/script.js.gz index 2eb2b17..baaccf2 100644 Binary files a/data_embed/script.js.gz and b/data_embed/script.js.gz differ diff --git a/data_embed/style.css.gz b/data_embed/style.css.gz index 10d2509..345458b 100644 Binary files a/data_embed/style.css.gz and b/data_embed/style.css.gz differ diff --git a/src/web_utils.cpp b/src/web_utils.cpp index d9f8af2..fabe952 100644 --- a/src/web_utils.cpp +++ b/src/web_utils.cpp @@ -100,19 +100,15 @@ namespace WEB_Utils { Config.battery.voltageAsTelemetry = request->hasParam("battery.voltageAsTelemetry", true); Config.battery.sendVoltageAlways = request->hasParam("battery.sendVoltageAlways", true); - Config.rememberStationTime = request->getParam("other.rememberStationTime", true)->value().toInt(); - - // other - /*Config.simplifiedTrackerMode = request->hasParam("other.simplifiedTrackerMode", true); - Config.sendCommentAfterXBeacons = request->getParam("other.sendCommentAfterXBeacons", true)->value().toInt(); - Config.path = request->getParam("other.path", true)->value(); - Config.nonSmartBeaconRate = request->getParam("other.nonSmartBeaconRate", true)->value().toInt(); - Config.rememberStationTime = request->getParam("other.rememberStationTime", true)->value().toInt(); - Config.maxDistanceToTracker = request->getParam("other.maxDistanceToTracker", true)->value().toInt(); - Config.standingUpdateTime = request->getParam("other.standingUpdateTime", true)->value().toInt(); - Config.sendAltitude = request->hasParam("other.sendAltitude", true); - Config.disableGPS = request->hasParam("other.disableGPS", true);*/ - // + /*Config.simplifiedTrackerMode = request->hasParam("simplifiedTrackerMode", true); + Config.sendCommentAfterXBeacons = request->getParam("sendCommentAfterXBeacons", true)->value().toInt(); + Config.path = request->getParam("path", true)->value(); + Config.nonSmartBeaconRate = request->getParam("nonSmartBeaconRate", true)->value().toInt();*/ + Config.rememberStationTime = request->getParam("rememberStationTime", true)->value().toInt(); + /*Config.maxDistanceToTracker = request->getParam("maxDistanceToTracker", true)->value().toInt(); + Config.standingUpdateTime = request->getParam("standingUpdateTime", true)->value().toInt(); + Config.sendAltitude = request->hasParam("sendAltitude", true); + Config.disableGPS = request->hasParam("disableGPS", true);*/ Config.winlink.password = request->getParam("winlink.password", true)->value(); @@ -120,21 +116,21 @@ namespace WEB_Utils { Config.bme.temperatureCorrection = request->getParam("bme.temperatureCorrection", true)->value().toFloat(); Config.bme.sendTelemetry = request->hasParam("bme.sendTelemetry", true); - /*Config.notification.ledTx = request->hasParam("notification.ledTx", true); - Config.notification.ledTxPin = request->getParam("notification.ledTxPin", true)->value().toInt(); + Config.notification.ledTx = request->hasParam("notification.ledTx", true); + //Config.notification.ledTxPin = request->getParam("notification.ledTxPin", true)->value().toInt(); Config.notification.ledMessage = request->hasParam("notification.ledMessage", true); - Config.notification.ledMessagePin = request->getParam("notification.ledMessagePin", true)->value().toInt(); + //Config.notification.ledMessagePin = request->getParam("notification.ledMessagePin", true)->value().toInt(); Config.notification.ledFlashlight = request->hasParam("notification.ledFlashlight", true); - Config.notification.ledFlashlightPin = request->getParam("notification.ledFlashlightPin", true)->value().toInt(); + //Config.notification.ledFlashlightPin = request->getParam("notification.ledFlashlightPin", true)->value().toInt(); Config.notification.buzzerActive = request->hasParam("notification.buzzerActive", true); - Config.notification.buzzerPinTone = request->getParam("notification.buzzerPinTone", true)->value().toInt(); - Config.notification.buzzerPinVcc = request->getParam("notification.buzzerPinVcc", true)->value().toInt(); + //Config.notification.buzzerPinTone = request->getParam("notification.buzzerPinTone", true)->value().toInt(); + //Config.notification.buzzerPinVcc = request->getParam("notification.buzzerPinVcc", true)->value().toInt(); Config.notification.bootUpBeep = request->hasParam("notification.bootUpBeep", true); Config.notification.txBeep = request->hasParam("notification.txBeep", true); Config.notification.messageRxBeep = request->hasParam("notification.messageRxBeep", true); Config.notification.stationBeep = request->hasParam("notification.stationBeep", true); Config.notification.lowBatteryBeep = request->hasParam("notification.lowBatteryBeep", true); - Config.notification.shutDownBeep = request->hasParam("notification.shutDownBeep", true);*/ + Config.notification.shutDownBeep = request->hasParam("notification.shutDownBeep", true); // lora