From d90c172001870507adf1c5791d62d787a10ae2aa Mon Sep 17 00:00:00 2001 From: Luc Date: Fri, 5 Feb 2021 19:04:16 +0100 Subject: [PATCH] Compilation fixes for ESP32-S2 --- esp3d/src/include/version.h | 2 +- esp3d/src/modules/wifi/wificonfig.cpp | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/esp3d/src/include/version.h b/esp3d/src/include/version.h index a1500b93..d29c7582 100644 --- a/esp3d/src/include/version.h +++ b/esp3d/src/include/version.h @@ -22,7 +22,7 @@ #define _VERSION_ESP3D_H //version and sources location -#define FW_VERSION "3.0.0.a89" +#define FW_VERSION "3.0.0.a90" #define REPOSITORY "https://github.com/luc-github/ESP3D/tree/3.0" #endif //_VERSION_ESP3D_H diff --git a/esp3d/src/modules/wifi/wificonfig.cpp b/esp3d/src/modules/wifi/wificonfig.cpp index a6e63d73..bcd0d7e8 100644 --- a/esp3d/src/modules/wifi/wificonfig.cpp +++ b/esp3d/src/modules/wifi/wificonfig.cpp @@ -236,6 +236,7 @@ bool WiFiConfig::StartAP() if((WiFi.getMode() == WIFI_AP) || (WiFi.getMode() == WIFI_AP_STA)) { WiFi.softAPdisconnect(); } + WiFi.enableAP (true); WiFi.enableSTA (false); WiFi.mode(WIFI_AP); //Set Sleep Mode to none @@ -375,7 +376,7 @@ const char* WiFiConfig::getPHYModeString (uint8_t wifimode) { #ifdef ARDUINO_ARCH_ESP32 uint8_t PhyMode; - esp_wifi_get_protocol ((wifimode == WIFI_STA)?ESP_IF_WIFI_STA:ESP_IF_WIFI_AP, &PhyMode); + esp_wifi_get_protocol ((wifi_interface_t)((wifimode == WIFI_STA)?ESP_IF_WIFI_STA:ESP_IF_WIFI_AP), &PhyMode); #endif //ARDUINO_ARCH_ESP32 #ifdef ARDUINO_ARCH_ESP8266 (void)wifimode; @@ -396,7 +397,7 @@ bool WiFiConfig::is_AP_visible() { #ifdef ARDUINO_ARCH_ESP32 wifi_config_t conf; - esp_wifi_get_config (ESP_IF_WIFI_AP, &conf); + esp_wifi_get_config ((wifi_interface_t)ESP_IF_WIFI_AP, &conf); return (conf.ap.ssid_hidden == 0); #endif //ARDUINO_ARCH_ESP32 #ifdef ARDUINO_ARCH_ESP8266 @@ -411,7 +412,7 @@ const char * WiFiConfig::AP_SSID() static String ssid; #ifdef ARDUINO_ARCH_ESP32 wifi_config_t conf; - esp_wifi_get_config (ESP_IF_WIFI_AP, &conf); + esp_wifi_get_config ((wifi_interface_t)ESP_IF_WIFI_AP, &conf); ssid = (const char*) conf.ap.ssid; #endif //ARDUINO_ARCH_ESP32 #ifdef ARDUINO_ARCH_ESP8266 @@ -427,7 +428,7 @@ const char * WiFiConfig::AP_Auth_String() uint8_t mode = 0; #ifdef ARDUINO_ARCH_ESP32 wifi_config_t conf; - esp_wifi_get_config (ESP_IF_WIFI_AP, &conf); + esp_wifi_get_config ((wifi_interface_t)ESP_IF_WIFI_AP, &conf); mode = conf.ap.authmode; #endif //ARDUINO_ARCH_ESP32