espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 18:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_wifi_interface_use_v4.1' into 'release/v4.1'

Browse Source 
esp_wifi: Modify ESP_IF_WIFI_STA to WIFI_IF_STA (backport v4.1)

See merge request espressif/esp-idf!12167
This commit is contained in:
Jiang Jiang Jian
2021-03-23 03:06:42 +00:00
parent fe3ec246c0 c277240dc6
commit 8dabab4e36
23 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/driver/test/test_adc2.c
View File

@ -114,7 +114,7 @@ TEST_CASE("adc2 work with wifi","[adc]")
}, },
}; };
TEST_ESP_OK(esp_wifi_set_mode(WIFI_MODE_STA)); TEST_ESP_OK(esp_wifi_set_mode(WIFI_MODE_STA));
TEST_ESP_OK(esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config)); TEST_ESP_OK(esp_wifi_set_config(WIFI_IF_STA, &wifi_config));
//test read value //test read value
TEST_ESP_OK( adc2_get_raw( ADC2_CHANNEL_8, ADC_WIDTH_12Bit, &read_raw )); TEST_ESP_OK( adc2_get_raw( ADC2_CHANNEL_8, ADC_WIDTH_12Bit, &read_raw ));

8
components/esp_wifi/test/test_wifi.c
View File

@ -100,7 +100,7 @@ static void test_wifi_init_deinit(wifi_init_config_t *cfg, wifi_config_t* wifi_c
ESP_LOGI(TAG, EMPH_STR("esp_wifi_set_mode")); ESP_LOGI(TAG, EMPH_STR("esp_wifi_set_mode"));
TEST_ESP_OK(esp_wifi_set_mode(WIFI_MODE_STA)); TEST_ESP_OK(esp_wifi_set_mode(WIFI_MODE_STA));
ESP_LOGI(TAG, EMPH_STR("esp_wifi_set_config")); ESP_LOGI(TAG, EMPH_STR("esp_wifi_set_config"));
TEST_ESP_OK(esp_wifi_set_config(ESP_IF_WIFI_STA, wifi_config)); TEST_ESP_OK(esp_wifi_set_config(WIFI_IF_STA, wifi_config));
ESP_LOGI(TAG, EMPH_STR("esp_wifi_deinit...")); ESP_LOGI(TAG, EMPH_STR("esp_wifi_deinit..."));
TEST_ESP_OK(esp_wifi_deinit()); TEST_ESP_OK(esp_wifi_deinit());
} }
@ -114,7 +114,7 @@ static void test_wifi_start_stop(wifi_init_config_t *cfg, wifi_config_t* wifi_co
ESP_LOGI(TAG, EMPH_STR("esp_wifi_set_mode")); ESP_LOGI(TAG, EMPH_STR("esp_wifi_set_mode"));
TEST_ESP_OK(esp_wifi_set_mode(WIFI_MODE_STA)); TEST_ESP_OK(esp_wifi_set_mode(WIFI_MODE_STA));
ESP_LOGI(TAG, EMPH_STR("esp_wifi_set_config")); ESP_LOGI(TAG, EMPH_STR("esp_wifi_set_config"));
TEST_ESP_OK(esp_wifi_set_config(ESP_IF_WIFI_STA, wifi_config)); TEST_ESP_OK(esp_wifi_set_config(WIFI_IF_STA, wifi_config));
//now start wifi //now start wifi
ESP_LOGI(TAG, EMPH_STR("esp_wifi_start...")); ESP_LOGI(TAG, EMPH_STR("esp_wifi_start..."));
TEST_ESP_OK(esp_wifi_start()); TEST_ESP_OK(esp_wifi_start());
@ -267,7 +267,7 @@ static void send_ds2ds_packet(void)
// send packet 20 times to make sure receiver will get this packet // send packet 20 times to make sure receiver will get this packet
for (uint16_t i = 0; i < 20; i++) { for (uint16_t i = 0; i < 20; i++) {
esp_wifi_80211_tx(ESP_IF_WIFI_AP, ds2ds_pdu, sizeof(ds2ds_pdu), true); esp_wifi_80211_tx(WIFI_IF_AP, ds2ds_pdu, sizeof(ds2ds_pdu), true);
vTaskDelay(50 / portTICK_PERIOD_MS); vTaskDelay(50 / portTICK_PERIOD_MS);
} }
stop_wifi(); stop_wifi();
@ -329,7 +329,7 @@ static void test_wifi_connection_softap(void)
start_wifi_as_softap(); start_wifi_as_softap();
TEST_ESP_OK(esp_wifi_get_mac(ESP_IF_WIFI_AP, mac)); TEST_ESP_OK(esp_wifi_get_mac(WIFI_IF_AP, mac));
sprintf(mac_str, MACSTR, MAC2STR(mac)); sprintf(mac_str, MACSTR, MAC2STR(mac));
unity_send_signal_param("SoftAP mac", mac_str); unity_send_signal_param("SoftAP mac", mac_str);

10
components/wifi_provisioning/src/manager.c
View File

@ -1104,7 +1104,7 @@ esp_err_t wifi_prov_mgr_is_provisioned(bool *provisioned)
/* Get Wi-Fi Station configuration */ /* Get Wi-Fi Station configuration */
wifi_config_t wifi_cfg; wifi_config_t wifi_cfg;
if (esp_wifi_get_config(ESP_IF_WIFI_STA, &wifi_cfg) != ESP_OK) { if (esp_wifi_get_config(WIFI_IF_STA, &wifi_cfg) != ESP_OK) {
return ESP_FAIL; return ESP_FAIL;
} }
@ -1163,7 +1163,7 @@ esp_err_t wifi_prov_mgr_configure_sta(wifi_config_t *wifi_cfg)
} }
/* Configure Wi-Fi station with host credentials /* Configure Wi-Fi station with host credentials
* provided during provisioning */ * provided during provisioning */
if (esp_wifi_set_config(ESP_IF_WIFI_STA, wifi_cfg) != ESP_OK) { if (esp_wifi_set_config(WIFI_IF_STA, wifi_cfg) != ESP_OK) {
ESP_LOGE(TAG, "Failed to set Wi-Fi configuration"); ESP_LOGE(TAG, "Failed to set Wi-Fi configuration");
RELEASE_LOCK(prov_ctx_lock); RELEASE_LOCK(prov_ctx_lock);
return ESP_FAIL; return ESP_FAIL;
@ -1433,14 +1433,14 @@ esp_err_t wifi_prov_mgr_start_provisioning(wifi_prov_security_t security, const
* to the AP whose credentials were present earlier */ * to the AP whose credentials were present earlier */
wifi_config_t wifi_cfg_empty, wifi_cfg_old; wifi_config_t wifi_cfg_empty, wifi_cfg_old;
memset(&wifi_cfg_empty, 0, sizeof(wifi_config_t)); memset(&wifi_cfg_empty, 0, sizeof(wifi_config_t));
esp_wifi_get_config(ESP_IF_WIFI_STA, &wifi_cfg_old); esp_wifi_get_config(WIFI_IF_STA, &wifi_cfg_old);
err = esp_wifi_set_storage(WIFI_STORAGE_RAM); err = esp_wifi_set_storage(WIFI_STORAGE_RAM);
if (err != ESP_OK) { if (err != ESP_OK) {
ESP_LOGE(TAG, "Failed to set Wi-Fi storage to RAM"); ESP_LOGE(TAG, "Failed to set Wi-Fi storage to RAM");
RELEASE_LOCK(prov_ctx_lock); RELEASE_LOCK(prov_ctx_lock);
return err; return err;
} }
esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_cfg_empty); esp_wifi_set_config(WIFI_IF_STA, &wifi_cfg_empty);
if (err != ESP_OK) { if (err != ESP_OK) {
ESP_LOGE(TAG, "Failed to set empty Wi-Fi credentials"); ESP_LOGE(TAG, "Failed to set empty Wi-Fi credentials");
RELEASE_LOCK(prov_ctx_lock); RELEASE_LOCK(prov_ctx_lock);
@ -1526,7 +1526,7 @@ esp_err_t wifi_prov_mgr_start_provisioning(wifi_prov_security_t security, const
err: err:
prov_ctx->prov_state = WIFI_PROV_STATE_IDLE; prov_ctx->prov_state = WIFI_PROV_STATE_IDLE;
esp_wifi_set_storage(WIFI_STORAGE_FLASH); esp_wifi_set_storage(WIFI_STORAGE_FLASH);
esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_cfg_old); esp_wifi_set_config(WIFI_IF_STA, &wifi_cfg_old);
exit: exit:
RELEASE_LOCK(prov_ctx_lock); RELEASE_LOCK(prov_ctx_lock);

2
components/wifi_provisioning/src/scheme_softap.c
View File

@ -63,7 +63,7 @@ static esp_err_t start_wifi_ap(const char *ssid, const char *pass)
ESP_LOGE(TAG, "Failed to set Wi-Fi mode : %d", err); ESP_LOGE(TAG, "Failed to set Wi-Fi mode : %d", err);
return err; return err;
} }
err = esp_wifi_set_config(ESP_IF_WIFI_AP, &wifi_config); err = esp_wifi_set_config(WIFI_IF_AP, &wifi_config);
if (err != ESP_OK) { if (err != ESP_OK) {
ESP_LOGE(TAG, "Failed to set Wi-Fi config : %d", err); ESP_LOGE(TAG, "Failed to set Wi-Fi config : %d", err);
return err; return err;

4
components/wpa_supplicant/src/rsn_supp/wpa.c
View File

@ -1009,7 +1009,7 @@ int ieee80211w_set_keys(struct wpa_sm *sm,
if (keyidx > 4095) { if (keyidx > 4095) {
return -1; return -1;
} }
return esp_wifi_set_igtk_internal(ESP_IF_WIFI_STA, igtk); return esp_wifi_set_igtk_internal(WIFI_IF_STA, igtk);
} }
return 0; return 0;
#else #else
@ -2148,7 +2148,7 @@ int wpa_set_bss(char *macddr, char * bssid, u8 pairwise_cipher, u8 group_cipher,
if (esp_wifi_sta_pmf_enabled()) { if (esp_wifi_sta_pmf_enabled()) {
wifi_config_t wifi_cfg; wifi_config_t wifi_cfg;
esp_wifi_get_config(ESP_IF_WIFI_STA, &wifi_cfg); esp_wifi_get_config(WIFI_IF_STA, &wifi_cfg);
sm->pmf_cfg = wifi_cfg.sta.pmf_cfg; sm->pmf_cfg = wifi_cfg.sta.pmf_cfg;
sm->mgmt_group_cipher = cipher_type_map_public_to_supp(esp_wifi_sta_get_mgmt_group_cipher()); sm->mgmt_group_cipher = cipher_type_map_public_to_supp(esp_wifi_sta_get_mgmt_group_cipher());
} else { } else {

2
examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/components/case/wifi_connect.c
View File

@ -127,7 +127,7 @@ static void start(const char *ssid, const char *passwd)
ESP_LOGI(TAG, "Connecting to %s...", wifi_config.sta.ssid); ESP_LOGI(TAG, "Connecting to %s...", wifi_config.sta.ssid);
ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA)); ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA));
ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config)); ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_STA, &wifi_config));
ESP_ERROR_CHECK(esp_wifi_start()); ESP_ERROR_CHECK(esp_wifi_start());
esp_wifi_connect(); esp_wifi_connect();
s_connection_name = ssid; s_connection_name = ssid;

4
examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/components/iperf/cmd_wifi.c
View File

@ -166,7 +166,7 @@ static bool wifi_cmd_sta_join(const char *ssid, const char *pass)
reconnect = true; reconnect = true;
esp_wifi_disconnect(); esp_wifi_disconnect();
//ESP_ERROR_CHECK( esp_wifi_set_mode(WIFI_MODE_STA) ); //by snake //ESP_ERROR_CHECK( esp_wifi_set_mode(WIFI_MODE_STA) ); //by snake
ESP_ERROR_CHECK( esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config) ); ESP_ERROR_CHECK( esp_wifi_set_config(WIFI_IF_STA, &wifi_config) );
esp_wifi_connect(); esp_wifi_connect();
xEventGroupWaitBits(wifi_event_group, CONNECTED_BIT, 0, 1, 5000 / portTICK_RATE_MS); xEventGroupWaitBits(wifi_event_group, CONNECTED_BIT, 0, 1, 5000 / portTICK_RATE_MS);
@ -246,7 +246,7 @@ static bool wifi_cmd_ap_set(const char *ssid, const char *pass)
} }
ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_AP)); ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_AP));
ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_AP, &wifi_config)); ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_AP, &wifi_config));
return true; return true;
} }

2
examples/common_components/protocol_examples_common/connect.c
View File

@ -164,7 +164,7 @@ static void start(void)
}; };
ESP_LOGI(TAG, "Connecting to %s...", wifi_config.sta.ssid); ESP_LOGI(TAG, "Connecting to %s...", wifi_config.sta.ssid);
ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA)); ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA));
ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config)); ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_STA, &wifi_config));
ESP_ERROR_CHECK(esp_wifi_start()); ESP_ERROR_CHECK(esp_wifi_start());
esp_wifi_connect(); esp_wifi_connect();
s_connection_name = CONFIG_EXAMPLE_WIFI_SSID; s_connection_name = CONFIG_EXAMPLE_WIFI_SSID;

8
examples/ethernet/eth2ap/main/ethernet_example_main.c
View File

@ -80,7 +80,7 @@ static void eth2wifi_flow_control_task(void *args)
do { do {
vTaskDelay(pdMS_TO_TICKS(timeout)); vTaskDelay(pdMS_TO_TICKS(timeout));
timeout += 2; timeout += 2;
res = esp_wifi_internal_tx(ESP_IF_WIFI_AP, msg.packet, msg.length); res = esp_wifi_internal_tx(WIFI_IF_AP, msg.packet, msg.length);
} while (res && timeout < FLOW_CONTROL_WIFI_SEND_TIMEOUT_MS); } while (res && timeout < FLOW_CONTROL_WIFI_SEND_TIMEOUT_MS);
if (res != ESP_OK) { if (res != ESP_OK) {
ESP_LOGE(TAG, "WiFi send packet failed: %d", res); ESP_LOGE(TAG, "WiFi send packet failed: %d", res);
@ -128,12 +128,12 @@ static void wifi_event_handler(void *arg, esp_event_base_t event_base,
case WIFI_EVENT_AP_STACONNECTED: case WIFI_EVENT_AP_STACONNECTED:
ESP_LOGI(TAG, "Wi-Fi AP got a station connected"); ESP_LOGI(TAG, "Wi-Fi AP got a station connected");
s_sta_is_connected = true; s_sta_is_connected = true;
esp_wifi_internal_reg_rxcb(ESP_IF_WIFI_AP, pkt_wifi2eth); esp_wifi_internal_reg_rxcb(WIFI_IF_AP, pkt_wifi2eth);
break; break;
case WIFI_EVENT_AP_STADISCONNECTED: case WIFI_EVENT_AP_STADISCONNECTED:
ESP_LOGI(TAG, "Wi-Fi AP got a station disconnected"); ESP_LOGI(TAG, "Wi-Fi AP got a station disconnected");
s_sta_is_connected = false; s_sta_is_connected = false;
esp_wifi_internal_reg_rxcb(ESP_IF_WIFI_AP, NULL); esp_wifi_internal_reg_rxcb(WIFI_IF_AP, NULL);
break; break;
default: default:
break; break;
@ -212,7 +212,7 @@ static void initialize_wifi(void)
wifi_config.ap.authmode = WIFI_AUTH_OPEN; wifi_config.ap.authmode = WIFI_AUTH_OPEN;
} }
ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_AP)); ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_AP));
ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_AP, &wifi_config)); ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_AP, &wifi_config));
} }
static esp_err_t initialize_flow_control(void) static esp_err_t initialize_flow_control(void)

