github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-03-20 16:47:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved initial setup

Browse Source
This commit is contained in:
Gunnar Skjold
2026-02-26 14:37:18 +01:00
parent 0b4884652f
commit 6889253d86
8 changed files with 160 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
lib/SvelteUi/src/AmsWebServer.cpp
View File

@@ -137,6 +137,8 @@ void AmsWebServer::setup(AmsConfiguration* config, GpioConfig* gpioConfig, AmsDa
server.on(context + F("/cloudkey.json"), HTTP_GET, std::bind(&AmsWebServer::cloudkeyJson, this));
server.on(context + F("/wifiscan.json"), HTTP_GET, std::bind(&AmsWebServer::wifiScan, this));
server.on(context + F("/wifitest.json"), HTTP_POST, std::bind(&AmsWebServer::wifiTestStart, this));
server.on(context + F("/wifitest.json"), HTTP_GET, std::bind(&AmsWebServer::wifiTestStatus, this));
server.on(context + F("/configuration.json"), HTTP_GET, std::bind(&AmsWebServer::configurationJson, this));
server.on(context + F("/save"), HTTP_POST, std::bind(&AmsWebServer::handleSave, this));
@@ -2928,4 +2930,47 @@ void AmsWebServer::wifiScan() {
server.setContentLength(strlen(buf));
server.send(200, MIME_JSON, buf);
}
}
void AmsWebServer::wifiTestStart() {
if(!checkSecurity(1))
return;
if(WiFi.getMode() == WIFI_AP_STA) {
wifiTestStarted = millis();
String ssid = server.arg(F("ssid"));
String psk = server.arg(F("psk"));
WiFi.begin(ssid, psk);
wifiTestInProgress = true;
wifiTestStatusCode = 0;
}
wifiTestStatus();
}
void AmsWebServer::wifiTestStatus() {
if(!checkSecurity(1))
return;
if(wifiTestInProgress) {
wifiTestStatusCode = WiFi.status();
if(wifiTestStatusCode == WL_DISCONNECTED) { // Still trying to connect
if(millis() - wifiTestStarted > WIFI_TEST_TIMEOUT) {
wifiTestInProgress = false;
wifiTestStatusCode = 99; // Custom code for timeout
}
} else {
wifiTestInProgress = false;
}
}
wifi_config_t conf;
esp_wifi_get_config((wifi_interface_t)ESP_IF_WIFI_STA, &conf);
snprintf_P(buf, BufferSize, PSTR("{\"ssid\":\"%s\",\"status\":%d,\"time\":%lu,\"ip\":\"%s\"}"), conf.sta.ssid, wifiTestStatusCode, wifiTestInProgress ? millis() - wifiTestStarted : 0, WiFi.localIP().toString().c_str());
server.sendHeader(HEADER_CACHE_CONTROL, CACHE_CONTROL_NO_CACHE);
server.sendHeader(HEADER_PRAGMA, PRAGMA_NO_CACHE);
server.sendHeader(HEADER_EXPIRES, EXPIRES_OFF);
server.setContentLength(strlen(buf));
server.send(200, MIME_JSON, buf);
}