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

fix compilation error with BT and ethernet

Browse Source
This commit is contained in:
Luc 2019-08-14 22:26:28 +02:00
parent 05f0c22d97
commit 4c39d5a6a2
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
esp3d/configuration.h
View File

@ -31,10 +31,10 @@
#define WIFI_FEATURE #define WIFI_FEATURE
//ETH_FEATURE : enable Ethernet function //ETH_FEATURE : enable Ethernet function
//#define ETH_FEATURE #define ETH_FEATURE
//BLUETOOTH_FEATURE : enable BT Serial function //BLUETOOTH_FEATURE : enable BT Serial function
//#define BLUETOOTH_FEATURE #define BLUETOOTH_FEATURE
//HTTP_FEATURE : enable HTTP function //HTTP_FEATURE : enable HTTP function
#define HTTP_FEATURE #define HTTP_FEATURE

4
esp3d/src/modules/display/advanceddisplay.cpp
View File

@ -238,7 +238,7 @@ bool Display::display_network_status(bool force)
} }
//display connection speed //display connection speed
if(ETH.linkUp()) { if(ETH.linkUp()) {
String tmp = ETH.linkSpeed(); String tmp = String(ETH.linkSpeed());
tmp+= "Mbps"; tmp+= "Mbps";
if (label != tmp) { if (label != tmp) {
label = tmp; label = tmp;
@ -269,8 +269,6 @@ bool Display::display_network_status(bool force)
label = bt_service.hostname(); label = bt_service.hostname();
} }
if( refresh_label || force) { if( refresh_label || force) {
//clear area
fillRect(SSID_AREA_X, SSID_AREA_Y, SSID_AREA_W, SSID_AREA_H, SCREEN_BG);
if (label.length()>0) { if (label.length()>0) {
lv_label_set_text(esp_lv_network_label, label.c_str()); lv_label_set_text(esp_lv_network_label, label.c_str());
} }

6
esp3d/src/modules/ethernet/ethconfig.cpp
View File

@ -26,9 +26,9 @@
#endif //ARDUINO_ARCH_ESP32 #endif //ARDUINO_ARCH_ESP32
#ifdef ARDUINO_ARCH_ESP8266 #ifdef ARDUINO_ARCH_ESP8266
#endif //ARDUINO_ARCH_ESP8266 #endif //ARDUINO_ARCH_ESP8266
#include "esp3doutput.h" #include "../../core/esp3doutput.h"
#include "settings_esp3d.h" #include "../../core/settings_esp3d.h"
#include "netconfig.h" #include "../network/netconfig.h"
#include "ethconfig.h" #include "ethconfig.h"
bool EthConfig::_started = false; bool EthConfig::_started = false;
const uint8_t DEFAULT_AP_MASK_VALUE[] = {255, 255, 255, 0}; const uint8_t DEFAULT_AP_MASK_VALUE[] = {255, 255, 255, 0};