jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-25 20:26:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix WiFi reconnect bug #385

Browse Source
This commit is contained in:
fvanroie 2022-10-01 14:09:22 +02:00
parent 2e13e55c68
commit 80bda2c78e
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/sys/net/hasp_network.cpp
View File

@ -141,6 +141,12 @@ IRAM_ATTR void networkLoop(void)
bool networkEvery5Seconds(void) bool networkEvery5Seconds(void)
{ {
if(current_network_state != last_network_state) network_run_scripts(); if(current_network_state != last_network_state) network_run_scripts();
#if HASP_USE_ETHERNET > 0
networkEvery5Seconds();
#endif
#if HASP_USE_WIFI > 0
wifiEvery5Seconds();
#endif
return current_network_state; return current_network_state;
} }

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

@ -299,10 +299,6 @@ static void wifi_callback(WiFiEvent_t event, WiFiEventInfo_t info)
LOG_DEBUG(TAG_WIFI, F("Other Event: %d"), event); LOG_DEBUG(TAG_WIFI, F("Other Event: %d"), event);
break; break;
case SYSTEM_EVENT_AP_STOP: /*!< ESP32 soft-AP stop */
case SYSTEM_EVENT_STA_STOP: /*!< ESP32 station stop */
wifiSetup();
break;
case SYSTEM_EVENT_STA_CONNECTED: /*!< ESP32 station connected to AP */ case SYSTEM_EVENT_STA_CONNECTED: /*!< ESP32 station connected to AP */
#if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(2, 0, 0) #if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(2, 0, 0)
wifiSsidConnected((const char*)info.wifi_sta_connected.ssid); wifiSsidConnected((const char*)info.wifi_sta_connected.ssid);
@ -311,6 +307,10 @@ static void wifi_callback(WiFiEvent_t event, WiFiEventInfo_t info)
#endif #endif
break; break;
case SYSTEM_EVENT_AP_STOP: /*!< ESP32 soft-AP stop */
case SYSTEM_EVENT_STA_STOP: /*!< ESP32 station stop */
// wifiSetup();
// break;
case SYSTEM_EVENT_STA_LOST_IP: /*!< ESP32 station lost IP and the IP is reset to 0 */ case SYSTEM_EVENT_STA_LOST_IP: /*!< ESP32 station lost IP and the IP is reset to 0 */
case SYSTEM_EVENT_STA_DISCONNECTED: /*!< ESP32 station disconnected from AP */ case SYSTEM_EVENT_STA_DISCONNECTED: /*!< ESP32 station disconnected from AP */
#if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(2, 0, 0) #if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(2, 0, 0)
@ -497,7 +497,7 @@ bool wifiEvery5Seconds()
return false; return false;
} }
#else #else
if(WiFi.getMode() != WIFI_STA) { if(WiFi.getMode() == WIFI_AP) {
return false; return false;
} }
#endif #endif