mirror/Grbl_Esp32
1
0
Fork 0
mirror of https://github.com/bdring/Grbl_Esp32.git synced 2025-08-27 08:14:31 +02:00
Code Issues Releases Wiki Activity

1.0.5 compilation fixes (#782)

Browse Source 
* Fix compilations error due to new enum in esp32 core release 1.0.5

* Update Grbl.h

Co-authored-by: Luc <luc.@tech-hunters.com>
This commit is contained in:
Luc
2021-02-26 15:30:14 +01:00
committed by GitHub
parent 5bc3cf819b
commit 32926abbcc
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Grbl_Esp32/src/Grbl.h
View File

@@ -22,7 +22,7 @@
// Grbl versioning system // Grbl versioning system
const char* const GRBL_VERSION = "1.3a"; const char* const GRBL_VERSION = "1.3a";
const char* const GRBL_VERSION_BUILD = "20210218"; const char* const GRBL_VERSION_BUILD = "20210226";
//#include <sdkconfig.h> //#include <sdkconfig.h>
#include <Arduino.h> #include <Arduino.h>

4
Grbl_Esp32/src/WebUI/WebSettings.cpp
View File

@@ -466,7 +466,7 @@ namespace WebUI {
webPrintln("Signal: ", String(wifi_config.getSignal(WiFi.RSSI())) + "%"); webPrintln("Signal: ", String(wifi_config.getSignal(WiFi.RSSI())) + "%");
uint8_t PhyMode; uint8_t PhyMode;
esp_wifi_get_protocol(ESP_IF_WIFI_STA, &PhyMode); esp_wifi_get_protocol(WIFI_IF_STA, &PhyMode);
const char* modeName; const char* modeName;
switch (PhyMode) { switch (PhyMode) {
case WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G | WIFI_PROTOCOL_11N: case WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G | WIFI_PROTOCOL_11N:
@@ -501,7 +501,7 @@ namespace WebUI {
print_mac("AP", WiFi.softAPmacAddress()); print_mac("AP", WiFi.softAPmacAddress());
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);
webPrintln("SSID: ", (const char*)conf.ap.ssid); webPrintln("SSID: ", (const char*)conf.ap.ssid);
webPrintln("Visible: ", (conf.ap.ssid_hidden == 0) ? "Yes" : "No"); webPrintln("Visible: ", (conf.ap.ssid_hidden == 0) ? "Yes" : "No");

2
Grbl_Esp32/src/WebUI/WifiConfig.cpp
View File

@@ -71,7 +71,7 @@ namespace WebUI {
} }
result += "Mode=AP:SSDI="; result += "Mode=AP:SSDI=";
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);
result += (const char*)conf.ap.ssid; result += (const char*)conf.ap.ssid;
result += ":IP="; result += ":IP=";
result += WiFi.softAPIP().toString(); result += WiFi.softAPIP().toString();