From 0a79b6459bce66b1d8e85c8022b5825a3fbfdd79 Mon Sep 17 00:00:00 2001 From: richonguzman Date: Sun, 6 Oct 2024 22:30:44 -0300 Subject: [PATCH] added initial corrections to WiFiAP --- data/igate_conf.json | 3 ++- data_embed/index.html | 16 ++++++++-------- data_embed/script.js | 2 +- src/LoRa_APRS_iGate.cpp | 2 +- src/configuration.cpp | 9 ++++++--- src/configuration.h | 3 ++- src/web_utils.cpp | 7 ++++--- src/wifi_utils.cpp | 4 ++-- 8 files changed, 26 insertions(+), 20 deletions(-) diff --git a/data/igate_conf.json b/data/igate_conf.json index a0b7d23..2e08967 100644 --- a/data/igate_conf.json +++ b/data/igate_conf.json @@ -2,8 +2,9 @@ "callsign": "NOCALL-10", "wifi": { "autoAP": { + "active": true, "password": "1234567890", - "powerOff": 10 + "timeout": 10 }, "AP": [] }, diff --git a/data_embed/index.html b/data_embed/index.html index cebd0a6..202ffaa 100644 --- a/data_embed/index.html +++ b/data_embed/index.html @@ -1453,10 +1453,10 @@ d="M8.5 5.5a.5.5 0 1 1-1 0 .5.5 0 0 1 1 0" /> - Auto AP + WiFi Auto AP Add your password and power off timeout to + >Add your password and WiFi AP timeout to auto access point. Auto AP will start if there is no WiFi connection. Timeout will count from startup or last client @@ -1481,24 +1481,24 @@
Set to 0 if you don't - want this option. + want WiFi AP to stop.
diff --git a/data_embed/script.js b/data_embed/script.js index 540617a..6771e7f 100644 --- a/data_embed/script.js +++ b/data_embed/script.js @@ -196,7 +196,7 @@ function loadSettings(settings) { // WiFi Auto AP document.getElementById("wifi.autoAP.password").value = settings.wifi.autoAP.password; - document.getElementById("wifi.autoAP.powerOff").value = settings.wifi.autoAP.powerOff; + document.getElementById("wifi.autoAP.timeout").value = settings.wifi.autoAP.timeout; // OTA document.getElementById("ota.username").value = settings.ota.username; diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp index baf3601..3d13ab0 100644 --- a/src/LoRa_APRS_iGate.cpp +++ b/src/LoRa_APRS_iGate.cpp @@ -38,7 +38,7 @@ ________________________________________________________________________________ #include "A7670_utils.h" #endif -String versionDate = "2024.10.06"; +String versionDate = "2024.10.07"; Configuration Config; WiFiClient espClient; diff --git a/src/configuration.cpp b/src/configuration.cpp index 2dd5eea..1e22adc 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -17,8 +17,9 @@ void Configuration::writeFile() { } } + data["wifi"]["autoAP"]["active"] = wifiAutoAP.active; data["wifi"]["autoAP"]["password"] = wifiAutoAP.password; - data["wifi"]["autoAP"]["powerOff"] = wifiAutoAP.powerOff; + data["wifi"]["autoAP"]["timeout"] = wifiAutoAP.timeout; data["callsign"] = callsign; @@ -128,8 +129,9 @@ bool Configuration::readFile() { wifiAPs.push_back(wifiap); } + wifiAutoAP.active = data["wifi"]["autoAP"]["active"] | true; wifiAutoAP.password = data["wifi"]["autoAP"]["password"] | "1234567890"; - wifiAutoAP.powerOff = data["wifi"]["autoAP"]["powerOff"] | 10; + wifiAutoAP.timeout = data["wifi"]["autoAP"]["timeout"] | 10; callsign = data["callsign"] | "NOCALL-10"; rememberStationTime = data["other"]["rememberStationTime"] | 30; @@ -233,8 +235,9 @@ void Configuration::init() { wifiAPs.push_back(wifiap); + wifiAutoAP.active = true; wifiAutoAP.password = "1234567890"; - wifiAutoAP.powerOff = 15; + wifiAutoAP.timeout = 10; callsign = "N0CALL-10"; diff --git a/src/configuration.h b/src/configuration.h index 2e495e3..75c940b 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -13,8 +13,9 @@ public: class WiFi_Auto_AP { public: + bool active; String password; - int powerOff; + int timeout; }; class BEACON { diff --git a/src/web_utils.cpp b/src/web_utils.cpp index 8ee8c9c..33aadcf 100644 --- a/src/web_utils.cpp +++ b/src/web_utils.cpp @@ -110,10 +110,11 @@ namespace WEB_Utils { } Config.callsign = request->getParam("callsign", 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.active = request->hasParam("wifi.autoAP.active", true); + Config.wifiAutoAP.password = request->getParam("wifi.autoAP.password", true)->value(); + Config.wifiAutoAP.timeout = request->getParam("wifi.autoAP.timeout", true)->value().toInt(); + Config.aprs_is.active = request->hasParam("aprs_is.active", true); Config.aprs_is.passcode = request->getParam("aprs_is.passcode", true)->value(); diff --git a/src/wifi_utils.cpp b/src/wifi_utils.cpp index 189bc91..862e22a 100644 --- a/src/wifi_utils.cpp +++ b/src/wifi_utils.cpp @@ -132,13 +132,13 @@ namespace WIFI_Utils { } void checkIfAutoAPShouldPowerOff() { - if (WiFiAutoAPStarted && Config.wifiAutoAP.powerOff > 0) { + if (WiFiAutoAPStarted && Config.wifiAutoAP.timeout > 0) { if (WiFi.softAPgetStationNum() > 0) { WiFiAutoAPTime = 0; } else { if (WiFiAutoAPTime == 0) { WiFiAutoAPTime = millis(); - } else if ((millis() - WiFiAutoAPTime) > Config.wifiAutoAP.powerOff * 60 * 1000) { + } else if ((millis() - WiFiAutoAPTime) > Config.wifiAutoAP.timeout * 60 * 1000) { Serial.println("Stopping auto AP"); WiFiAutoAPStarted = false;