|
|
@@ -28,6 +28,24 @@
|
|
|
#define EXAMPLE_ESP_WIFI_PASS CONFIG_ESP_WIFI_PASSWORD
|
|
|
#define EXAMPLE_ESP_MAXIMUM_RETRY CONFIG_ESP_MAXIMUM_RETRY
|
|
|
|
|
|
+#if CONFIG_ESP_WIFI_AUTH_OPEN
|
|
|
+#define ESP_WIFI_SCAN_AUTH_MODE_THRESHOLD WIFI_AUTH_OPEN
|
|
|
+#elif CONFIG_ESP_WIFI_AUTH_WEP
|
|
|
+#define ESP_WIFI_SCAN_AUTH_MODE_THRESHOLD WIFI_AUTH_WEP
|
|
|
+#elif CONFIG_ESP_WIFI_AUTH_WPA_PSK
|
|
|
+#define ESP_WIFI_SCAN_AUTH_MODE_THRESHOLD WIFI_AUTH_WPA_PSK
|
|
|
+#elif CONFIG_ESP_WIFI_AUTH_WPA2_PSK
|
|
|
+#define ESP_WIFI_SCAN_AUTH_MODE_THRESHOLD WIFI_AUTH_WPA2_PSK
|
|
|
+#elif CONFIG_ESP_WIFI_AUTH_WPA_WPA2_PSK
|
|
|
+#define ESP_WIFI_SCAN_AUTH_MODE_THRESHOLD WIFI_AUTH_WPA_WPA2_PSK
|
|
|
+#elif CONFIG_ESP_WIFI_AUTH_WPA3_PSK
|
|
|
+#define ESP_WIFI_SCAN_AUTH_MODE_THRESHOLD WIFI_AUTH_WPA3_PSK
|
|
|
+#elif CONFIG_ESP_WIFI_AUTH_WPA2_WPA3_PSK
|
|
|
+#define ESP_WIFI_SCAN_AUTH_MODE_THRESHOLD WIFI_AUTH_WPA2_WPA3_PSK
|
|
|
+#elif CONFIG_ESP_WIFI_AUTH_WAPI_PSK
|
|
|
+#define ESP_WIFI_SCAN_AUTH_MODE_THRESHOLD WIFI_AUTH_WAPI_PSK
|
|
|
+#endif
|
|
|
+
|
|
|
/* FreeRTOS event group to signal when we are connected*/
|
|
|
static EventGroupHandle_t s_wifi_event_group;
|
|
|
|
|
|
@@ -41,6 +59,7 @@ static const char *TAG = "wifi station";
|
|
|
|
|
|
static int s_retry_num = 0;
|
|
|
|
|
|
+
|
|
|
static void event_handler(void* arg, esp_event_base_t event_base,
|
|
|
int32_t event_id, void* event_data)
|
|
|
{
|
|
|
@@ -95,7 +114,7 @@ void wifi_init_sta(void)
|
|
|
/* Setting a password implies station will connect to all security modes including WEP/WPA.
|
|
|
* However these modes are deprecated and not advisable to be used. Incase your Access point
|
|
|
* doesn't support WPA2, these mode can be enabled by commenting below line */
|
|
|
- .threshold.authmode = WIFI_AUTH_WPA2_PSK,
|
|
|
+ .threshold.authmode = ESP_WIFI_SCAN_AUTH_MODE_THRESHOLD,
|
|
|
},
|
|
|
};
|
|
|
ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA) );
|
|
|
@@ -123,11 +142,6 @@ void wifi_init_sta(void)
|
|
|
} else {
|
|
|
ESP_LOGE(TAG, "UNEXPECTED EVENT");
|
|
|
}
|
|
|
-
|
|
|
- /* The event will not be processed after unregister */
|
|
|
- ESP_ERROR_CHECK(esp_event_handler_instance_unregister(IP_EVENT, IP_EVENT_STA_GOT_IP, instance_got_ip));
|
|
|
- ESP_ERROR_CHECK(esp_event_handler_instance_unregister(WIFI_EVENT, ESP_EVENT_ANY_ID, instance_any_id));
|
|
|
- vEventGroupDelete(s_wifi_event_group);
|
|
|
}
|
|
|
|
|
|
void app_main(void)
|