Skip to content

Commit ecf48fe

Browse files
author
Luc
committed
Fix compilation issues with latest esp32 core git (1.0.5rc)
1 parent ccd699f commit ecf48fe

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

esp3d/config.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1132,9 +1132,9 @@ void CONFIG::print_config (tpipe output, bool plaintext, ESPResponseStream *esp
11321132
#ifdef ARDUINO_ARCH_ESP32
11331133
uint8_t PhyMode;
11341134
if (WiFi.getMode() == WIFI_STA) {
1135-
esp_wifi_get_protocol (ESP_IF_WIFI_STA, &PhyMode);
1135+
esp_wifi_get_protocol (WIFI_IF_STA, &PhyMode);
11361136
} else {
1137-
esp_wifi_get_protocol (ESP_IF_WIFI_AP, &PhyMode);
1137+
esp_wifi_get_protocol (WIFI_IF_AP, &PhyMode);
11381138
}
11391139
#else
11401140
WiFiPhyMode_t PhyMode = WiFi.getPhyMode();
@@ -1368,7 +1368,7 @@ void CONFIG::print_config (tpipe output, bool plaintext, ESPResponseStream *esp
13681368
#ifdef ARDUINO_ARCH_ESP32
13691369
wifi_ap_config_t apconfig;
13701370
wifi_config_t conf;
1371-
esp_wifi_get_config (ESP_IF_WIFI_AP, &conf);
1371+
esp_wifi_get_config (WIFI_IF_AP, &conf);
13721372
apconfig.ssid_hidden = conf.ap.ssid_hidden;
13731373
apconfig.authmode = conf.ap.authmode;
13741374
apconfig.max_connection = conf.ap.max_connection;

esp3d/esp3d.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ void Esp3D::begin(uint16_t startdelayms, uint16_t recoverydelayms)
170170
#ifdef ARDUINO_ARCH_ESP8266
171171
WiFi.setPhyMode (WIFI_PHY_MODE_11G);
172172
#else
173-
esp_wifi_set_protocol (ESP_IF_WIFI_AP, WIFI_PHY_MODE_11G);
173+
esp_wifi_set_protocol (WIFI_IF_AP, WIFI_PHY_MODE_11G);
174174
#endif
175175
CONFIG::esp_restart();
176176
}

esp3d/wificonf.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ bool WIFI_CONFIG::Setup (bool force_ap)
344344
//setup Soft AP
345345
WiFi.mode (WIFI_AP);
346346
#ifdef ARDUINO_ARCH_ESP32
347-
esp_wifi_set_protocol (ESP_IF_WIFI_AP, bflag);
347+
esp_wifi_set_protocol (WIFI_IF_AP, bflag);
348348
#endif
349349
wifi_config.WiFi_on = true;
350350
delay (50);
@@ -363,7 +363,7 @@ bool WIFI_CONFIG::Setup (bool force_ap)
363363
//get current config
364364
#ifdef ARDUINO_ARCH_ESP32
365365
wifi_config_t conf;
366-
esp_wifi_get_config (ESP_IF_WIFI_AP, &conf);
366+
esp_wifi_get_config (WIFI_IF_AP, &conf);
367367
#else
368368
struct softap_config apconfig;
369369
wifi_softap_get_config (&apconfig);
@@ -400,7 +400,7 @@ bool WIFI_CONFIG::Setup (bool force_ap)
400400
#ifdef ARDUINO_ARCH_ESP32
401401
conf.ap.max_connection = DEFAULT_MAX_CONNECTIONS;
402402
conf.ap.beacon_interval = DEFAULT_BEACON_INTERVAL;
403-
if (esp_wifi_set_config (ESP_IF_WIFI_AP, &conf) != ESP_OK) {
403+
if (esp_wifi_set_config (WIFI_IF_AP, &conf) != ESP_OK) {
404404
ESPCOM::println (F ("Error Wifi AP!"), PRINTER_PIPE);
405405
delay (1000);
406406
}
@@ -469,7 +469,7 @@ bool WIFI_CONFIG::Setup (bool force_ap)
469469
#ifdef ARDUINO_ARCH_ESP8266
470470
WiFi.setPhyMode ( (WiFiPhyMode_t) bflag);
471471
#else
472-
esp_wifi_set_protocol (ESP_IF_WIFI_STA, bflag);
472+
esp_wifi_set_protocol (WIFI_IF_STA, bflag);
473473
#endif
474474
if (strlen(pwd) > 0) {
475475
WiFi.begin (sbuf, pwd);

0 commit comments

Comments
 (0)