adam/LoRa_APRS_iGate
1
0
Fork 0
mirror of https://github.com/richonguzman/LoRa_APRS_iGate.git synced 2026-08-08 01:42:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

added initial corrections to WiFiAP

Browse Source
This commit is contained in:
richonguzman
2024-10-06 22:30:44 -03:00
parent d5eb32a38b
commit 0a79b6459b
8 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/igate_conf.json
+2 -1
View File
@@ -2,8 +2,9 @@
"callsign": "NOCALL-10",
"wifi": {
"autoAP": {
"active": true,
"password": "1234567890",
"powerOff": 10
"timeout": 10
},
"AP": []
},
data_embed/index.html
+8 -8
View File
@@ -1453,10 +1453,10 @@
d="M8.5 5.5a.5.5 0 1 1-1 0 .5.5 0 0 1 1 0"
/>
</svg>
Auto AP
WiFi Auto AP
</h5>
<small
>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 @@
</div>
<div class="col-12 mt-3">
<label
for="wifi.autoAP.powerOff"
for="wifi.autoAP.timeout"
class="form-label"
>Power off timeout
>WiFi AP timeout to search again for available WiFi's
<small>(in minutes)</small></label
>
<input
type="number"
name="wifi.autoAP.powerOff"
id="wifi.autoAP.powerOff"
name="wifi.autoAP.timeout"
id="wifi.autoAP.timeout"
class="form-control"
placeholder="15"
placeholder="10"
required=""
step="1"
min="0"
/>
<div class="form-text">
Set to <strong>0</strong> if you don't
want this option.
want WiFi AP to stop.
</div>
</div>
</div>
data_embed/script.js
+1 -1
View File
@@ -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;
src/LoRa_APRS_iGate.cpp
+1 -1
View File
@@ -38,7 +38,7 @@ ________________________________________________________________________________
#include "A7670_utils.h"
#endif
String versionDate = "2024.10.06";
String versionDate = "2024.10.07";
Configuration Config;
WiFiClient espClient;
src/configuration.cpp
+6 -3
View File
@@ -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";
src/configuration.h
+2 -1
View File
@@ -13,8 +13,9 @@ public:
class WiFi_Auto_AP {
public:
bool active;
String password;
int powerOff;
int timeout;
};
class BEACON {
src/web_utils.cpp
+4 -3
View File
@@ -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();
src/wifi_utils.cpp
+2 -2
View File
@@ -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;