From c9f7609eedc3cb6fdda43664480f58b164da170f Mon Sep 17 00:00:00 2001
From: fvanroie <cpt_jack@msn.com>
Date: Sat, 21 Nov 2020 23:41:14 +0100
Subject: [PATCH 1/2] Code cleanup

---
 src/hasp_gui.cpp  | 10 +++++-----
 src/hasp_mqtt.cpp |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/hasp_gui.cpp b/src/hasp_gui.cpp
index 3650b471..0a2a322a 100644
--- a/src/hasp_gui.cpp
+++ b/src/hasp_gui.cpp
@@ -105,8 +105,8 @@ bool guiCheckSleep()
     return (guiSleeping != HASP_SLEEP_OFF);
 }
 
-/* Experimental Display flushing */
-static void IRAM_ATTR my_flush_cb(lv_disp_drv_t * disp, const lv_area_t * area, lv_color_t * color_p)
+/* After flusing to the file stream or web client, we also send the buffer to the tft */
+static void IRAM_ATTR printscreen_flush_cb(lv_disp_drv_t * disp, const lv_area_t * area, lv_color_t * color_p)
 {
 #if 0
     size_t len = (area->x2 - area->x1 + 1) * (area->y2 - area->y1 + 1); /* Number of pixels */
@@ -130,7 +130,7 @@ static void IRAM_ATTR my_flush_cb(lv_disp_drv_t * disp, const lv_area_t * area,
 #endif
 
     /* Tell lvgl that flushing is done */
-    // lv_disp_flush_ready(disp);
+    // lv_disp_flush_ready(disp);  ===> moved into the drivers
 }
 
 /* Interrupt driven periodic handler */
@@ -911,7 +911,7 @@ static void gui_screenshot_to_file(lv_disp_drv_t * disp, const lv_area_t * area,
     len *= sizeof(lv_color_t);                                          /* Number of bytes */
     size_t res = pFileOut.write((uint8_t *)color_p, len);
     if(res != len) gui_flush_not_complete();
-    my_flush_cb(disp, area, color_p);
+    printscreen_flush_cb(disp, area, color_p);
 }
 
 /** Take Screenshot.
@@ -965,7 +965,7 @@ static void gui_screenshot_to_http(lv_disp_drv_t * disp, const lv_area_t * area,
     len *= sizeof(lv_color_t);                                          /* Number of bytes */
     size_t res = httpClientWrite((uint8_t *)color_p, len);
     if(res != len) gui_flush_not_complete();
-    my_flush_cb(disp, area, color_p);
+    printscreen_flush_cb(disp, area, color_p);
 }
 
 /** Take Screenshot.
diff --git a/src/hasp_mqtt.cpp b/src/hasp_mqtt.cpp
index c62b9b54..96e02627 100644
--- a/src/hasp_mqtt.cpp
+++ b/src/hasp_mqtt.cpp
@@ -486,7 +486,7 @@ void mqttStop()
 
         size_t len;
         snprintf_P(tmp_topic, sizeof(tmp_topic), PSTR("%sstatus"), mqttNodeTopic);
-        len = snprintf_P(tmp_payload, sizeof(tmp_payload), PSTR("OFF"), mqttNodeTopic);
+        len = snprintf_P(tmp_payload, sizeof(tmp_payload), PSTR("OFF"));
         mqttPublish(tmp_topic, tmp_payload, len);
 
         mqttClient.disconnect();

From ec84e97b5cc6aa5c15754b08970cadf8717bc6d8 Mon Sep 17 00:00:00 2001
From: arovak <arovak@netwize.be>
Date: Sun, 22 Nov 2020 14:12:54 +0100
Subject: [PATCH 2/2] add esp32 ethernet details to info page

---
 src/hasp_ethernet_esp32.cpp |  5 +++--
 src/hasp_http.cpp           | 19 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/hasp_ethernet_esp32.cpp b/src/hasp_ethernet_esp32.cpp
index 033f9c82..fbfa33cc 100644
--- a/src/hasp_ethernet_esp32.cpp
+++ b/src/hasp_ethernet_esp32.cpp
@@ -19,10 +19,11 @@ void EthernetEvent(WiFiEvent_t event)
         case SYSTEM_EVENT_ETH_START:
             Log.notice(TAG_ETH, F("Started"));
             // set eth hostname here
-            ETH.setHostname("esp32-ethernet");
+            ETH.setHostname(mqttGetNodename().c_str());
             break;
         case SYSTEM_EVENT_ETH_CONNECTED:
             Log.notice(TAG_ETH, F("Connected"));
+            eth_connected = true;
             break;
         case SYSTEM_EVENT_ETH_GOT_IP:
             Log.notice(TAG_ETH, F("MAC Address %s"), ETH.macAddress().c_str());
@@ -60,7 +61,7 @@ void ethernetLoop(void)
 
 bool ethernetEvery5Seconds()
 {
-    Log.warning(TAG_ETH, eth_connected ? F("ONLINE") : F("OFFLINE"));
+    // Log.warning(TAG_ETH, eth_connected ? F("ONLINE") : F("OFFLINE"));
     return eth_connected;
 }
 
diff --git a/src/hasp_http.cpp b/src/hasp_http.cpp
index ca9e3297..201a70db 100644
--- a/src/hasp_http.cpp
+++ b/src/hasp_http.cpp
@@ -504,7 +504,24 @@ void webHandleInfo()
         httpMessage += String(WiFi.macAddress());
 #endif
 #endif
-
+#if HASP_USE_ETHERNET > 0
+#if defined(ARDUINO_ARCH_ESP32)
+        httpMessage += F("</p/><p><b>Ethernet: </b>");
+        httpMessage += String(ETH.linkSpeed());
+        httpMessage += F(" Mbps");
+        if(ETH.fullDuplex()) {
+            httpMessage += F(" FULL_DUPLEX");
+        }
+        httpMessage += F("</br><b>IP Address: </b>");
+        httpMessage += String(ETH.localIP().toString());
+        httpMessage += F("</br><b>Gateway: </b>");
+        httpMessage += String(ETH.gatewayIP().toString());
+        httpMessage += F("</br><b>DNS Server: </b>");
+        httpMessage += String(ETH.dnsIP().toString());
+        httpMessage += F("</br><b>MAC Address: </b>");
+        httpMessage += String(ETH.macAddress());
+#endif
+#endif
 /* Mqtt Stats */
 #if HASP_USE_MQTT > 0
         httpMessage += F("</p/><p><b>MQTT Status: </b>");