Просмотр исходного кода

example: do not check the return value of esp_wifi_connect()

xiehang 5 лет назад
Родитель
Сommit
30becdfaab

+ 2 - 6
examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/components/case/wifi_connect.c

@@ -93,11 +93,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_err_t err = esp_wifi_connect();
-    if (err == ESP_ERR_WIFI_NOT_STARTED) {
-        return;
-    }
-    ESP_ERROR_CHECK(err);
+    esp_wifi_connect();
 }
 
 static void start(const char *ssid, const char *passwd)
@@ -133,7 +129,7 @@ static void start(const char *ssid, const char *passwd)
     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 = ssid;
 }
 

+ 1 - 1
examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/components/iperf/cmd_wifi.c

@@ -167,7 +167,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);
 

+ 1 - 1
examples/common_components/protocol_examples_common/connect.c

@@ -257,7 +257,7 @@ static esp_netif_t* wifi_start(void)
     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();
     return netif;
 }
 

+ 1 - 1
examples/system/console/main/cmd_wifi.c

@@ -72,7 +72,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);

+ 1 - 1
examples/wifi/iperf/main/cmd_wifi.c

@@ -159,7 +159,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);
 

+ 1 - 1
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);
     }

+ 3 - 3
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: