|
|
@@ -48,6 +48,38 @@
|
|
|
|
|
|
#define EXAMPLE_DO_CONNECT CONFIG_EXAMPLE_CONNECT_WIFI || CONFIG_EXAMPLE_CONNECT_ETHERNET
|
|
|
|
|
|
+#if CONFIG_EXAMPLE_WIFI_SCAN_METHOD_FAST
|
|
|
+#define EXAMPLE_WIFI_SCAN_METHOD WIFI_FAST_SCAN
|
|
|
+#elif CONFIG_EXAMPLE_WIFI_SCAN_METHOD_ALL_CHANNEL
|
|
|
+#define EXAMPLE_WIFI_SCAN_METHOD WIFI_ALL_CHANNEL_SCAN
|
|
|
+#endif
|
|
|
+
|
|
|
+#if CONFIG_EXAMPLE_WIFI_CONNECT_AP_BY_SIGNAL
|
|
|
+#define EXAMPLE_WIFI_CONNECT_AP_SORT_METHOD WIFI_CONNECT_AP_BY_SIGNAL
|
|
|
+#elif CONFIG_EXAMPLE_WIFI_CONNECT_AP_BY_SECURITY
|
|
|
+#define EXAMPLE_WIFI_CONNECT_AP_SORT_METHOD WIFI_CONNECT_AP_BY_SECURITY
|
|
|
+#endif
|
|
|
+
|
|
|
+#if CONFIG_EXAMPLE_WIFI_AUTH_OPEN
|
|
|
+#define EXAMPLE_WIFI_SCAN_AUTH_MODE_THRESHOLD WIFI_AUTH_OPEN
|
|
|
+#elif CONFIG_EXAMPLE_WIFI_AUTH_WEP
|
|
|
+#define EXAMPLE_WIFI_SCAN_AUTH_MODE_THRESHOLD WIFI_AUTH_WEP
|
|
|
+#elif CONFIG_EXAMPLE_WIFI_AUTH_WPA_PSK
|
|
|
+#define EXAMPLE_WIFI_SCAN_AUTH_MODE_THRESHOLD WIFI_AUTH_WPA_PSK
|
|
|
+#elif CONFIG_EXAMPLE_WIFI_AUTH_WPA2_PSK
|
|
|
+#define EXAMPLE_WIFI_SCAN_AUTH_MODE_THRESHOLD WIFI_AUTH_WPA2_PSK
|
|
|
+#elif CONFIG_EXAMPLE_WIFI_AUTH_WPA_WPA2_PSK
|
|
|
+#define EXAMPLE_WIFI_SCAN_AUTH_MODE_THRESHOLD WIFI_AUTH_WPA_WPA2_PSK
|
|
|
+#elif CONFIG_EXAMPLE_WIFI_AUTH_WPA2_ENTERPRISE
|
|
|
+#define EXAMPLE_WIFI_SCAN_AUTH_MODE_THRESHOLD WIFI_AUTH_WPA2_ENTERPRISE
|
|
|
+#elif CONFIG_EXAMPLE_WIFI_AUTH_WPA3_PSK
|
|
|
+#define EXAMPLE_WIFI_SCAN_AUTH_MODE_THRESHOLD WIFI_AUTH_WPA3_PSK
|
|
|
+#elif CONFIG_EXAMPLE_WIFI_AUTH_WPA2_WPA3_PSK
|
|
|
+#define EXAMPLE_WIFI_SCAN_AUTH_MODE_THRESHOLD WIFI_AUTH_WPA2_WPA3_PSK
|
|
|
+#elif CONFIG_EXAMPLE_WIFI_AUTH_WAPI_PSK
|
|
|
+#define EXAMPLE_WIFI_SCAN_AUTH_MODE_THRESHOLD WIFI_AUTH_WAPI_PSK
|
|
|
+#endif
|
|
|
+
|
|
|
static int s_active_interfaces = 0;
|
|
|
static xSemaphoreHandle s_semph_get_ip_addrs;
|
|
|
static esp_netif_t *s_example_esp_netif = NULL;
|
|
|
@@ -265,6 +297,10 @@ static esp_netif_t *wifi_start(void)
|
|
|
.sta = {
|
|
|
.ssid = CONFIG_EXAMPLE_WIFI_SSID,
|
|
|
.password = CONFIG_EXAMPLE_WIFI_PASSWORD,
|
|
|
+ .scan_method = EXAMPLE_WIFI_SCAN_METHOD,
|
|
|
+ .sort_method = EXAMPLE_WIFI_CONNECT_AP_SORT_METHOD,
|
|
|
+ .threshold.rssi = CONFIG_EXAMPLE_WIFI_SCAN_RSSI_THRESHOLD,
|
|
|
+ .threshold.authmode = EXAMPLE_WIFI_SCAN_AUTH_MODE_THRESHOLD,
|
|
|
},
|
|
|
};
|
|
|
ESP_LOGI(TAG, "Connecting to %s...", wifi_config.sta.ssid);
|