From 992b11378f43974fef52981daf7f8fcebeb8b114 Mon Sep 17 00:00:00 2001
From: Stephan Hadinger <stephan.hadinger@gmail.com>
Date: Mon, 29 Nov 2021 21:51:46 +0100
Subject: [PATCH] Berry allocate logs in PSRAM

---
 tasmota/xdrv_52_0_berry_struct.ino | 38 +++++++++++++++++++++++-------
 tasmota/xdrv_52_9_berry.ino        |  2 +-
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/tasmota/xdrv_52_0_berry_struct.ino b/tasmota/xdrv_52_0_berry_struct.ino
index 61ff080c5..70e443cb3 100644
--- a/tasmota/xdrv_52_0_berry_struct.ino
+++ b/tasmota/xdrv_52_0_berry_struct.ino
@@ -27,28 +27,48 @@
 
 #define BERRY_CONSOLE_CMD_DELIMITER   "\x01"
 
-typedef LList_elt<char[0]> log_elt;   // store the string after the header to avoid double allocation if we had used char*
+class Log_line {
+public:
+  Log_line() : log_line(nullptr) {}
+  ~Log_line() {
+    if (log_line != nullptr) {
+      berry_free(log_line);
+    }
+  }
+  char * getBuffer() { return log_line; }
+  char * allocate(size_t size) {
+    if (log_line != nullptr) {
+      berry_free(log_line);
+    }
+    log_line = (char*) berry_malloc(size);
+    return log_line;
+  }
+
+  char * log_line;
+};
+
+// typedef LList_elt<Log_line> log_elt;   // store the string after the header to avoid double allocation if we had used char*
+
 
 class BerryLog {
 public:
-  // typedef LList_elt<char[0]> log_elt;   // store the string after the header to avoid double allocation if we had used char*
-  inline static size_t size(size_t chars) { return sizeof(log_elt) + chars; }
   inline bool isEmpty(void) const { return log.isEmpty(); }
-  log_elt * addString(const char * s, const char * prefix = nullptr, const char * suffix = nullptr) {
+  LList_elt<Log_line> * addString(const char * s, const char * prefix = nullptr, const char * suffix = nullptr) {
     if (suffix == nullptr) { suffix = ""; }
     if (prefix == nullptr) { prefix = ""; }
     if (s == nullptr) { s = ""; }
     size_t s_len = strlen_P(s) + strlen_P(prefix) + strlen_P(suffix);
     if (0 == s_len) { return nullptr; }   // do nothing
-    log_elt * elt = (log_elt*) ::operator new(sizeof(log_elt) + s_len + 1); // use low-level new to specify the bytes size
-    snprintf_P((char*) &elt->val(), s_len+1, PSTR("%s%s%s"), prefix, s, suffix);
-    log.addToLast(elt);
-    return elt;
+    LList_elt<Log_line> * log_elt = new LList_elt<Log_line>();
+    log_elt->val().allocate(s_len + 1);
+    snprintf_P(log_elt->val().getBuffer(), s_len+1, PSTR("%s%s%s"), prefix, s, suffix);
+    log.addToLast(log_elt);
+    return log_elt;
   }
   void reset(void) {
     log.reset();
   }
-  LList<char[0]> log;
+  LList<Log_line> log;
 };
 
 class BerrySupport {
diff --git a/tasmota/xdrv_52_9_berry.ino b/tasmota/xdrv_52_9_berry.ino
index e938c5bb4..b59fa2f80 100644
--- a/tasmota/xdrv_52_9_berry.ino
+++ b/tasmota/xdrv_52_9_berry.ino
@@ -695,7 +695,7 @@ void HandleBerryConsoleRefresh(void)
     WSContentFlush();
 
     for (auto & l: berry.log.log) {
-      _WSContentSend((char*) l);
+      _WSContentSend(l.getBuffer());
     }
 
     berry.log.reset();