From 4ccc9f69fd4610ecd4df43de3678d07ef5f1e79f Mon Sep 17 00:00:00 2001
From: s-hadinger <49731213+s-hadinger@users.noreply.github.com>
Date: Fri, 24 Oct 2025 19:52:50 +0200
Subject: [PATCH] Berry add 'gc_heap' and 'gc_time' to 'tasmota.memory()'
 (#24054)

---
 CHANGELOG.md                                  |   1 +
 ...ry_Sticker.tapp => Wifi_Heap_Sticker.tapp} | Bin 3129 -> 3342 bytes
 .../extensions/Wifi_Heap_Sticker/autoexec.be  |   6 ++++++
 .../manifest.json                             |   6 +++---
 .../wifi_heap_sticker.be}                     |  16 +++++++++++-----
 .../Wifi_Memory_Sticker/autoexec.be           |   6 ------
 .../xdrv_52_0_berry_struct.ino                |   2 ++
 .../xdrv_52_3_berry_tasmota.ino               |   7 +++++++
 .../tasmota_xdrv_driver/xdrv_52_9_berry.ino   |  13 +++++++++----
 9 files changed, 39 insertions(+), 18 deletions(-)
 rename tasmota/berry/extensions/{Wifi_Memory_Sticker.tapp => Wifi_Heap_Sticker.tapp} (57%)
 create mode 100644 tasmota/berry/extensions/Wifi_Heap_Sticker/autoexec.be
 rename tasmota/berry/extensions/{Wifi_Memory_Sticker => Wifi_Heap_Sticker}/manifest.json (59%)
 rename tasmota/berry/extensions/{Wifi_Memory_Sticker/wifi_memory_sticker.be => Wifi_Heap_Sticker/wifi_heap_sticker.be} (80%)
 delete mode 100644 tasmota/berry/extensions/Wifi_Memory_Sticker/autoexec.be

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 770b559fa..c4cfd57a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file.
 - Berry `cb.free_cb` for extension manager (#24014)
 - Berry `light.get()` direct access to values (#24033)
 - HostedMCU file update using command `HostedLoad <version>|<filename>`
+- Berry add `gc_heap` and `gc_time` to `tasmota.memory()`
 
 ### Breaking Changed
 
diff --git a/tasmota/berry/extensions/Wifi_Memory_Sticker.tapp b/tasmota/berry/extensions/Wifi_Heap_Sticker.tapp
similarity index 57%
rename from tasmota/berry/extensions/Wifi_Memory_Sticker.tapp
rename to tasmota/berry/extensions/Wifi_Heap_Sticker.tapp
index aaa5ba624fce56af2602832b620683dd95d1716f..e4854656666c6c532897e758ed361cd74a981732 100644
GIT binary patch
delta 901
zcmdlf(I-_O;LXg!#Q*{`XGcUkX)imsf{}p%gt-}H7!pfM@>45Pll78PLqj+jm;<-}
z&IktL(h6<{MwTByRV*Svt;z~TxeDQ#X_@gJsfh*g!6li=*{MZ(C5Z(E)(Tab1q!-Z
z3c3c^R0IK)V2bM_*^5QC9Ar}l$fjbbO-ZQ;WfSlAvw$Qg7cnYB7_%7zAdHWU5+=8R
z-kg~nuxmC40|N+)0KJLLK(K$$0R4J)`|rv2Oz|uruT5UUv;o41Von1yHXmc&%35ER
zSfr4i9AA=|o2p=|P?A`jn_rTsmz$cKUsS1~4wX^Y<Wc|vs9KN{v8x5iK-FfZDQLjV
zRkT&e%goVKP*Veof%QYhCNr_iO`gQ5t*u)PR1K1;%~ps8u|Y1X%`J|#(JwAY%(GL1
zI3YEsICXLYyZq$IoaV_23aNQ1K$n3?5audMEh#O^Lj))+J~cGCP*aOf+2V-1z~~2I
zUSKfhCgx?Pr52ayWfkY=!P5&c%}iG3Qi24VKbJI{p{0SNf#Ku=E^%v@%;JKa#7c#d
z`~roX)U*->XoM=1XO?7uT>um*O3h0L@)Gk>6d)n00P^AF^IR6pZa{OmxK(*k((Ys%
zZdFi9oqT{>#tt*OC4jDlfF+G@fhib!<g+p`10x?~L@dZ~RIef%aSfPz&^!**3(6>H
VnIyoQl?`MsGZ6j*(!aPtJOJL1A0+?)

delta 654
zcmeB^+9^>V;LXg!#Q*|%GjB#oA8t|I#mK+_!rTlp42h*B`KcAD$$Cktp&^_M%m;L1
zG7bT8X$3a}Bg+q<Di#r-R%L~vT!rw=w9I(l)ZF}{%J|@t%;fCUBE6Etf&y!Ws>}if
z-7E!N157o-P({cx6MLi#QO(gW2brA<F}oOQc2X*eri=Y-5CxM{7?oknZpHu@^FE`5
zS;?%MQ88J{0Snm~7(iGI=tb;CgMGVNKPF?Xe#~TTrg%1pgC_SeZQw_B8`tDOX79-X
zOl*_qF!Ml_ZC=B?m38uaHu1^-IJGCw<>H;ZiAz)iRiB0?7i!qQ3$$y00}RYJlizYl
zvV%ezh$r)ME7?IbDnJ8ONry{8L8&aYs5mn}PsvI_$)Li(&;Se|QYop$$wiq3B~a<f
zvza_5FXOggb~P}Y{E%Cf7bT)63-hRgqII%0kBkFm_(*_K1{f@9{11$7T%pCvzzhs6
mkRb{n<Kcb*YUO1>Hsk~6<cmBaU>jfX$Z#<L%~a+FSpWbvaL!=>

diff --git a/tasmota/berry/extensions/Wifi_Heap_Sticker/autoexec.be b/tasmota/berry/extensions/Wifi_Heap_Sticker/autoexec.be
new file mode 100644
index 000000000..a17629059
--- /dev/null
+++ b/tasmota/berry/extensions/Wifi_Heap_Sticker/autoexec.be
@@ -0,0 +1,6 @@
+# rm Wifi_Heap_Sticker.tapp; zip -j -0 Wifi_Heap_Sticker.tapp Wifi_Heap_Sticker/autoexec.be Wifi_Heap_Sticker/wifi_heap_sticker.be Wifi_Heap_Sticker/manifest.json
+do                          # embed in `do` so we don't add anything to global namespace
+  import introspect
+  var wifi_heap_sticker = introspect.module('wifi_heap_sticker', true)     # load module but don't cache
+  tasmota.add_extension(wifi_heap_sticker)
+end
diff --git a/tasmota/berry/extensions/Wifi_Memory_Sticker/manifest.json b/tasmota/berry/extensions/Wifi_Heap_Sticker/manifest.json
similarity index 59%
rename from tasmota/berry/extensions/Wifi_Memory_Sticker/manifest.json
rename to tasmota/berry/extensions/Wifi_Heap_Sticker/manifest.json
index 1837c8201..846845f31 100644
--- a/tasmota/berry/extensions/Wifi_Memory_Sticker/manifest.json
+++ b/tasmota/berry/extensions/Wifi_Heap_Sticker/manifest.json
@@ -1,8 +1,8 @@
 {
-  "name": "Wifi Memory Sticker",
-  "version": "0x19090100",
+  "name": "Wifi Heap Sticker",
+  "version": "0x190A0100",
   "description": "Display top left sticker with Wifi strength and memory heap",
   "author": "Stephan Hadinger",
-  "min_tasmota": "0x0F000100",
+  "min_tasmota": "0x0F010001",
   "features": ""
 }
\ No newline at end of file
diff --git a/tasmota/berry/extensions/Wifi_Memory_Sticker/wifi_memory_sticker.be b/tasmota/berry/extensions/Wifi_Heap_Sticker/wifi_heap_sticker.be
similarity index 80%
rename from tasmota/berry/extensions/Wifi_Memory_Sticker/wifi_memory_sticker.be
rename to tasmota/berry/extensions/Wifi_Heap_Sticker/wifi_heap_sticker.be
index ced641b68..baefd8079 100644
--- a/tasmota/berry/extensions/Wifi_Memory_Sticker/wifi_memory_sticker.be
+++ b/tasmota/berry/extensions/Wifi_Heap_Sticker/wifi_heap_sticker.be
@@ -1,12 +1,12 @@
 #######################################################################
-# Wifi Memory Sticker
+# Wifi Heap Sticker
 #
 # Sticker to show realtime wifi strengh and memory (top left of main page)
 
 #################################################################################
-# Wifi_Memory_Sticker
+# Wifi_Heap_Sticker
 #################################################################################
-class Wifi_Memory_Sticker
+class Wifi_Heap_Sticker
 
   static var HTTP_HEAD_STYLE_WIFI =
     "<style>"
@@ -43,8 +43,14 @@ class Wifi_Memory_Sticker
                                     rssi >= -85 ? "active" : ""))
     end
     # display free heap
-    webserver.content_send(f"<span>&nbsp;{tasmota.memory('heap_free')}k</span>")
+    var gc_time = tasmota.memory('gc_time')
+    var gc_heap = tasmota.memory('gc_heap')
+    if (gc_time != nil) && (gc_heap != nil)
+      webserver.content_send(f"<span>&nbsp;{tasmota.memory('heap_free')}-{gc_heap}k [{gc_time}ms]</span>")
+    else
+      webserver.content_send(f"<span>&nbsp;{tasmota.memory('heap_free')}k</span>")
+    end
   end
 end
 
-return Wifi_Memory_Sticker()
+return Wifi_Heap_Sticker()
diff --git a/tasmota/berry/extensions/Wifi_Memory_Sticker/autoexec.be b/tasmota/berry/extensions/Wifi_Memory_Sticker/autoexec.be
deleted file mode 100644
index e10b4ded4..000000000
--- a/tasmota/berry/extensions/Wifi_Memory_Sticker/autoexec.be
+++ /dev/null
@@ -1,6 +0,0 @@
-# rm Wifi_Memory_Sticker.tapp; zip -j -0 Wifi_Memory_Sticker.tapp Wifi_Memory_Sticker/autoexec.be Wifi_Memory_Sticker/wifi_memory_sticker.be Wifi_Memory_Sticker/manifest.json
-do                          # embed in `do` so we don't add anything to global namespace
-  import introspect
-  var wifi_memory_sticker = introspect.module('wifi_memory_sticker', true)     # load module but don't cache
-  tasmota.add_extension(wifi_memory_sticker)
-end
diff --git a/tasmota/tasmota_xdrv_driver/xdrv_52_0_berry_struct.ino b/tasmota/tasmota_xdrv_driver/xdrv_52_0_berry_struct.ino
index a56df0832..f0f8df6af 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_52_0_berry_struct.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_52_0_berry_struct.ino
@@ -91,6 +91,8 @@ class BerrySupport {
 public:
   bvm *vm = nullptr;                    // berry vm
   int32_t timeout = 0;                  // Berry heartbeat timeout, preventing code to run for too long. `0` means not enabled
+  int32_t last_gc_tims_ms = -1;         // Record the time taken by the last garbage collection in milliseconds, -1 means not yet collected
+  int32_t last_gc_heap_free = -1;       // Record the free heap size after the last garbage collection, -1 means not yet collected
   bool rules_busy = false;              // are we already processing rules, avoid infinite loop
   bool web_add_handler_done = false;    // did we already sent `web_add_handler` event
 #ifdef USE_BERRY_LEDS_PANEL
diff --git a/tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_tasmota.ino b/tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_tasmota.ino
index 3f43826ce..1534eb657 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_tasmota.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_tasmota.ino
@@ -218,6 +218,13 @@ extern "C" {
     // give info about stack size
     be_map_insert_int(vm, "stack_size", SET_ESP32_STACK_SIZE / 1024);
     be_map_insert_real(vm, "stack_low", ((float)uxTaskGetStackHighWaterMark(nullptr)) / 1024);
+    // values seen at last GC
+    if (berry.last_gc_tims_ms >= 0) {
+      be_map_insert_int(vm, "gc_time", berry.last_gc_tims_ms);
+    }
+    if (berry.last_gc_heap_free >= 0) {
+      be_map_insert_int(vm, "gc_heap", berry.last_gc_heap_free / 1024);
+    }
     if (UsePSRAM()) {
       be_map_insert_int(vm, "psram", ESP.getPsramSize() / 1024);
       be_map_insert_int(vm, "psram_free", ESP.getFreePsram() / 1024);
diff --git a/tasmota/tasmota_xdrv_driver/xdrv_52_9_berry.ino b/tasmota/tasmota_xdrv_driver/xdrv_52_9_berry.ino
index 38ed4e65b..ac518cea2 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_52_9_berry.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_52_9_berry.ino
@@ -286,10 +286,15 @@ void BerryObservability(bvm *vm, int event...) {
         size_t slots_allocated_before_gc = va_arg(param, size_t);
         size_t slots_used_after_gc = va_arg(param, size_t);
         size_t slots_allocated_after_gc = va_arg(param, size_t);
-        AddLog(LOG_LEVEL_DEBUG_MORE, D_LOG_BERRY "GC from %i to %i bytes, objects freed %i/%i (in %d ms) - slots from %i/%i to %i/%i",
-                                vm_usage, vm_usage2, vm_freed, vm_scanned, gc_elapsed,
-                                slots_used_before_gc, slots_allocated_before_gc,
-                                slots_used_after_gc, slots_allocated_after_gc);
+        if (HighestLogLevel() >= LOG_LEVEL_DEBUG_MORE) {
+          AddLog(LOG_LEVEL_DEBUG_MORE, D_LOG_BERRY "GC from %i to %i bytes, objects freed %i/%i (in %d ms) - slots from %i/%i to %i/%i",
+                                  vm_usage, vm_usage2, vm_freed, vm_scanned, gc_elapsed,
+                                  slots_used_before_gc, slots_allocated_before_gc,
+                                  slots_used_after_gc, slots_allocated_after_gc);
+        }
+        // record last seen values
+        berry.last_gc_tims_ms = gc_elapsed;
+        berry.last_gc_heap_free = ESP_getFreeHeap();
 
 #ifdef UBE_BERRY_DEBUG_GC
         // Add more in-deptch metrics