diff --git a/esp3d/configuration.h b/esp3d/configuration.h index cbe58b91..08f597bf 100644 --- a/esp3d/configuration.h +++ b/esp3d/configuration.h @@ -31,10 +31,10 @@ #define WIFI_FEATURE //ETH_FEATURE : enable Ethernet function -//#define ETH_FEATURE +#define ETH_FEATURE //BLUETOOTH_FEATURE : enable BT Serial function -//#define BLUETOOTH_FEATURE +#define BLUETOOTH_FEATURE //HTTP_FEATURE : enable HTTP function #define HTTP_FEATURE diff --git a/esp3d/src/modules/display/advanceddisplay.cpp b/esp3d/src/modules/display/advanceddisplay.cpp index cf8e42bd..96dead5d 100644 --- a/esp3d/src/modules/display/advanceddisplay.cpp +++ b/esp3d/src/modules/display/advanceddisplay.cpp @@ -238,7 +238,7 @@ bool Display::display_network_status(bool force) } //display connection speed if(ETH.linkUp()) { - String tmp = ETH.linkSpeed(); + String tmp = String(ETH.linkSpeed()); tmp+= "Mbps"; if (label != tmp) { label = tmp; @@ -269,8 +269,6 @@ bool Display::display_network_status(bool force) label = bt_service.hostname(); } 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) { lv_label_set_text(esp_lv_network_label, label.c_str()); } diff --git a/esp3d/src/modules/ethernet/ethconfig.cpp b/esp3d/src/modules/ethernet/ethconfig.cpp index 05b80132..bbfdd905 100644 --- a/esp3d/src/modules/ethernet/ethconfig.cpp +++ b/esp3d/src/modules/ethernet/ethconfig.cpp @@ -26,9 +26,9 @@ #endif //ARDUINO_ARCH_ESP32 #ifdef ARDUINO_ARCH_ESP8266 #endif //ARDUINO_ARCH_ESP8266 -#include "esp3doutput.h" -#include "settings_esp3d.h" -#include "netconfig.h" +#include "../../core/esp3doutput.h" +#include "../../core/settings_esp3d.h" +#include "../network/netconfig.h" #include "ethconfig.h" bool EthConfig::_started = false; const uint8_t DEFAULT_AP_MASK_VALUE[] = {255, 255, 255, 0};