2
examples/protocols/esp_local_ctrl/main/app_main.c
View File

@ -88,7 +88,7 @@ esp_err_t wifi_init_sta(void)
}, },
}; };
ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA) ); ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA) );
ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config) ); ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_STA, &wifi_config) );
ESP_ERROR_CHECK(esp_wifi_start() ); ESP_ERROR_CHECK(esp_wifi_start() );
ESP_LOGI(TAG, "wifi_init_sta finished."); ESP_LOGI(TAG, "wifi_init_sta finished.");

4
examples/provisioning/ble_prov/main/app_prov.c
View File

@ -288,7 +288,7 @@ esp_err_t app_prov_is_provisioned(bool *provisioned)
/* Get WiFi Station configuration */ /* Get WiFi Station configuration */
wifi_config_t wifi_cfg; wifi_config_t wifi_cfg;
if (esp_wifi_get_config(ESP_IF_WIFI_STA, &wifi_cfg) != ESP_OK) { if (esp_wifi_get_config(WIFI_IF_STA, &wifi_cfg) != ESP_OK) {
return ESP_FAIL; return ESP_FAIL;
} }
@ -309,7 +309,7 @@ esp_err_t app_prov_configure_sta(wifi_config_t *wifi_cfg)
} }
/* Configure WiFi station with host credentials /* Configure WiFi station with host credentials
* provided during provisioning */ * provided during provisioning */
if (esp_wifi_set_config(ESP_IF_WIFI_STA, wifi_cfg) != ESP_OK) { if (esp_wifi_set_config(WIFI_IF_STA, wifi_cfg) != ESP_OK) {
ESP_LOGE(TAG, "Failed to set WiFi configuration"); ESP_LOGE(TAG, "Failed to set WiFi configuration");
return ESP_FAIL; return ESP_FAIL;
} }

