Merge pull request #15 from m5stack/fix-wifi-init-crash

fix wifi init crash with updated c6 firmware

Author: Forairaaaaa

app/apps/app_startup_anim/app_startup_anim.cpp

@@ -13,7 +13,7 @@ using namespace mooncake;
 using namespace smooth_ui_toolkit;
 using namespace smooth_ui_toolkit::lvgl_cpp;
 
-#define FIRMWARE_VERSION "V0.3"
+#define FIRMWARE_VERSION "V0.4"
 
 AppStartupAnim::AppStartupAnim()
 {

platforms/tab5/main/hal/components/hal_wifi.cpp

@@ -17,6 +17,9 @@
 #include <esp_log.h>
 #include <nvs_flash.h>
 #include <esp_netif.h>
+#include <esp_wifi_default.h>
+#include <esp_wifi_netif.h>
+#include <esp_private/wifi.h>
 #include <esp_http_server.h>
 
 #define TAG "wifi"
@@ -25,6 +28,68 @@
 #define WIFI_PASS    ""
 #define MAX_STA_CONN 4
 
+static bool s_wifi_ap_netif_started = false;
+
+static void wifi_remote_ap_start_handler(void* arg, esp_event_base_t base, int32_t event_id, void* data)
+{
+    auto* netif = static_cast<esp_netif_t*>(arg);
+    if (s_wifi_ap_netif_started || esp_netif_is_netif_up(netif)) {
+        ESP_LOGW(TAG, "ignore duplicate Wi-Fi AP start event");
+        return;
+    }
+
+    auto driver = static_cast<wifi_netif_driver_t>(esp_netif_get_io_driver(netif));
+    uint8_t mac[6];
+    esp_err_t ret = esp_wifi_get_if_mac(driver, mac);
+    if (ret != ESP_OK) {
+        ESP_LOGE(TAG, "esp_wifi_get_if_mac failed: %s", esp_err_to_name(ret));
+        return;
+    }
+
+    if (esp_wifi_is_if_ready_when_started(driver)) {
+        ret = esp_wifi_register_if_rxcb(driver, esp_netif_receive, netif);
+        if (ret != ESP_OK) {
+            ESP_LOGE(TAG, "esp_wifi_register_if_rxcb failed: %s", esp_err_to_name(ret));
+            return;
+        }
+    }
+
+    ret = esp_wifi_internal_reg_netstack_buf_cb(esp_netif_netstack_buf_ref, esp_netif_netstack_buf_free);
+    if (ret != ESP_OK) {
+        ESP_LOGE(TAG, "netstack cb register failed: %s", esp_err_to_name(ret));
+        return;
+    }
+
+    esp_netif_set_mac(netif, mac);
+    esp_netif_action_start(netif, base, event_id, data);
+    s_wifi_ap_netif_started = true;
+}
+
+static void wifi_remote_ap_stop_handler(void* arg, esp_event_base_t base, int32_t event_id, void* data)
+{
+    auto* netif = static_cast<esp_netif_t*>(arg);
+    if (!s_wifi_ap_netif_started && !esp_netif_is_netif_up(netif)) {
+        ESP_LOGW(TAG, "ignore duplicate Wi-Fi AP stop event");
+        return;
+    }
+
+    esp_netif_action_stop(netif, base, event_id, data);
+    s_wifi_ap_netif_started = false;
+}
+
+static esp_netif_t* create_wifi_remote_ap_netif()
+{
+    esp_netif_config_t cfg = ESP_NETIF_DEFAULT_WIFI_AP();
+    esp_netif_t* netif     = esp_netif_new(&cfg);
+    assert(netif);
+
+    ESP_ERROR_CHECK(esp_netif_attach_wifi_ap(netif));
+    ESP_ERROR_CHECK(esp_event_handler_register(WIFI_EVENT, WIFI_EVENT_AP_START, wifi_remote_ap_start_handler, netif));
+    ESP_ERROR_CHECK(esp_event_handler_register(WIFI_EVENT, WIFI_EVENT_AP_STOP, wifi_remote_ap_stop_handler, netif));
+
+    return netif;
+}
+
 // HTTP 处理函数
 esp_err_t hello_get_handler(httpd_req_t* req)
 {
@@ -89,7 +154,7 @@ void wifi_init_softap()
     ESP_ERROR_CHECK(esp_netif_init());
     ESP_ERROR_CHECK(esp_event_loop_create_default());
 
-    esp_netif_create_default_wifi_ap();
+    create_wifi_remote_ap_netif();
 
     wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
     ESP_ERROR_CHECK(esp_wifi_init(&cfg));