GitHub-Proxy/ESP3D
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/luc-github/ESP3D.git synced 2025-08-12 04:59:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix compilation issues with latest esp32 core git (1.0.5rc)

Browse Source
This commit is contained in:
Luc 2021-02-21 09:11:02 +01:00
parent ccd699fea6
commit ecf48fe89d
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
esp3d/config.cpp
View File

@ -1132,9 +1132,9 @@ void CONFIG::print_config (tpipe output, bool plaintext, ESPResponseStream *esp
#ifdef ARDUINO_ARCH_ESP32 #ifdef ARDUINO_ARCH_ESP32
uint8_t PhyMode; uint8_t PhyMode;
if (WiFi.getMode() == WIFI_STA) { if (WiFi.getMode() == WIFI_STA) {
esp_wifi_get_protocol (ESP_IF_WIFI_STA, &PhyMode); esp_wifi_get_protocol (WIFI_IF_STA, &PhyMode);
} else { } else {
esp_wifi_get_protocol (ESP_IF_WIFI_AP, &PhyMode); esp_wifi_get_protocol (WIFI_IF_AP, &PhyMode);
} }
#else #else
WiFiPhyMode_t PhyMode = WiFi.getPhyMode(); WiFiPhyMode_t PhyMode = WiFi.getPhyMode();
@ -1368,7 +1368,7 @@ void CONFIG::print_config (tpipe output, bool plaintext, ESPResponseStream *esp
#ifdef ARDUINO_ARCH_ESP32 #ifdef ARDUINO_ARCH_ESP32
wifi_ap_config_t apconfig; wifi_ap_config_t apconfig;
wifi_config_t conf; wifi_config_t conf;
esp_wifi_get_config (ESP_IF_WIFI_AP, &conf); esp_wifi_get_config (WIFI_IF_AP, &conf);
apconfig.ssid_hidden = conf.ap.ssid_hidden; apconfig.ssid_hidden = conf.ap.ssid_hidden;
apconfig.authmode = conf.ap.authmode; apconfig.authmode = conf.ap.authmode;
apconfig.max_connection = conf.ap.max_connection; apconfig.max_connection = conf.ap.max_connection;

2
esp3d/esp3d.cpp
View File

@ -170,7 +170,7 @@ void Esp3D::begin(uint16_t startdelayms, uint16_t recoverydelayms)
#ifdef ARDUINO_ARCH_ESP8266 #ifdef ARDUINO_ARCH_ESP8266
WiFi.setPhyMode (WIFI_PHY_MODE_11G); WiFi.setPhyMode (WIFI_PHY_MODE_11G);
#else #else
esp_wifi_set_protocol (ESP_IF_WIFI_AP, WIFI_PHY_MODE_11G); esp_wifi_set_protocol (WIFI_IF_AP, WIFI_PHY_MODE_11G);
#endif #endif
CONFIG::esp_restart(); CONFIG::esp_restart();
} }

8
esp3d/wificonf.cpp
View File

@ -344,7 +344,7 @@ bool WIFI_CONFIG::Setup (bool force_ap)
//setup Soft AP //setup Soft AP
WiFi.mode (WIFI_AP); WiFi.mode (WIFI_AP);
#ifdef ARDUINO_ARCH_ESP32 #ifdef ARDUINO_ARCH_ESP32
esp_wifi_set_protocol (ESP_IF_WIFI_AP, bflag); esp_wifi_set_protocol (WIFI_IF_AP, bflag);
#endif #endif
wifi_config.WiFi_on = true; wifi_config.WiFi_on = true;
delay (50); delay (50);
@ -363,7 +363,7 @@ bool WIFI_CONFIG::Setup (bool force_ap)
//get current config //get current config
#ifdef ARDUINO_ARCH_ESP32 #ifdef ARDUINO_ARCH_ESP32
wifi_config_t conf; wifi_config_t conf;
esp_wifi_get_config (ESP_IF_WIFI_AP, &conf); esp_wifi_get_config (WIFI_IF_AP, &conf);
#else #else
struct softap_config apconfig; struct softap_config apconfig;
wifi_softap_get_config (&apconfig); wifi_softap_get_config (&apconfig);
@ -400,7 +400,7 @@ bool WIFI_CONFIG::Setup (bool force_ap)
#ifdef ARDUINO_ARCH_ESP32 #ifdef ARDUINO_ARCH_ESP32
conf.ap.max_connection = DEFAULT_MAX_CONNECTIONS; conf.ap.max_connection = DEFAULT_MAX_CONNECTIONS;
conf.ap.beacon_interval = DEFAULT_BEACON_INTERVAL; conf.ap.beacon_interval = DEFAULT_BEACON_INTERVAL;
if (esp_wifi_set_config (ESP_IF_WIFI_AP, &conf) != ESP_OK) { if (esp_wifi_set_config (WIFI_IF_AP, &conf) != ESP_OK) {
ESPCOM::println (F ("Error Wifi AP!"), PRINTER_PIPE); ESPCOM::println (F ("Error Wifi AP!"), PRINTER_PIPE);
delay (1000); delay (1000);
} }
@ -469,7 +469,7 @@ bool WIFI_CONFIG::Setup (bool force_ap)
#ifdef ARDUINO_ARCH_ESP8266 #ifdef ARDUINO_ARCH_ESP8266
WiFi.setPhyMode ( (WiFiPhyMode_t) bflag); WiFi.setPhyMode ( (WiFiPhyMode_t) bflag);
#else #else
esp_wifi_set_protocol (ESP_IF_WIFI_STA, bflag); esp_wifi_set_protocol (WIFI_IF_STA, bflag);
#endif #endif
if (strlen(pwd) > 0) { if (strlen(pwd) > 0) {
WiFi.begin (sbuf, pwd); WiFi.begin (sbuf, pwd);