Merge branch 'core3fix' into main

Author: vortigont

EmbUI/EmbUI.cpp

@@ -6,11 +6,6 @@
 #include "EmbUI.h"
 #include "ui.h"
 
-#ifdef EMBUI_DEBUG
- #include "MemoryInfo.h"
-#endif
-
-
 // Update defs
 #ifndef ESP_IMAGE_HEADER_MAGIC
  #define ESP_IMAGE_HEADER_MAGIC 0xE9
@@ -205,7 +200,7 @@ void EmbUI::begin(){
         String out = String(F("Heap: "))+String(ESP.getFreeHeap());
 #ifdef EMBUI_DEBUG
     #ifdef ESP8266
-        out += String(F("\nFrac: ")) + String(getFragmentation());
+        out += String(F("\nFrac: ")) + String(ESP.getHeapFragmentation());
     #endif
         out += String(F("\nClient: ")) + String(ws.count());
 #endif

EmbUI/MemoryInfo.cpp

@@ -10,13 +10,20 @@
  #include <TZ.h>                        // TZ declarations https://github.com/esp8266/Arduino/blob/master/cores/esp8266/TZ.h
  #include <sntp.h>
  #include <ESP8266HTTPClient.h>
+
+ #ifdef __NEWLIB__ 
+  #if __NEWLIB__ >= 4
+    extern "C" {
+        #include <sys/_tz_structs.h>
+    };
+  #endif
+ #endif
 #endif
 
 #ifdef ESP32
  #include <time.h>
  #include <lwip/apps/sntp.h>
  #include <HTTPClient.h>
- //extern "C" void setTimeZone(long offset, int daylight = 0);
 #endif
 
 #ifndef TZONE
@@ -31,7 +38,7 @@ TimeProcessor::TimeProcessor()
     //configTzTime(); for esp32 https://github.com/espressif/arduino-esp32/blob/master/cores/esp32/esp32-hal-time.c
 
 #ifdef ESP8266
-    settimeofday_cb(std::bind(&TimeProcessor::timeavailable, this));
+    settimeofday_cb( [this]{ timeavailable();} );
 #endif
 
 /*