Merge branch 'dev'
This commit is contained in:
		
						commit
						63eb72fbab
					
				|  | @ -5,4 +5,4 @@ cmake_minimum_required(VERSION 3.16) | ||||||
| include($ENV{IDF_PATH}/tools/cmake/project.cmake) | include($ENV{IDF_PATH}/tools/cmake/project.cmake) | ||||||
| # "Trim" the build. Include the minimal set of components, main, and anything it depends on. | # "Trim" the build. Include the minimal set of components, main, and anything it depends on. | ||||||
| idf_build_set_property(MINIMAL_BUILD ON) | idf_build_set_property(MINIMAL_BUILD ON) | ||||||
| project(wifi_station) | project(esp_project) | ||||||
|  |  | ||||||
|  | @ -72,13 +72,8 @@ void wifi_init_sta(void) | ||||||
| 
 | 
 | ||||||
|     wifi_config_t wifi_config = { |     wifi_config_t wifi_config = { | ||||||
|         .sta = { |         .sta = { | ||||||
|             .ssid = CONFIG_ESP_WIFI_SSID, |             .ssid = ESP_WIFI_SSID, | ||||||
|             .password = CONFIG_ESP_WIFI_PASS, |             .password = ESP_WIFI_PASS, | ||||||
|             /* Authmode threshold resets to WPA2 as default if password matches WPA2 standards (password len => 8).
 |  | ||||||
|              * If you want to connect the device to deprecated WEP/WPA networks, Please set the threshold value |  | ||||||
|              * to WIFI_AUTH_WEP/WIFI_AUTH_WPA_PSK and set the password with length and format matching to |  | ||||||
|              * WIFI_AUTH_WEP/WIFI_AUTH_WPA_PSK standards. |  | ||||||
|              */ |  | ||||||
|             .threshold.authmode = ESP_WIFI_SCAN_AUTH_MODE_THRESHOLD, |             .threshold.authmode = ESP_WIFI_SCAN_AUTH_MODE_THRESHOLD, | ||||||
|             .sae_pwe_h2e = ESP_WIFI_SAE_MODE, |             .sae_pwe_h2e = ESP_WIFI_SAE_MODE, | ||||||
|             .sae_h2e_identifier = EXAMPLE_H2E_IDENTIFIER, |             .sae_h2e_identifier = EXAMPLE_H2E_IDENTIFIER, | ||||||
|  | @ -102,10 +97,10 @@ void wifi_init_sta(void) | ||||||
|      * happened. */ |      * happened. */ | ||||||
|     if (bits & WIFI_CONNECTED_BIT) { |     if (bits & WIFI_CONNECTED_BIT) { | ||||||
|         ESP_LOGI(TAG, "connected to ap SSID:%s password:%s", |         ESP_LOGI(TAG, "connected to ap SSID:%s password:%s", | ||||||
|                  EXAMPLE_ESP_WIFI_SSID, EXAMPLE_ESP_WIFI_PASS); |                  ESP_WIFI_SSID, ESP_WIFI_PASS); | ||||||
|     } else if (bits & WIFI_FAIL_BIT) { |     } else if (bits & WIFI_FAIL_BIT) { | ||||||
|         ESP_LOGI(TAG, "Failed to connect to SSID:%s, password:%s", |         ESP_LOGI(TAG, "Failed to connect to SSID:%s, password:%s", | ||||||
|                  EXAMPLE_ESP_WIFI_SSID, EXAMPLE_ESP_WIFI_PASS); |                  ESP_WIFI_SSID, ESP_WIFI_PASS); | ||||||
|     } else { |     } else { | ||||||
|         ESP_LOGE(TAG, "UNEXPECTED EVENT"); |         ESP_LOGE(TAG, "UNEXPECTED EVENT"); | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  | @ -1,9 +1,9 @@ | ||||||
| #include "esp_event.h" | #include "esp_event.h" | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| #define CONFIG_ESP_WIFI_SSID      "YourSSID" | #define ESP_WIFI_SSID      "" | ||||||
| #define CONFIG_ESP_WIFI_PASS      "YourPASSWORD" | #define ESP_WIFI_PASS      "" | ||||||
| #define CONFIG_ESP_MAXIMUM_RETRY  3 | #define ESP_MAXIMUM_RETRY  3 | ||||||
| 
 | 
 | ||||||
| #if CONFIG_ESP_WPA3_SAE_PWE_HUNT_AND_PECK | #if CONFIG_ESP_WPA3_SAE_PWE_HUNT_AND_PECK | ||||||
| #define ESP_WIFI_SAE_MODE WPA3_SAE_PWE_HUNT_AND_PECK | #define ESP_WIFI_SAE_MODE WPA3_SAE_PWE_HUNT_AND_PECK | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Snorky
						Snorky