4
examples/provisioning/console_prov/main/app_prov.c
View File

@ -226,7 +226,7 @@ esp_err_t app_prov_is_provisioned(bool *provisioned)
/* Get WiFi Station configuration */ /* Get WiFi Station configuration */
wifi_config_t wifi_cfg; wifi_config_t wifi_cfg;
if (esp_wifi_get_config(ESP_IF_WIFI_STA, &wifi_cfg) != ESP_OK) { if (esp_wifi_get_config(WIFI_IF_STA, &wifi_cfg) != ESP_OK) {
return ESP_FAIL; return ESP_FAIL;
} }
@ -247,7 +247,7 @@ esp_err_t app_prov_configure_sta(wifi_config_t *wifi_cfg)
} }
/* Configure WiFi station with host credentials /* Configure WiFi station with host credentials
* provided during provisioning */ * provided during provisioning */
if (esp_wifi_set_config(ESP_IF_WIFI_STA, wifi_cfg) != ESP_OK) { if (esp_wifi_set_config(WIFI_IF_STA, wifi_cfg) != ESP_OK) {
ESP_LOGE(TAG, "Failed to set WiFi configuration"); ESP_LOGE(TAG, "Failed to set WiFi configuration");
return ESP_FAIL; return ESP_FAIL;
} }

6
examples/provisioning/custom_config/main/app_prov.c
View File

@ -251,7 +251,7 @@ esp_err_t app_prov_is_provisioned(bool *provisioned)
/* Get WiFi Station configuration */ /* Get WiFi Station configuration */
wifi_config_t wifi_cfg; wifi_config_t wifi_cfg;
if (esp_wifi_get_config(ESP_IF_WIFI_STA, &wifi_cfg) != ESP_OK) { if (esp_wifi_get_config(WIFI_IF_STA, &wifi_cfg) != ESP_OK) {
return ESP_FAIL; return ESP_FAIL;
} }
@ -272,7 +272,7 @@ esp_err_t app_prov_configure_sta(wifi_config_t *wifi_cfg)
} }
/* Configure WiFi station with host credentials /* Configure WiFi station with host credentials
* provided during provisioning */ * provided during provisioning */
if (esp_wifi_set_config(ESP_IF_WIFI_STA, wifi_cfg) != ESP_OK) { if (esp_wifi_set_config(WIFI_IF_STA, wifi_cfg) != ESP_OK) {
ESP_LOGE(TAG, "Failed to set WiFi configuration"); ESP_LOGE(TAG, "Failed to set WiFi configuration");
return ESP_FAIL; return ESP_FAIL;
} }
@ -319,7 +319,7 @@ static esp_err_t start_wifi_ap(const char *ssid, const char *pass)
ESP_LOGE(TAG, "Failed to set WiFi mode : %d", err); ESP_LOGE(TAG, "Failed to set WiFi mode : %d", err);
return err; return err;
} }
err = esp_wifi_set_config(ESP_IF_WIFI_AP, &wifi_config); err = esp_wifi_set_config(WIFI_IF_AP, &wifi_config);
if (err != ESP_OK) { if (err != ESP_OK) {
ESP_LOGE(TAG, "Failed to set WiFi config : %d", err); ESP_LOGE(TAG, "Failed to set WiFi config : %d", err);
return err; return err;

6
examples/provisioning/softap_prov/main/app_prov.c
View File

@ -237,7 +237,7 @@ esp_err_t app_prov_is_provisioned(bool *provisioned)
/* Get WiFi Station configuration */ /* Get WiFi Station configuration */
wifi_config_t wifi_cfg; wifi_config_t wifi_cfg;
if (esp_wifi_get_config(ESP_IF_WIFI_STA, &wifi_cfg) != ESP_OK) { if (esp_wifi_get_config(WIFI_IF_STA, &wifi_cfg) != ESP_OK) {
return ESP_FAIL; return ESP_FAIL;
} }
@ -258,7 +258,7 @@ esp_err_t app_prov_configure_sta(wifi_config_t *wifi_cfg)
} }
/* Configure WiFi station with host credentials /* Configure WiFi station with host credentials
* provided during provisioning */ * provided during provisioning */
if (esp_wifi_set_config(ESP_IF_WIFI_STA, wifi_cfg) != ESP_OK) { if (esp_wifi_set_config(WIFI_IF_STA, wifi_cfg) != ESP_OK) {
ESP_LOGE(TAG, "Failed to set WiFi configuration"); ESP_LOGE(TAG, "Failed to set WiFi configuration");
return ESP_FAIL; return ESP_FAIL;
} }
@ -305,7 +305,7 @@ static esp_err_t start_wifi_ap(const char *ssid, const char *pass)
ESP_LOGE(TAG, "Failed to set WiFi mode : %d", err); ESP_LOGE(TAG, "Failed to set WiFi mode : %d", err);
return err; return err;
} }
err = esp_wifi_set_config(ESP_IF_WIFI_AP, &wifi_config); err = esp_wifi_set_config(WIFI_IF_AP, &wifi_config);
if (err != ESP_OK) { if (err != ESP_OK) {
ESP_LOGE(TAG, "Failed to set WiFi config : %d", err); ESP_LOGE(TAG, "Failed to set WiFi config : %d", err);
return err; return err;

2
examples/system/console/main/cmd_wifi.c
View File

@ -71,7 +71,7 @@ static bool wifi_join(const char *ssid, const char *pass, int timeout_ms)
} }
ESP_ERROR_CHECK( esp_wifi_set_mode(WIFI_MODE_STA) ); ESP_ERROR_CHECK( esp_wifi_set_mode(WIFI_MODE_STA) );
ESP_ERROR_CHECK( esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config) ); ESP_ERROR_CHECK( esp_wifi_set_config(WIFI_IF_STA, &wifi_config) );
esp_wifi_connect(); esp_wifi_connect();
int bits = xEventGroupWaitBits(wifi_event_group, CONNECTED_BIT, int bits = xEventGroupWaitBits(wifi_event_group, CONNECTED_BIT,

2
examples/wifi/fast_scan/main/fast_scan.c
View File

@ -110,7 +110,7 @@ static void fast_scan(void)
}, },
}; };
ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA)); ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA));
ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config)); ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_STA, &wifi_config));
ESP_ERROR_CHECK(esp_wifi_start()); ESP_ERROR_CHECK(esp_wifi_start());
} }

