jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-24 11:46:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Captive Portal

Browse Source
This commit is contained in:
fvanroie 2022-10-18 22:58:07 +02:00
parent b4a973dda5
commit 8490240f7f
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sys/net/hasp_wifi.cpp
View File

@ -498,7 +498,7 @@ bool wifiEvery5Seconds()
return false;
}
#else
if(WiFi.getMode() == WIFI_AP) {
if(WiFi.getMode() != WIFI_STA) {
return false;
}
#endif

23
src/sys/svc/hasp_http.cpp
View File

@ -1455,12 +1455,15 @@ static void webHandleGuiConfig()
httpMessage += getOption(-1, F("None"));
#if defined(ARDUINO_ARCH_ESP32)
char buffer[10];
uint8_t pins[] = {0, 5, 12, 13, 15, 16, 17, 18, 19, 21, 22, 23, 26, 27, 32};
for(uint8_t i = 0; i < sizeof(pins); i++) {
// if(!gpioIsSystemPin(pins[i])) {
snprintf_P(buffer, sizeof(buffer), PSTR("GPIO %d"), pins[i]);
httpMessage += getOption(pins[i], buffer);
// }
// uint8_t pins[] = {0, 5, 12, 13, 15, 16, 17, 18, 19, 21, 22, 23, 26, 27, 32};
// for(uint8_t i = 0; i < sizeof(pins); i++) {
for(uint8_t gpio = 0; gpio < NUM_DIGITAL_PINS; gpio++) {
if(!gpioIsSystemPin(gpio)) {
snprintf_P(buffer, sizeof(buffer), PSTR("GPIO %d"), gpio);
httpMessage += getOption(gpio, buffer);
} else {
LOG_WARNING(TAG_HTTP, F("pin %d"), gpio);
}
}
#else
httpMessage += getOption(5, F("D1 - GPIO 5"));
@ -2471,13 +2474,11 @@ static inline void webStartConfigPortal()
dnsServer.start(DNS_PORT, "*", apIP);
#endif // HASP_USE_CAPTIVE_PORTAL
#if HASP_USE_WIFI > 0
// reply to all requests with same HTML
// webServer.onNotFound([]() { webHandleWifiConfig(); });
#endif
webServer.on(F("/vars.css"), httpHandleFileUri);
webServer.on(F("/style.css"), httpHandleFileUri);
webServer.on(F("/script.js"), httpHandleFileUri);
// reply to all requests with same HTML
webServer.onNotFound(webHandleWifiConfig);
LOG_TRACE(TAG_HTTP, F("Wifi access point"));
}