From f35b6522605f2dd9990fd7d809cc789f40661f83 Mon Sep 17 00:00:00 2001 From: richonguzman Date: Sat, 28 Sep 2024 13:26:56 -0300 Subject: [PATCH] js arreglado --- data/tracker_conf.json | 1 - data_embed/bootstrap.css.gz | Bin 33963 -> 33963 bytes data_embed/bootstrap.js.gz | Bin 30641 -> 30641 bytes data_embed/favicon.png.gz | Bin 836 -> 836 bytes data_embed/index.html.gz | Bin 38935 -> 38935 bytes data_embed/script.js | 98 +++++++++++++----------------------- data_embed/script.js.gz | Bin 3903 -> 3746 bytes data_embed/style.css.gz | Bin 110 -> 110 bytes src/LoRa_APRS_Tracker.cpp | 2 +- src/configuration.cpp | 3 -- src/configuration.h | 5 +- src/web_utils.cpp | 5 +- 12 files changed, 39 insertions(+), 75 deletions(-) diff --git a/data/tracker_conf.json b/data/tracker_conf.json index d0bab56..786aab7 100644 --- a/data/tracker_conf.json +++ b/data/tracker_conf.json @@ -48,7 +48,6 @@ "path": "WIDE1-1", "nonSmartBeaconRate": 15, "rememberStationTime": 30, - "maxDistanceToTracker": 30, "standingUpdateTime": 15, "sendAltitude": true, "disableGPS": false diff --git a/data_embed/bootstrap.css.gz b/data_embed/bootstrap.css.gz index 2008edf8e176107926717f291699783680dec0ed..e4710015187477ba2e1237c341a2aeaef58787c9 100644 GIT binary patch delta 17 YcmZ48$+WtYiA}zngCRzDBiqsz05Zu1jsO4v delta 17 YcmZ48$+WtYiA}zngJA~qMz*Cb05e|&pa1{> diff --git a/data_embed/bootstrap.js.gz b/data_embed/bootstrap.js.gz index 9d58d2908c18224b7e23ddaae066900668331038..f45838c8415ca32d00906bf3c96a5e92da04cb30 100644 GIT binary patch delta 17 Ycmdn^o^j)QMmG6w4u%-rjclvS0Y3ExT>t<8 delta 17 Zcmdn^o^j)QMmG6w4u%=b8`)Nu0{}mZ25$fW diff --git a/data_embed/favicon.png.gz b/data_embed/favicon.png.gz index e56997e62724662c12de3f764459f221da20384a..ba93142765976f515d70356238060c33a1150050 100644 GIT binary patch delta 15 WcmX@Yc7%;hzMF#~Mt38d9WwwU6a&rx delta 15 WcmX@Yc7%;hzMF$#2J=QXJ7xeQssrEv diff --git a/data_embed/index.html.gz b/data_embed/index.html.gz index 89a6447930fdf15154c371945d21d146eb7ae5cb..1899e07d56204d6d4772831bf232a2ae29a85561 100644 GIT binary patch delta 40 ycmV+@0N4MQumYE`0tO$82mo9yu?BY)2*k_(MA3f|=(B|tih>A$p}EF0*8u=J response.json()) .then((settings) => { + console.log(settings); loadSettings(settings); }) .catch((err) => { @@ -49,46 +50,29 @@ function fetchSettings() { }); } -const alwaysOnCheckbox = document.querySelector( - 'input[name="display.alwaysOn"]' -); -const timeoutInput = document.querySelector('input[name="display.timeout"]'); - -alwaysOnCheckbox.addEventListener("change", function () { - timeoutInput.disabled = this.checked; -}); - - -logCheckbox.addEventListener("change", function () { - serverField.disabled = !this.checked; - portField.disabled = !this.checked; -}); - function loadSettings(settings) { currentSettings = settings; // BEACONS // ADITIONAL STATION CONFIG - 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; + document.getElementById("simplifiedTrackerMode").checked = settings.other.simplifiedTrackerMode; + document.getElementById("sendCommentAfterXBeacons").value = settings.other.sendCommentAfterXBeacons; + document.getElementById("path").value = settings.other.path; + document.getElementById("nonSmartBeaconRate").value = settings.other.nonSmartBeaconRate; + document.getElementById("rememberStationTime").value = settings.other.rememberStationTime; + document.getElementById("standingUpdateTime").value = settings.other.standingUpdateTime; + document.getElementById("sendAltitude").checked = settings.other.sendAltitude ; + document.getElementById("disableGPS").checked = settings.other.disableGPS; // 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; document.getElementById("display.turn180").checked = settings.display.turn180; - - if (settings.display.alwaysOn) { + /*if (settings.display.alwaysOn) { timeoutInput.disabled = true; - } + }*/ // BATTERY document.getElementById("battery.sendVoltage").checked = settings.battery.sendVoltage; @@ -123,19 +107,20 @@ function loadSettings(settings) { // LORA // BLUETOOTH - document.getElementById("bluettooth.active").checked = settings.bluetooth.active; - document.getElementById("bluettooth.type").value = settings.bluetooth.type; + document.getElementById("bluetooth.active").checked = settings.bluetooth.active; + document.getElementById("bluetooth.type").value = settings.bluetooth.type; // PTT Trigger - document.getElementById("ptt.active").checked = settings.ptt.active; - document.getElementById("ptt.io_pin").value = settings.ptt.io_pin; - document.getElementById("ptt.preDelay").value = settings.ptt.preDelay; - document.getElementById("ptt.postDelay").value = settings.ptt.postDelay; - document.getElementById("ptt.reverse").checked = settings.ptt.reverse; + document.getElementById("ptt.active").checked = settings.pttTrigger.active; + document.getElementById("ptt.io_pin").value = settings.pttTrigger.io_pin; + document.getElementById("ptt.preDelay").value = settings.pttTrigger.preDelay; + document.getElementById("ptt.postDelay").value = settings.pttTrigger.postDelay; + document.getElementById("ptt.reverse").checked = settings.pttTrigger.reverse; // WiFi AP document.getElementById("wifiAP.password").value = settings.wifiAP.password; + //refreshSpeedStandard(); toggleFields(); } @@ -148,14 +133,6 @@ function showToast(message) { (new bootstrap.Toast(el)).show(); } -document.getElementById('send-beacon').addEventListener('click', function (e) { - e.preventDefault(); - - fetch("/action?type=send-beacon", { method: "POST" }); - - showToast("Your beacon will be sent in a moment.
This action will be ignored if you have APRSIS and LoRa TX disabled!"); -}); - document.getElementById('reboot').addEventListener('click', function (e) { e.preventDefault(); @@ -169,7 +146,7 @@ const bmeCheckbox = document.querySelector("input[name='bme.active']"); const stationModeSelect = document.querySelector("select[name='stationMode']"); function toggleFields() { - const sendExternalVoltageCheckbox = document.querySelector( + /*const sendExternalVoltageCheckbox = document.querySelector( 'input[name="battery.sendExternalVoltage"]' ); const externalVoltagePinInput = document.querySelector( @@ -186,10 +163,10 @@ function toggleFields() { const WebadminUsername = document.querySelector( 'input[name="webadmin.username"]' - ); + );*/ } -const sendExternalVoltageCheckbox = document.querySelector( +/*const sendExternalVoltageCheckbox = document.querySelector( 'input[name="battery.sendExternalVoltage"]' ); const externalVoltagePinInput = document.querySelector( @@ -224,9 +201,9 @@ const WebadminPassword = document.querySelector( WebadminCheckbox.addEventListener("change", function () { WebadminUsername.disabled = !this.checked; WebadminPassword.disabled = !this.checked; -}); +});*/ -document.querySelector(".new button").addEventListener("click", function () { +/*document.querySelector(".new button").addEventListener("click", function () { const trackersContainer = document.querySelector(".list-tracker"); let trackerCount = document.querySelectorAll(".network").length; @@ -260,18 +237,18 @@ document.querySelector(".new button").addEventListener("click", function () { // Add the new network element to the end of the document document.querySelector(".new").before(trackerElement); -}); +});*/ -document +/*document .getElementById("action.symbol") .addEventListener("change", function () { const value = document.getElementById("action.symbol").value; document.getElementById("beacon.overlay").value = value[0]; document.getElementById("beacon.symbol").value = value[1]; - }); + });*/ -const speedStandards = { +/*const speedStandards = { 300: [125, 5, 12], 244: [125, 6, 12], 209: [125, 7, 12], @@ -303,17 +280,11 @@ function refreshSpeedStandard() { if (!found) { document.getElementById("action.speed").value = ""; } -} +}*/ -document - .getElementById("lora.signalBandwidth") - .addEventListener("focusout", refreshSpeedStandard); -document - .getElementById("lora.codingRate4") - .addEventListener("focusout", refreshSpeedStandard); -document - .getElementById("lora.spreadingFactor") - .addEventListener("focusout", refreshSpeedStandard); +/*document.getElementById("lora.signalBandwidth").addEventListener("focusout", refreshSpeedStandard); +document.getElementById("lora.codingRate4").addEventListener("focusout", refreshSpeedStandard); +document.getElementById("lora.spreadingFactor").addEventListener("focusout", refreshSpeedStandard); document.getElementById("action.speed").addEventListener("change", function () { const speed = document.getElementById("action.speed").value; @@ -329,7 +300,7 @@ document.getElementById("action.speed").addEventListener("change", function () { document.getElementById("lora.codingRate4").value = cr4; document.getElementById("lora.spreadingFactor").value = sf; } -}); +});*/ const form = document.querySelector("form"); @@ -368,8 +339,7 @@ function checkConnection() { form.addEventListener("submit", async (event) => { event.preventDefault(); - document.getElementById("beacons").value = - document.querySelectorAll(".network").length; + //document.getElementById("beacons").value = document.querySelectorAll(".beacons").length; fetch(form.action, { method: form.method, diff --git a/data_embed/script.js.gz b/data_embed/script.js.gz index d139eefbea86d92a83b4e8f001973f72e45f50e9..5a42232ae999e3bbf343d62afa4b5a6951535468 100644 GIT binary patch literal 3746 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 N{{b)(L+4OG003vnq8 loraTypes; - Ptt ptt; + PTT ptt; BLUETOOTH bluetooth; bool simplifiedTrackerMode; @@ -113,7 +113,6 @@ public: String path; int nonSmartBeaconRate; int rememberStationTime; - int maxDistanceToTracker; int standingUpdateTime; bool sendAltitude; bool disableGPS; diff --git a/src/web_utils.cpp b/src/web_utils.cpp index dd3647a..5cb210c 100644 --- a/src/web_utils.cpp +++ b/src/web_utils.cpp @@ -90,12 +90,11 @@ namespace WEB_Utils { 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.display.showSymbol = request->hasParam("display.showSymbol", true); + Config.display.showSymbol = request->hasParam("display.showSymbol", true); if (request->hasParam("display.ecoMode", true)) { Config.display.ecoMode = true; if (request->hasParam("display.timeout", true)) { @@ -104,7 +103,7 @@ namespace WEB_Utils { } else { Config.display.ecoMode = false; } - Config.display.turn180 = request->hasParam("display.turn180", true); + Config.display.turn180 = request->hasParam("display.turn180", true); Config.battery.sendVoltage = request->hasParam("battery.sendVoltage", true); Config.battery.voltageAsTelemetry = request->hasParam("battery.voltageAsTelemetry", true);