mirror
/
esp-idf
kopia lustrzana https://github.com/espressif/esp-idf
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

esp_wifi: Modify ESP_IF_WIFI_AP to WIFI_IF_AP

pull/6491/head
xiehang 2021-01-19 11:58:04 +08:00
rodzic b8a8fe3f54
commit dffbce9813
9 zmienionych plików z 13 dodań i 13 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
components/esp_wifi/test/test_wifi.c
Wyświetl plik

@ -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);

2
components/wifi_provisioning/src/scheme_softap.c
Wyświetl plik

@ -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;

2
examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/components/iperf/cmd_wifi.c
Wyświetl plik

@ -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;
} }

8
examples/ethernet/eth2ap/main/ethernet_example_main.c
Wyświetl plik

@ -83,7 +83,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);
@ -133,7 +133,7 @@ static void wifi_event_handler(void *arg, esp_event_base_t event_base,
ESP_LOGI(TAG, "Wi-Fi AP got a station connected"); ESP_LOGI(TAG, "Wi-Fi AP got a station connected");
if (!s_con_cnt) { if (!s_con_cnt) {
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);
} }
s_con_cnt++; s_con_cnt++;
break; break;
@ -142,7 +142,7 @@ static void wifi_event_handler(void *arg, esp_event_base_t event_base,
s_con_cnt--; s_con_cnt--;
if (!s_con_cnt) { if (!s_con_cnt) {
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:
@ -250,7 +250,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/mesh/ip_internal_network/main/mesh_netif.c
Wyświetl plik

@ -289,7 +289,7 @@ esp_err_t mesh_netifs_init(mesh_raw_recv_cb_t *cb)
static esp_err_t start_mesh_link_ap(void) static esp_err_t start_mesh_link_ap(void)
{ {
uint8_t mac[MAC_ADDR_LEN]; uint8_t mac[MAC_ADDR_LEN];
esp_wifi_get_mac(ESP_IF_WIFI_AP, mac); esp_wifi_get_mac(WIFI_IF_AP, mac);
esp_netif_set_mac(netif_ap, mac); esp_netif_set_mac(netif_ap, mac);
esp_netif_action_start(netif_ap, NULL, 0, NULL); esp_netif_action_start(netif_ap, NULL, 0, NULL);
return ESP_OK; return ESP_OK;

2
examples/provisioning/legacy/custom_config/main/app_prov.c
Wyświetl plik

@ -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;

2
examples/provisioning/legacy/softap_prov/main/app_prov.c
Wyświetl plik

@ -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/wifi/getting_started/softAP/main/softap_example_main.c
Wyświetl plik

@ -74,7 +74,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/iperf/main/cmd_wifi.c
Wyświetl plik

@ -238,7 +238,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;
} }