From 7778034cba6fd6f7e4d6d8e843a6c7c550185258 Mon Sep 17 00:00:00 2001 From: xiehang Date: Fri, 15 Jan 2021 20:00:40 +0800 Subject: [PATCH 1/2] example: do not check the return value of esp_wifi_connect() --- .../ble_mesh_wifi_coexist/components/iperf/cmd_wifi.c | 2 +- .../common_components/protocol_examples_common/connect.c | 4 ++-- examples/system/console/main/cmd_wifi.c | 2 +- examples/wifi/iperf/main/cmd_wifi.c | 2 +- examples/wifi/smart_config/main/smartconfig_main.c | 2 +- examples/wifi/wps/main/wps.c | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/components/iperf/cmd_wifi.c b/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/components/iperf/cmd_wifi.c index 8fd95ce474..c30ec661ae 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/components/iperf/cmd_wifi.c +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/components/iperf/cmd_wifi.c @@ -161,7 +161,7 @@ static bool wifi_cmd_sta_join(const char *ssid, const char *pass) esp_wifi_disconnect(); //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_connect() ); + esp_wifi_connect(); xEventGroupWaitBits(wifi_event_group, CONNECTED_BIT, 0, 1, 5000 / portTICK_RATE_MS); diff --git a/examples/common_components/protocol_examples_common/connect.c b/examples/common_components/protocol_examples_common/connect.c index dfaee392a5..1aaf3da4a4 100644 --- a/examples/common_components/protocol_examples_common/connect.c +++ b/examples/common_components/protocol_examples_common/connect.c @@ -102,7 +102,7 @@ static void on_wifi_disconnect(void *arg, esp_event_base_t event_base, int32_t event_id, void *event_data) { ESP_LOGI(TAG, "Wi-Fi disconnected, trying to reconnect..."); - ESP_ERROR_CHECK(esp_wifi_connect()); + esp_wifi_connect(); } #ifdef CONFIG_EXAMPLE_CONNECT_IPV6 @@ -138,7 +138,7 @@ static void start() 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_start()); - ESP_ERROR_CHECK(esp_wifi_connect()); + esp_wifi_connect(); s_connection_name = CONFIG_EXAMPLE_WIFI_SSID; } diff --git a/examples/system/console/main/cmd_wifi.c b/examples/system/console/main/cmd_wifi.c index eb2024dabe..531fbfe857 100644 --- a/examples/system/console/main/cmd_wifi.c +++ b/examples/system/console/main/cmd_wifi.c @@ -68,7 +68,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_config(ESP_IF_WIFI_STA, &wifi_config) ); - ESP_ERROR_CHECK( esp_wifi_connect() ); + esp_wifi_connect(); int bits = xEventGroupWaitBits(wifi_event_group, CONNECTED_BIT, pdFALSE, pdTRUE, timeout_ms / portTICK_PERIOD_MS); diff --git a/examples/wifi/iperf/main/cmd_wifi.c b/examples/wifi/iperf/main/cmd_wifi.c index a6fbdaa162..ea772745c4 100644 --- a/examples/wifi/iperf/main/cmd_wifi.c +++ b/examples/wifi/iperf/main/cmd_wifi.c @@ -141,7 +141,7 @@ static bool wifi_cmd_sta_join(const char* ssid, const char* pass) reconnect = true; 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_connect() ); + esp_wifi_connect(); xEventGroupWaitBits(wifi_event_group, CONNECTED_BIT, 0, 1, 5000/portTICK_RATE_MS); diff --git a/examples/wifi/smart_config/main/smartconfig_main.c b/examples/wifi/smart_config/main/smartconfig_main.c index 0819f256da..2755ef19ea 100644 --- a/examples/wifi/smart_config/main/smartconfig_main.c +++ b/examples/wifi/smart_config/main/smartconfig_main.c @@ -70,7 +70,7 @@ static void event_handler(void* arg, esp_event_base_t event_base, ESP_ERROR_CHECK( esp_wifi_disconnect() ); ESP_ERROR_CHECK( esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config) ); - ESP_ERROR_CHECK( esp_wifi_connect() ); + esp_wifi_connect(); } else if (event_base == SC_EVENT && event_id == SC_EVENT_SEND_ACK_DONE) { xEventGroupSetBits(s_wifi_event_group, ESPTOUCH_DONE_BIT); } diff --git a/examples/wifi/wps/main/wps.c b/examples/wifi/wps/main/wps.c index b513c7c9b2..3250f7fc56 100644 --- a/examples/wifi/wps/main/wps.c +++ b/examples/wifi/wps/main/wps.c @@ -64,7 +64,7 @@ static void wifi_event_handler(void* arg, esp_event_base_t event_base, case WIFI_EVENT_STA_DISCONNECTED: ESP_LOGI(TAG, "WIFI_EVENT_STA_DISCONNECTED"); if (s_retry_num < MAX_RETRY_ATTEMPTS) { - ESP_ERROR_CHECK(esp_wifi_connect()); + esp_wifi_connect(); s_retry_num++; } else if (ap_idx < s_ap_creds_num) { /* Try the next AP credential if first one fails */ @@ -73,7 +73,7 @@ static void wifi_event_handler(void* arg, esp_event_base_t event_base, ESP_LOGI(TAG, "Connecting to SSID: %s, Passphrase: %s", 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_connect()); + esp_wifi_connect(); } s_retry_num = 0; } else { @@ -107,7 +107,7 @@ static void wifi_event_handler(void* arg, esp_event_base_t event_base, * with legacy apps. So directly attempt connection here. */ ESP_ERROR_CHECK(esp_wifi_wps_disable()); - ESP_ERROR_CHECK(esp_wifi_connect()); + esp_wifi_connect(); } break; case WIFI_EVENT_STA_WPS_ER_FAILED: From eb1a1620fef90f3e1337c4c6d8bb1bedaa9f448f Mon Sep 17 00:00:00 2001 From: xiehang Date: Fri, 15 Jan 2021 20:03:25 +0800 Subject: [PATCH 2/2] example: Scan failure should not cause system crash --- .../bluetooth/bluedroid/ble/blufi/main/blufi_example_main.c | 2 +- .../ble_mesh_wifi_coexist/components/iperf/cmd_wifi.c | 2 +- examples/mesh/manual_networking/main/mesh_main.c | 6 +++--- examples/wifi/iperf/main/cmd_wifi.c | 2 +- examples/wifi/scan/main/scan.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/bluetooth/bluedroid/ble/blufi/main/blufi_example_main.c b/examples/bluetooth/bluedroid/ble/blufi/main/blufi_example_main.c index 9a12f3842f..9ac297ab05 100644 --- a/examples/bluetooth/bluedroid/ble/blufi/main/blufi_example_main.c +++ b/examples/bluetooth/bluedroid/ble/blufi/main/blufi_example_main.c @@ -350,7 +350,7 @@ static void example_event_callback(esp_blufi_cb_event_t event, esp_blufi_cb_para .channel = 0, .show_hidden = false }; - ESP_ERROR_CHECK(esp_wifi_scan_start(&scanConf, true)); + esp_wifi_scan_start(&scanConf, true); break; } case ESP_BLUFI_EVENT_RECV_CUSTOM_DATA: diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/components/iperf/cmd_wifi.c b/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/components/iperf/cmd_wifi.c index c30ec661ae..bc9de24b8d 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/components/iperf/cmd_wifi.c +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/components/iperf/cmd_wifi.c @@ -188,7 +188,7 @@ static bool wifi_cmd_sta_scan(const char *ssid) scan_config.ssid = (uint8_t *) ssid; ESP_ERROR_CHECK( esp_wifi_set_mode(WIFI_MODE_STA) ); - ESP_ERROR_CHECK( esp_wifi_scan_start(&scan_config, false) ); + esp_wifi_scan_start(&scan_config, false); return true; } diff --git a/examples/mesh/manual_networking/main/mesh_main.c b/examples/mesh/manual_networking/main/mesh_main.c index 99ccfbe7f1..f2e0ff6515 100644 --- a/examples/mesh/manual_networking/main/mesh_main.c +++ b/examples/mesh/manual_networking/main/mesh_main.c @@ -151,7 +151,7 @@ void mesh_scan_done_handler(int num) esp_wifi_scan_stop(); scan_config.show_hidden = 1; scan_config.scan_type = WIFI_SCAN_TYPE_PASSIVE; - ESP_ERROR_CHECK(esp_wifi_scan_start(&scan_config, 0)); + esp_wifi_scan_start(&scan_config, 0); } } @@ -172,7 +172,7 @@ void mesh_event_handler(void *arg, esp_event_base_t event_base, /* mesh softAP is hidden */ scan_config.show_hidden = 1; scan_config.scan_type = WIFI_SCAN_TYPE_PASSIVE; - ESP_ERROR_CHECK(esp_wifi_scan_start(&scan_config, 0)); + esp_wifi_scan_start(&scan_config, 0); } break; case MESH_EVENT_STOPPED: { @@ -243,7 +243,7 @@ void mesh_event_handler(void *arg, esp_event_base_t event_base, esp_wifi_scan_stop(); scan_config.show_hidden = 1; scan_config.scan_type = WIFI_SCAN_TYPE_PASSIVE; - ESP_ERROR_CHECK(esp_wifi_scan_start(&scan_config, 0)); + esp_wifi_scan_start(&scan_config, 0); } } break; diff --git a/examples/wifi/iperf/main/cmd_wifi.c b/examples/wifi/iperf/main/cmd_wifi.c index ea772745c4..a6be001c9b 100644 --- a/examples/wifi/iperf/main/cmd_wifi.c +++ b/examples/wifi/iperf/main/cmd_wifi.c @@ -168,7 +168,7 @@ static bool wifi_cmd_sta_scan(const char* ssid) scan_config.ssid = (uint8_t *) ssid; ESP_ERROR_CHECK( esp_wifi_set_mode(WIFI_MODE_STA) ); - ESP_ERROR_CHECK( esp_wifi_scan_start(&scan_config, false) ); + esp_wifi_scan_start(&scan_config, false); return true; } diff --git a/examples/wifi/scan/main/scan.c b/examples/wifi/scan/main/scan.c index 803debb8cc..045fa4802f 100644 --- a/examples/wifi/scan/main/scan.c +++ b/examples/wifi/scan/main/scan.c @@ -151,7 +151,7 @@ static void init_wifi(void) ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA)); ESP_ERROR_CHECK(esp_wifi_start()); - ESP_ERROR_CHECK(esp_wifi_scan_start(NULL, true)); + esp_wifi_scan_start(NULL, true); while (1) { if (scan_done == true) {