2
examples/wifi/getting_started/softAP/main/softap_example_main.c
View File

@ -70,7 +70,7 @@ void wifi_init_softap(void)
} }
ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_AP)); ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_AP));
ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_AP, &wifi_config)); ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_AP, &wifi_config));
ESP_ERROR_CHECK(esp_wifi_start()); ESP_ERROR_CHECK(esp_wifi_start());
ESP_LOGI(TAG, "wifi_init_softap finished. SSID:%s password:%s channel:%d", ESP_LOGI(TAG, "wifi_init_softap finished. SSID:%s password:%s channel:%d",

2
examples/wifi/getting_started/station/main/station_example_main.c
View File

@ -94,7 +94,7 @@ void wifi_init_sta(void)
}, },
}; };
ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA) ); ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA) );
ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config) ); ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_STA, &wifi_config) );
ESP_ERROR_CHECK(esp_wifi_start() ); ESP_ERROR_CHECK(esp_wifi_start() );
ESP_LOGI(TAG, "wifi_init_sta finished."); ESP_LOGI(TAG, "wifi_init_sta finished.");

4
examples/wifi/iperf/main/cmd_wifi.c
View File

@ -151,7 +151,7 @@ static bool wifi_cmd_sta_join(const char* ssid, const char* pass)
reconnect = true; reconnect = true;
ESP_ERROR_CHECK( esp_wifi_set_mode(WIFI_MODE_STA) ); ESP_ERROR_CHECK( esp_wifi_set_mode(WIFI_MODE_STA) );
ESP_ERROR_CHECK( esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config) ); ESP_ERROR_CHECK( esp_wifi_set_config(WIFI_IF_STA, &wifi_config) );
esp_wifi_connect(); esp_wifi_connect();
xEventGroupWaitBits(wifi_event_group, CONNECTED_BIT, 0, 1, 5000/portTICK_RATE_MS); xEventGroupWaitBits(wifi_event_group, CONNECTED_BIT, 0, 1, 5000/portTICK_RATE_MS);
@ -231,7 +231,7 @@ static bool wifi_cmd_ap_set(const char* ssid, const char* pass)
} }
ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_AP)); ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_AP));
ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_AP, &wifi_config)); ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_AP, &wifi_config));
return true; return true;
} }

2
examples/wifi/power_save/main/power_save.c
View File

@ -74,7 +74,7 @@ static void wifi_power_save(void)
}, },
}; };
ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA)); ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA));
ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config)); ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_STA, &wifi_config));
ESP_ERROR_CHECK(esp_wifi_start()); ESP_ERROR_CHECK(esp_wifi_start());
ESP_LOGI(TAG, "esp_wifi_set_ps()."); ESP_LOGI(TAG, "esp_wifi_set_ps().");

2
examples/wifi/smart_config/main/smartconfig_main.c
View File

