From 26b27ff528fea497ba167eafbf7c31c9917d9937 Mon Sep 17 00:00:00 2001 From: Juraj Andrassy Date: Wed, 8 Nov 2023 11:58:50 +0100 Subject: [PATCH] WiFiSTA - new status constant WL_STOPPED to change initial WiFi.status() because WL_NO_SHIELD is checked in any generic Arduino WiFi example --- libraries/WiFi/src/WiFiGeneric.cpp | 2 +- libraries/WiFi/src/WiFiSTA.cpp | 2 +- libraries/WiFi/src/WiFiType.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/WiFi/src/WiFiGeneric.cpp b/libraries/WiFi/src/WiFiGeneric.cpp index 733b90ad525..6b1d7358bc6 100644 --- a/libraries/WiFi/src/WiFiGeneric.cpp +++ b/libraries/WiFi/src/WiFiGeneric.cpp @@ -1049,7 +1049,7 @@ esp_err_t WiFiGenericClass::_eventCallback(arduino_event_t *event) log_e("esp_wifi_set_ps failed"); } } else if(event->event_id == ARDUINO_EVENT_WIFI_STA_STOP) { - WiFiSTAClass::_setStatus(WL_NO_SHIELD); + WiFiSTAClass::_setStatus(WL_STOPPED); clearStatusBits(STA_STARTED_BIT | STA_CONNECTED_BIT | STA_HAS_IP_BIT | STA_HAS_IP6_BIT); } else if(event->event_id == ARDUINO_EVENT_WIFI_STA_CONNECTED) { WiFiSTAClass::_setStatus(WL_IDLE_STATUS); diff --git a/libraries/WiFi/src/WiFiSTA.cpp b/libraries/WiFi/src/WiFiSTA.cpp index b2ae6a28a94..deb67019450 100644 --- a/libraries/WiFi/src/WiFiSTA.cpp +++ b/libraries/WiFi/src/WiFiSTA.cpp @@ -123,7 +123,7 @@ wifi_auth_mode_t WiFiSTAClass::_minSecurity = WIFI_AUTH_WPA2_PSK; wifi_scan_method_t WiFiSTAClass::_scanMethod = WIFI_FAST_SCAN; wifi_sort_method_t WiFiSTAClass::_sortMethod = WIFI_CONNECT_AP_BY_SIGNAL; -static wl_status_t _sta_status = WL_NO_SHIELD; +static wl_status_t _sta_status = WL_STOPPED; static EventGroupHandle_t _sta_status_group = NULL; void WiFiSTAClass::_setStatus(wl_status_t status) diff --git a/libraries/WiFi/src/WiFiType.h b/libraries/WiFi/src/WiFiType.h index 9b7b00e2c3a..0b273e85fed 100644 --- a/libraries/WiFi/src/WiFiType.h +++ b/libraries/WiFi/src/WiFiType.h @@ -41,6 +41,7 @@ typedef enum { WL_NO_SHIELD = 255, // for compatibility with WiFi Shield library + WL_STOPPED = 254, WL_IDLE_STATUS = 0, WL_NO_SSID_AVAIL = 1, WL_SCAN_COMPLETED = 2,