소스 검색

Merge branch 'bugfix/fix_set_channel_error_after_wifi_stop_v4.0' into 'release/v4.0'

esp_wifi: Fix setting channel error after WiFi stop ( backport v4.0)

See merge request espressif/esp-idf!13452
Jiang Jiang Jian 4 년 전
부모
커밋
6b294bac4c

+ 4 - 0
components/esp_event/event_send_compat.inc

@@ -269,6 +269,10 @@ static void esp_system_event_debug(const system_event_t* event)
                        MAC2STR(ap_probereqrecved->mac));
             break;
         }
+        case SYSTEM_EVENT_STA_BEACON_TIMEOUT: {
+            ESP_LOGD(TAG, "SYSTEM_EVENT_STA_BEACON_TIMEOUT");
+            break;
+        }
         case SYSTEM_EVENT_GOT_IP6: {
             const ip6_addr_t *addr = &event->event_info.got_ip6.ip6_info.ip;
             ESP_LOGD(TAG, "SYSTEM_EVENT_AP_STA_GOT_IP6 address %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x",

+ 1 - 0
components/esp_event/include/esp_event_legacy.h

@@ -47,6 +47,7 @@ typedef enum {
     SYSTEM_EVENT_AP_STADISCONNECTED,       /*!< a station disconnected from ESP32 soft-AP */
     SYSTEM_EVENT_AP_STAIPASSIGNED,         /*!< ESP32 soft-AP assign an IP to a connected station */
     SYSTEM_EVENT_AP_PROBEREQRECVED,        /*!< Receive probe request packet in soft-AP interface */
+    SYSTEM_EVENT_STA_BEACON_TIMEOUT,       /*!< ESP32 station beacon timeout */
     SYSTEM_EVENT_GOT_IP6,                  /*!< ESP32 station or ap or ethernet interface v6IP addr is preferred */
     SYSTEM_EVENT_ETH_START,                /*!< ESP32 ethernet start */
     SYSTEM_EVENT_ETH_STOP,                 /*!< ESP32 ethernet stop */

+ 2 - 0
components/esp_wifi/include/esp_wifi_types.h

@@ -521,6 +521,8 @@ typedef enum {
     WIFI_EVENT_AP_STADISCONNECTED,       /**< a station disconnected from ESP32 soft-AP */
 
     WIFI_EVENT_AP_PROBEREQRECVED,        /**< Receive probe request packet in soft-AP interface */
+
+    WIFI_EVENT_STA_BEACON_TIMEOUT,       /**< ESP32 station beacon timeout */
 } wifi_event_t;
 
 /** @cond **/

+ 1 - 1
components/esp_wifi/lib_esp32

@@ -1 +1 @@
-Subproject commit f730ff7ce07282c45fab3bdf2f42eddf7e14bce8
+Subproject commit c94eb4e69ed1e772e7db0a53bbbd13694ba59f91