@ -69,7 +69,7 @@ static void event_handler(void* arg, esp_event_base_t event_base,
ESP_LOGI(TAG, "PASSWORD:%s", password); ESP_LOGI(TAG, "PASSWORD:%s", password);
ESP_ERROR_CHECK( esp_wifi_disconnect() ); ESP_ERROR_CHECK( esp_wifi_disconnect() );
ESP_ERROR_CHECK( esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config) ); ESP_ERROR_CHECK( esp_wifi_set_config(WIFI_IF_STA, &wifi_config) );
esp_wifi_connect(); esp_wifi_connect();
} else if (event_base == SC_EVENT && event_id == SC_EVENT_SEND_ACK_DONE) { } else if (event_base == SC_EVENT && event_id == SC_EVENT_SEND_ACK_DONE) {
xEventGroupSetBits(s_wifi_event_group, ESPTOUCH_DONE_BIT); xEventGroupSetBits(s_wifi_event_group, ESPTOUCH_DONE_BIT);

2
examples/wifi/wpa2_enterprise/main/wpa2_enterprise_main.c
View File

@ -122,7 +122,7 @@ static void initialise_wifi(void)
}; };
ESP_LOGI(TAG, "Setting WiFi configuration SSID %s...", wifi_config.sta.ssid); ESP_LOGI(TAG, "Setting WiFi configuration SSID %s...", wifi_config.sta.ssid);
ESP_ERROR_CHECK( esp_wifi_set_mode(WIFI_MODE_STA) ); ESP_ERROR_CHECK( esp_wifi_set_mode(WIFI_MODE_STA) );
ESP_ERROR_CHECK( esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config) ); ESP_ERROR_CHECK( esp_wifi_set_config(WIFI_IF_STA, &wifi_config) );
ESP_ERROR_CHECK( esp_wifi_sta_wpa2_ent_set_identity((uint8_t *)EXAMPLE_EAP_ID, strlen(EXAMPLE_EAP_ID)) ); ESP_ERROR_CHECK( esp_wifi_sta_wpa2_ent_set_identity((uint8_t *)EXAMPLE_EAP_ID, strlen(EXAMPLE_EAP_ID)) );
#ifdef CONFIG_EXAMPLE_VALIDATE_SERVER_CERT #ifdef CONFIG_EXAMPLE_VALIDATE_SERVER_CERT

4
examples/wifi/wps/main/wps.c
View File

@ -72,7 +72,7 @@ static void wifi_event_handler(void* arg, esp_event_base_t event_base,
if (ap_idx < s_ap_creds_num) { if (ap_idx < s_ap_creds_num) {
ESP_LOGI(TAG, "Connecting to SSID: %s, Passphrase: %s", ESP_LOGI(TAG, "Connecting to SSID: %s, Passphrase: %s",
wps_ap_creds[ap_idx].sta.ssid, wps_ap_creds[ap_idx].sta.password); wps_ap_creds[ap_idx].sta.ssid, wps_ap_creds[ap_idx].sta.password);
ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_STA, &wps_ap_creds[ap_idx++]) ); ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_STA, &wps_ap_creds[ap_idx++]) );
esp_wifi_connect(); esp_wifi_connect();
} }
s_retry_num = 0; s_retry_num = 0;
@ -99,7 +99,7 @@ static void wifi_event_handler(void* arg, esp_event_base_t event_base,
/* If multiple AP credentials are received from WPS, connect with first one */ /* If multiple AP credentials are received from WPS, connect with first one */
ESP_LOGI(TAG, "Connecting to SSID: %s, Passphrase: %s", ESP_LOGI(TAG, "Connecting to SSID: %s, Passphrase: %s",
wps_ap_creds[0].sta.ssid, wps_ap_creds[0].sta.password); wps_ap_creds[0].sta.ssid, wps_ap_creds[0].sta.password);
ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_STA, &wps_ap_creds[0]) ); ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_STA, &wps_ap_creds[0]) );
} }
/* /*
* If only one AP credential is received from WPS, there will be no event data and * If only one AP credential is received from WPS, there will be no event data and