yetangitu/Battery-Emulator
1
0
Fork 0
mirror of https://github.com/dalathegreat/Battery-Emulator.git synced 2025-10-03 17:59:27 +02:00
Code Issues Projects Releases Packages Wiki Activity

potential fix for wifi issues

Browse source
This commit is contained in:
Brett Christensen 2024-02-06 07:28:19 +11:00
parent 440e010a71
commit c0781ef35a
2 changed files with 62 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

116
Software/src/devboard/webserver/webserver.cpp
View file

@ -36,9 +36,6 @@ const char index_html[] PROGMEM = R"rawliteral(
</html>
)rawliteral";
String wifi_state;
bool wifi_connected;
// Wifi connect time declarations and definition
unsigned long wifi_connect_start_time;
unsigned long wifi_connect_current_time;
@ -46,6 +43,10 @@ unsigned long wifi_connect_timeout = 5000; // Timeout for WiFi connect in mi
unsigned long wifi_monitor_loop_time = 30000; // Will check if WiFi is connected and try reconnect every x milliseconds
unsigned long last_wifi_monitor_run = 0;
enum WiFiState { DISCONNECTED, CONNECTING, CONNECTED };
WiFiState wifi_state = DISCONNECTED;
void init_webserver() {
// Configure WiFi
if (AccessPointEnabled) {
@ -249,79 +250,54 @@ void init_webserver() {
#endif
}
// Function to handle WiFi connection
void WiFi_monitor_loop() {
unsigned long currentMillis = millis();
if (currentMillis - last_wifi_monitor_run > wifi_monitor_loop_time) {
last_wifi_monitor_run = currentMillis;
if (WiFi.status() != WL_CONNECTED && wifi_state != "Connecting") {
wifi_connected = false;
wifi_state = "Not connected";
Serial.print("Wifi disconnected. Attempting reconnection");
init_WiFi_STA(ssid, password);
} else if (WiFi.status() == WL_CONNECTED && wifi_state != "Connected") {
wifi_connected = true;
wifi_state = "Connected";
if (WiFi.status() != WL_CONNECTED) {
handle_WiFi_reconnection(currentMillis);
} else if (wifi_state != CONNECTED) {
wifi_state = CONNECTED;
Serial.println("Wifi reconnected");
}
}
}
// Function to handle WiFi disconnection
void handle_WiFi_reconnection(unsigned long currentMillis) {
if (wifi_state == CONNECTING && currentMillis - wifi_connect_start_time > wifi_connect_timeout) {
wifi_state = DISCONNECTED;
Serial.println("Failed to connect to WiFi network: " + String(ssid));
Serial.println("Please check WiFi network name and password, and if WiFi network is available.");
Serial.println("Will try again in " + String((wifi_monitor_loop_time - (millis() - last_wifi_monitor_run)) / 1000) +
" seconds.");
} else if (wifi_state != CONNECTING) {
wifi_state = DISCONNECTED;
Serial.println("Wifi disconnected. Attempting reconnection");
init_WiFi_STA(ssid, password);
}
}
// Function to initialize WiFi in Station Mode
void init_WiFi_STA(const char* ssid, const char* password) {
Serial.println("Connecting to: " + String(ssid));
WiFi.begin(ssid, password);
wifi_state = CONNECTING;
wifi_connect_start_time = millis();
}
// Function to initialize WiFi in Access Point Mode
void init_WiFi_AP() {
Serial.print("Creating Access Point: ");
Serial.println(ssidAP);
Serial.print("With password: ");
Serial.println(passwordAP);
Serial.println("Creating Access Point: " + String(ssidAP));
Serial.println("With password: " + String(passwordAP));
WiFi.softAP(ssidAP, passwordAP);
IPAddress IP = WiFi.softAPIP();
Serial.println("Access Point created.");
Serial.print("IP address: ");
Serial.println(IP);
}
void init_WiFi_STA(const char* ssid, const char* password) {
// If we're already connected, there's nothing to do
if (WiFi.status() == WL_CONNECTED) {
if (wifi_state != "Connected") {
wifi_connected = true;
wifi_state = "Connected";
// Print local IP address and start web server
Serial.println("");
Serial.print("Connected to WiFi network: ");
Serial.println(ssid);
Serial.print("IP address: ");
Serial.println(WiFi.localIP());
}
return;
}
// If we're not currently trying to connect, start the connection process
if (wifi_state != "Connecting") {
Serial.print("Connecting to: ");
Serial.println(ssid);
WiFi.begin(ssid, password);
wifi_state = "Connecting";
wifi_connect_start_time = millis();
return;
}
// If we've been trying to connect for more than 5000ms, give up
if (millis() - wifi_connect_start_time > wifi_connect_timeout) {
wifi_state = "Not connected";
Serial.print("Failed to connect to WiFi network: ");
Serial.println(ssid);
Serial.println("Please check WiFi network name and password, and if WiFi network is available.");
Serial.print("Will try again in ");
Serial.print((wifi_monitor_loop_time - (millis() - last_wifi_monitor_run)) / 1000);
Serial.println(" seconds.");
return;
}
// Otherwise, just print a dot to indicate that we're still trying to connect
Serial.print(".");
Serial.println("IP address: " + IP.toString());
}
// Function to initialize ElegantOTA
void init_ElegantOTA() {
ElegantOTA.begin(&server); // Start ElegantOTA
// ElegantOTA callbacks
@ -330,6 +306,20 @@ void init_ElegantOTA() {
ElegantOTA.onEnd(onOTAEnd);
}
// Function to convert WiFiState enum to String
String wifi_state_to_string(WiFiState state) {
switch (state) {
case DISCONNECTED:
return "Disconnected";
case CONNECTING:
return "Connecting";
case CONNECTED:
return "Connected";
default:
return "Unknown";
}
}
String processor(const String& var) {
if (var == "PLACEHOLDER") {
String content = "";
@ -367,8 +357,8 @@ String processor(const String& var) {
}
// Display ssid of network connected to and, if connected to the WiFi, its own IP
content += "<h4>SSID: " + String(ssid) + "</h4>";
content += "<h4>Wifi status: " + wifi_state + "</h4>";
if (wifi_connected == true) {
content += "<h4>Wifi status: " + wifi_state_to_string(wifi_state) + "</h4>";
if (WiFi.status() == WL_CONNECTED) {
content += "<h4>IP: " + WiFi.localIP().toString() + "</h4>";
// Get and display the signal strength (RSSI)
content += "<h4>Signal Strength: " + String(WiFi.RSSI()) + " dBm</h4>";

9
Software/src/devboard/webserver/webserver.h
View file

@ -90,6 +90,15 @@ void init_WiFi_STA(const char* ssid, const char* password);
*/
void WiFi_monitor_loop();
/**
* @brief Function to handle WiFi reconnection.
*
* @param[in] void
*
* @return void
*/
void handle_WiFi_reconnection(unsigned long currentMillis);
/**
* @brief Initialization function for ElegantOTA.
*