Reset WiFi Config:
- This button resets the access point settings.
- The ESP will restart and start the "WiFi Configuration Manager".
- Connect to it's access point and configure your WiFi (just like the first configuration).
- Don't forget to disable WiFi Manager AP again if you want it off.
+ This button deletes the WiFi credentials.
+ The ESP will restart and enable its own AP (if you have it checked above).
+ Connect to WiFi AP with SSID "layzspa_module######" and go to address http://192.168.4.2/wifi.html
diff --git a/Code/lib/BWC_unified/FW_VERSION.h b/Code/lib/BWC_unified/FW_VERSION.h
index c21dc98..da930d0 100644
--- a/Code/lib/BWC_unified/FW_VERSION.h
+++ b/Code/lib/BWC_unified/FW_VERSION.h
@@ -1 +1 @@
-#define FW_VERSION "2024-07-18-0900"
+#define FW_VERSION "2024-07-18-1553"
diff --git a/Code/lib/BWC_unified/enums.h b/Code/lib/BWC_unified/enums.h
index 5d714fe..d4e75bb 100644
--- a/Code/lib/BWC_unified/enums.h
+++ b/Code/lib/BWC_unified/enums.h
@@ -255,6 +255,6 @@ struct sWifi_info
String ip4DnsSecondary_str;
String ip4NTP_str;
bool enableAp;
- bool enableWmApFallback = true;
- bool enableStaticIp4 = false;
+ bool enableWmApFallback;
+ bool enableStaticIp4;
};
\ No newline at end of file
diff --git a/Code/src/main.cpp b/Code/src/main.cpp
index a114261..2a46461 100644
--- a/Code/src/main.cpp
+++ b/Code/src/main.cpp
@@ -78,6 +78,7 @@ void setup()
mqtt_info->mqttTelemetryInterval = 600;
mqtt_info->mqttUsername = MQTT_USER_F;
mqtt_info->useMqtt = true;
+ wifi_info = new sWifi_info;
}
bwc->setup();
bwc->loop();
@@ -88,7 +89,7 @@ void setup()
updateWSTimer->attach(WS_PERIOD, []{ sendWSFlag = true; });
loadWebConfig();
startWiFi();
- if(wifi_info.enableWmApFallback) startSoftAp(); // not blocking anymore so no use case should exist for this to be turned off.
+ if(wifi_info->enableWmApFallback) startSoftAp(); // not blocking anymore so no use case should exist for this to be turned off.
startHttpServer();
startWebSocket();
startOTA();
@@ -329,7 +330,7 @@ void startWiFi()
WiFi.mode(WIFI_STA);
loadWifi();
- if (wifi_info.enableStaticIp4)
+ if (wifi_info->enableStaticIp4)
{
BWC_LOG_P(PSTR("Setting static IP\n"),0);
IPAddress ip4Address;
@@ -337,23 +338,28 @@ void startWiFi()
IPAddress ip4Subnet;
IPAddress ip4DnsPrimary;
IPAddress ip4DnsSecondary;
- ip4Address.fromString(wifi_info.ip4Address_str);
- ip4Gateway.fromString(wifi_info.ip4Gateway_str);
- ip4Subnet.fromString(wifi_info.ip4Subnet_str);
- ip4DnsPrimary.fromString(wifi_info.ip4DnsPrimary_str);
- ip4DnsSecondary.fromString(wifi_info.ip4DnsSecondary_str);
+ ip4Address.fromString(wifi_info->ip4Address_str);
+ ip4Gateway.fromString(wifi_info->ip4Gateway_str);
+ ip4Subnet.fromString(wifi_info->ip4Subnet_str);
+ ip4DnsPrimary.fromString(wifi_info->ip4DnsPrimary_str);
+ ip4DnsSecondary.fromString(wifi_info->ip4DnsSecondary_str);
BWC_LOG_P(PSTR("WiFi > using static IP %s on gateway %s\n"),ip4Address.toString().c_str(), ip4Gateway.toString().c_str());
WiFi.config(ip4Address, ip4Gateway, ip4Subnet, ip4DnsPrimary, ip4DnsSecondary);
}
/* Connect in station mode to the AP given (your router/ap) */
- if (wifi_info.enableAp)
+ if (wifi_info->enableAp)
{
- BWC_LOG_P(PSTR("WiFi > using WiFi configuration with SSID %s\n"), wifi_info.apSsid.c_str());
+ BWC_LOG_P(PSTR("WiFi > using WiFi configuration with SSID %s\n"), wifi_info->apSsid.c_str());
- WiFi.begin(wifi_info.apSsid.c_str(), wifi_info.apPwd.c_str());
+ WiFi.begin(wifi_info->apSsid.c_str(), wifi_info->apPwd.c_str());
// checkWifi_ticker->attach(2.0, checkWiFi_ISR);
- BWC_LOG_P(PSTR("WiFi > Trying to connect ..."),0);
+ BWC_LOG_P(PSTR("WiFi > AP info loaded. Waiting for connection ...\n"),0);
+ }
+ else
+ {
+ BWC_LOG_P(PSTR("WiFi > AP info not found. Using last known AP ...\n"),0);
+ WiFi.begin();
}
BWC_YIELD;
}
@@ -421,7 +427,7 @@ void checkNTP()
void startNTP()
{
BWC_LOG_P(PSTR("NTP > start\n"),0);
- configTime(0,0,wifi_info.ip4NTP_str, F("pool.ntp.org"), F("time.nist.gov"));
+ configTime(0,0,wifi_info->ip4NTP_str, F("pool.ntp.org"), F("time.nist.gov"));
ntpCheck_ticker->attach(3.0, checkNTP_ISR);
}
@@ -1283,19 +1289,19 @@ void loadWifi()
return;
}
- wifi_info.enableAp = doc[F("enableAp")];
- if(doc.containsKey(F("enableWM"))) wifi_info.enableWmApFallback = doc[F("enableWM")];
- wifi_info.apSsid = doc[F("apSsid")].as