alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_iperf_example_crash_issue_v4.2' into 'release/v4.2'

Browse Source 
Bugfix/fix iperf example crash issue v4.2 (backport v4.2)

See merge request espressif/esp-idf!12024
This commit is contained in:
Jiang Jiang Jian 2021-01-18 19:09:37 +08:00
commit b24ccd8a20
10 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/bluetooth/bluedroid/ble/blufi/main/blufi_example_main.c
View File

@ -371,7 +371,7 @@ static void example_event_callback(esp_blufi_cb_event_t event, esp_blufi_cb_para
.channel = 0, .channel = 0,
.show_hidden = false .show_hidden = false
}; };
ESP_ERROR_CHECK(esp_wifi_scan_start(&scanConf, true)); esp_wifi_scan_start(&scanConf, true);
break; break;
} }
case ESP_BLUFI_EVENT_RECV_CUSTOM_DATA: case ESP_BLUFI_EVENT_RECV_CUSTOM_DATA:

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

@ -93,11 +93,7 @@ static void on_wifi_disconnect(void *arg, esp_event_base_t event_base,
int32_t event_id, void *event_data) int32_t event_id, void *event_data)
{ {
ESP_LOGI(TAG, "Wi-Fi disconnected, trying to reconnect..."); ESP_LOGI(TAG, "Wi-Fi disconnected, trying to reconnect...");
esp_err_t err = esp_wifi_connect(); esp_wifi_connect();
if (err == ESP_ERR_WIFI_NOT_STARTED) {
return;
}
ESP_ERROR_CHECK(err);
} }
static void start(const char *ssid, const char *passwd) 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_mode(WIFI_MODE_STA));
ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config)); ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config));
ESP_ERROR_CHECK(esp_wifi_start()); ESP_ERROR_CHECK(esp_wifi_start());
ESP_ERROR_CHECK(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

@ -167,7 +167,7 @@ static bool wifi_cmd_sta_join(const char *ssid, const char *pass)
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(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); xEventGroupWaitBits(wifi_event_group, CONNECTED_BIT, 0, 1, 5000 / portTICK_RATE_MS);
@ -194,7 +194,7 @@ static bool wifi_cmd_sta_scan(const char *ssid)
scan_config.ssid = (uint8_t *) ssid; scan_config.ssid = (uint8_t *) 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_scan_start(&scan_config, false) ); esp_wifi_scan_start(&scan_config, false);
return true; return true;
} }

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

@ -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_mode(WIFI_MODE_STA));
ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config)); ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config));
ESP_ERROR_CHECK(esp_wifi_start()); ESP_ERROR_CHECK(esp_wifi_start());
ESP_ERROR_CHECK(esp_wifi_connect()); esp_wifi_connect();
return netif; return netif;
} }

6
examples/mesh/manual_networking/main/mesh_main.c
View File

@ -136,7 +136,7 @@ void mesh_scan_done_handler(int num)
esp_wifi_scan_stop(); esp_wifi_scan_stop();
scan_config.show_hidden = 1; scan_config.show_hidden = 1;
scan_config.scan_type = WIFI_SCAN_TYPE_PASSIVE; 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);
} }
} }
@ -157,7 +157,7 @@ void mesh_event_handler(void *arg, esp_event_base_t event_base,
/* mesh softAP is hidden */ /* mesh softAP is hidden */
scan_config.show_hidden = 1; scan_config.show_hidden = 1;
scan_config.scan_type = WIFI_SCAN_TYPE_PASSIVE; 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; break;
case MESH_EVENT_STOPPED: { case MESH_EVENT_STOPPED: {
@ -228,7 +228,7 @@ void mesh_event_handler(void *arg, esp_event_base_t event_base,
esp_wifi_scan_stop(); esp_wifi_scan_stop();
scan_config.show_hidden = 1; scan_config.show_hidden = 1;
scan_config.scan_type = WIFI_SCAN_TYPE_PASSIVE; 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; break;

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

@ -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_mode(WIFI_MODE_STA) );
ESP_ERROR_CHECK( esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config) ); 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, int bits = xEventGroupWaitBits(wifi_event_group, CONNECTED_BIT,
pdFALSE, pdTRUE, timeout_ms / portTICK_PERIOD_MS); pdFALSE, pdTRUE, timeout_ms / portTICK_PERIOD_MS);

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

@ -159,7 +159,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(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); xEventGroupWaitBits(wifi_event_group, CONNECTED_BIT, 0, 1, 5000/portTICK_RATE_MS);
@ -186,7 +186,7 @@ static bool wifi_cmd_sta_scan(const char* ssid)
scan_config.ssid = (uint8_t *) ssid; scan_config.ssid = (uint8_t *) 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_scan_start(&scan_config, false) ); esp_wifi_scan_start(&scan_config, false);
return true; return true;
} }

3
examples/wifi/scan/main/scan.c
View File

@ -124,7 +124,7 @@ static void wifi_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_start()); ESP_ERROR_CHECK(esp_wifi_start());
ESP_ERROR_CHECK(esp_wifi_scan_start(NULL, true)); esp_wifi_scan_start(NULL, true);
ESP_ERROR_CHECK(esp_wifi_scan_get_ap_records(&number, ap_info)); ESP_ERROR_CHECK(esp_wifi_scan_get_ap_records(&number, ap_info));
ESP_ERROR_CHECK(esp_wifi_scan_get_ap_num(&ap_count)); ESP_ERROR_CHECK(esp_wifi_scan_get_ap_num(&ap_count));
ESP_LOGI(TAG, "Total APs scanned = %u", ap_count); ESP_LOGI(TAG, "Total APs scanned = %u", ap_count);
@ -137,7 +137,6 @@ static void wifi_scan(void)
} }
ESP_LOGI(TAG, "Channel \t\t%d\n", ap_info[i].primary); ESP_LOGI(TAG, "Channel \t\t%d\n", ap_info[i].primary);
} }
} }
void app_main(void) void app_main(void)

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

@ -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_disconnect() );
ESP_ERROR_CHECK( esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config) ); 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) { } 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);
} }

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

@ -64,7 +64,7 @@ static void wifi_event_handler(void* arg, esp_event_base_t event_base,
case WIFI_EVENT_STA_DISCONNECTED: case WIFI_EVENT_STA_DISCONNECTED:
ESP_LOGI(TAG, "WIFI_EVENT_STA_DISCONNECTED"); ESP_LOGI(TAG, "WIFI_EVENT_STA_DISCONNECTED");
if (s_retry_num < MAX_RETRY_ATTEMPTS) { if (s_retry_num < MAX_RETRY_ATTEMPTS) {
ESP_ERROR_CHECK(esp_wifi_connect()); esp_wifi_connect();
s_retry_num++; s_retry_num++;
} else if (ap_idx < s_ap_creds_num) { } else if (ap_idx < s_ap_creds_num) {
/* Try the next AP credential if first one fails */ /* 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", 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(ESP_IF_WIFI_STA, &wps_ap_creds[ap_idx++]) );
ESP_ERROR_CHECK(esp_wifi_connect()); esp_wifi_connect();
} }
s_retry_num = 0; s_retry_num = 0;
} else { } 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. * with legacy apps. So directly attempt connection here.
*/ */
ESP_ERROR_CHECK(esp_wifi_wps_disable()); ESP_ERROR_CHECK(esp_wifi_wps_disable());
ESP_ERROR_CHECK(esp_wifi_connect()); esp_wifi_connect();
} }
break; break;
case WIFI_EVENT_STA_WPS_ER_FAILED: case WIFI_EVENT_STA_WPS_ER_FAILED: