Merge branch 'master' into mqtt_microtask

Author: jeremypoulter

platformio.ini

@@ -124,11 +124,11 @@ build_partitions = min_spiffs.csv
 build_partitions_debug = min_spiffs_debug.csv
 build_partitions_16mb = openevse_16mb.csv
 
-neopixel_lib = adafruit/Adafruit NeoPixel@1.14.0
+neopixel_lib = adafruit/Adafruit NeoPixel@1.15.1
 ws2812fx_lib = kitesurfer1404/[email protected]
 
 gfx_display_libs =
-#  lvgl/[email protected]
+#  lvgl/lvgl@^8.3.9
   bodmer/TFT_eSPI@^2.5.31
   bitbank2/PNGdec@^1.0.1
   SPI
@@ -173,7 +173,7 @@ gfx_display_build_flags =
 #platform = https://github.com/platformio/platform-espressif32.git#feature/stage
 #platform = https://github.com/platformio/platform-espressif32.git#develop
 #platform = [email protected]
-platform = espressif32@6.10.0
+platform = espressif32@6.11.0
 #framework = arduino, espidf
 framework = arduino
 lib_deps = ${common.lib_deps}

src/lcd_common.h

@@ -0,0 +1,33 @@
+#ifndef __LCD_COMMON_H
+#define __LCD_COMMON_H
+
+#include <TFT_eSPI.h>
+//#include <Fonts/FreeSans9pt7b.h>
+//#include <Fonts/FreeSans24pt7b.h>
+
+// LCD colour definitions
+#define TFT_OPENEVSE_BACK       0x2413
+#define TFT_OPENEVSE_GREEN      0x3E92
+#define TFT_OPENEVSE_TEXT       0x1BD1
+#define TFT_OPENEVSE_INFO_BACK  0x23d1
+
+// Message definitions
+#define LCD_MAX_LEN 16
+#define LCD_MAX_LINES 2
+
+#define LCD_CLEAR_LINE    (1 << 0)
+#define LCD_DISPLAY_NOW   (1 << 1)
+
+#ifndef LCD_BACKLIGHT_PIN
+#define LCD_BACKLIGHT_PIN TFT_BL
+#endif
+
+// Helper macro
+#ifndef ARRAY_ITEMS
+#define ARRAY_ITEMS(a) (sizeof(a) / sizeof(a[0]))
+#endif
+
+// Message line buffer - shared across screens
+extern char _msg[LCD_MAX_LINES][LCD_MAX_LEN + 1];
+
+#endif // __LCD_COMMON_H