Fixed text display

Author: jeremypoulter

src/lcd_tft.cpp

@@ -8,6 +8,7 @@
 #include "emonesp.h"
 #include "lcd.h"
 #include "lcd_common.h"
+#include "screens/screen_renderer.h"
 #include "RapiSender.h"
 #include "openevse.h"
 #include "input.h"
@@ -20,9 +21,6 @@
 
 PNG png; // Global PNG decoder instance
 
-// Global message buffer shared with renderers
-char _msg[LCD_MAX_LINES][LCD_MAX_LEN + 1];
-
 LcdTask::Message::Message(const __FlashStringHelper *msg, int x, int y, int time, uint32_t flags) :
   _next(NULL),
   _msg(""),
@@ -65,9 +63,8 @@ LcdTask::LcdTask() :
 #endif
 {
   for(int i = 0; i < LCD_MAX_LINES; i++) {
-    clearLine(i);
+    clear_message_line(i);
   }
-  _msg_cleared = true;
 }
 
 LcdTask::~LcdTask()
@@ -194,7 +191,7 @@ unsigned long LcdTask::loop(MicroTasks::WakeReason reason)
   {
     DBUGLN("Clearing message lines");
     for(int i = 0; i < LCD_MAX_LINES; i++) {
-      clearLine(i);
+      clear_message_line(i);
     }
     _msg_cleared = true;
   }
@@ -238,7 +235,7 @@ unsigned long LcdTask::displayNextMessage()
       _screenManager->wakeBacklight();
     }
 #endif //TFT_BACKLIGHT_TIMEOUT_MS
-    showText(msg->getX(), msg->getY(), msg->getMsg(), msg->getClear());
+    set_message_line(msg->getX(), msg->getY(), msg->getMsg(), msg->getClear());
 
     _nextMessageTime = millis() + msg->getTime();
 
@@ -251,29 +248,6 @@ unsigned long LcdTask::displayNextMessage()
   return nextUpdate;
 }
 
-void LcdTask::showText(int x, int y, const char *msg, bool clear)
-{
-  DBUGF("LCD: %d %d %s, clear=%s", x, y, msg, clear ? "true" : "false");
-
-  if(clear) {
-    clearLine(y);
-  }
-
-  strncpy(_msg[y], msg + x, LCD_MAX_LEN - x);
-  _msg[y][LCD_MAX_LEN] = '\0';
-  _msg_cleared = false;
-}
-
-void LcdTask::clearLine(int line)
-{
-  if(line < 0 || line >= LCD_MAX_LINES) {
-    return;
-  }
-
-  memset(_msg[line], ' ', LCD_MAX_LEN);
-  _msg[line][LCD_MAX_LEN] = '\0';
-}
-
 LcdTask lcd;
 
 #endif // ENABLE_SCREEN_LCD_TFT

src/lcd_tft.h

@@ -93,13 +93,8 @@ class LcdTask : public MicroTasks::Task
     bool _previous_vehicle_state;
 #endif //TFT_BACKLIGHT_TIMEOUT_MS
 
-    char _msg[LCD_MAX_LINES][LCD_MAX_LEN + 1];
-    bool _msg_cleared;
-
     void display(Message *msg, uint32_t flags);
     unsigned long displayNextMessage();
-    void clearLine(int line);
-    void showText(int x, int y, const char *msg, bool clear);
 
 #ifdef TFT_BACKLIGHT_TIMEOUT_MS
     void timeoutBacklight();

src/screens/screen_renderer.cpp

@@ -13,6 +13,10 @@
 
 extern PNG png;
 
+// Global message buffer shared with renderers
+char _msg[LCD_MAX_LINES][LCD_MAX_LEN + 1];
+bool _msg_cleared = false;
+
 #define MAX_IMAGE_WIDTH TFT_HEIGHT // Adjust for your images
 
 struct image_render_state {
@@ -133,8 +137,38 @@ void get_scaled_number_value(double value, int precision, const char *unit, char
   snprintf(buffer, size, "%.*f %s%s", precision, value, mod[index], unit);
 }
 
-// Message line buffer management - will need to be moved from LcdTask to here or a separate file
-extern char _msg[LCD_MAX_LINES][LCD_MAX_LEN + 1]; // This should be defined in lcd_common.h
+void set_message_line(int x, int y, const char *msg, bool clear)
+{
+  DBUGF("LCD: %d %d %s, clear=%s", x, y, msg, clear ? "true" : "false");
+
+  if(y < 0 || y >= LCD_MAX_LINES) {
+    return;
+  }
+
+  if(clear) {
+    clear_message_line(y);
+  }
+
+  if(x < 0 || x >= LCD_MAX_LEN) {
+    return;
+  }
+
+  strncpy(_msg[y] + x, msg, LCD_MAX_LEN - x);
+  _msg[y][LCD_MAX_LEN] = '\0';
+  _msg_cleared = false;
+
+  DBUGF("LCD: %s (%p)", _msg[y], _msg[y]);
+}
+
+void clear_message_line(int line)
+{
+  if(line < 0 || line >= LCD_MAX_LINES) {
+    return;
+  }
+
+  memset(_msg[line], ' ', LCD_MAX_LEN);
+  _msg[line][LCD_MAX_LEN] = '\0';
+}
 
 String get_message_line(int line)
 {
@@ -153,6 +187,8 @@ String get_message_line(int line)
     len--;
   }
 
+  DBUGF("get_message_line: %d, '%s' (%p) -> '%.*s'", line, _msg[line], _msg[line], len, start);
+
   return String(start, len);
 }
 

src/screens/screen_renderer.h

@@ -4,6 +4,8 @@
 #include <TFT_eSPI.h>
 #include <PNGdec.h>
 
+#include "lcd_common.h"
+
 // The TFT screen is portrait natively, so we need to rotate it
 #define TFT_SCREEN_WIDTH  TFT_HEIGHT
 #define TFT_SCREEN_HEIGHT TFT_WIDTH
@@ -36,6 +38,12 @@ extern void render_info_box(const char *title, const char *text, int16_t x, int1
 extern void get_scaled_number_value(double value, int precision, const char *unit,
                              char *buffer, size_t size);
 
+// Message line buffer - shared across screens
+extern char _msg[LCD_MAX_LINES][LCD_MAX_LEN + 1];
+extern bool _msg_cleared;
+
+extern void set_message_line(int x, int y, const char *msg, bool clear);
+extern void clear_message_line(int line);
 extern String get_message_line(int line);
 
 #endif // __SCREEN_RENDERER_H