From 5e791027cfd44ba322a47ad9b4e92274fe40c371 Mon Sep 17 00:00:00 2001
From: Stephan Hadinger <stephan.hadinger@gmail.com>
Date: Mon, 3 May 2021 22:04:41 +0200
Subject: [PATCH] LVGL complete support for uDisplay

---
 .../displaydesc/ILI9341_M5Stack_display.ini   | 34 +++++++++++++++++++
 ...erry_lvlg.ino => xdrv_52_3_berry_lvgl.ino} |  7 ++--
 tasmota/xdrv_52_7_berry_embedded.ino          |  8 -----
 3 files changed, 39 insertions(+), 10 deletions(-)
 create mode 100644 tasmota/displaydesc/ILI9341_M5Stack_display.ini
 rename tasmota/{xdrv_52_3_berry_lvlg.ino => xdrv_52_3_berry_lvgl.ino} (99%)

diff --git a/tasmota/displaydesc/ILI9341_M5Stack_display.ini b/tasmota/displaydesc/ILI9341_M5Stack_display.ini
new file mode 100644
index 000000000..7bee4d3b0
--- /dev/null
+++ b/tasmota/displaydesc/ILI9341_M5Stack_display.ini
@@ -0,0 +1,34 @@
+:H,ILI9341,320,240,16,SPI,1,*,*,*,*,*,*,*,40
+:B,60,1
+:I
+EF,3,03,80,02
+CF,3,00,C1,30
+ED,4,64,03,12,81
+E8,3,85,00,78
+CB,5,39,2C,00,34,02
+F7,1,20
+EA,2,00,00
+C0,1,23
+C1,1,10
+C5,2,3e,28
+C7,1,86
+36,1,48
+37,1,00
+3A,1,55
+B1,2,00,18
+B6,3,08,82,27
+F2,1,00
+26,1,01
+E0,0F,0F,31,2B,0C,0E,08,4E,F1,37,07,10,03,0E,09,00
+E1,0F,00,0E,14,03,11,07,31,C1,48,08,0F,0C,31,36,0F
+11,80
+29,80
+:o,28
+:O,29
+:A,2A,2B,2C
+:R,36
+:0,08,00,00,00
+:1,68,00,00,01
+:2,C8,00,00,02
+:3,A8,00,00,03
+#
\ No newline at end of file
diff --git a/tasmota/xdrv_52_3_berry_lvlg.ino b/tasmota/xdrv_52_3_berry_lvgl.ino
similarity index 99%
rename from tasmota/xdrv_52_3_berry_lvlg.ino
rename to tasmota/xdrv_52_3_berry_lvgl.ino
index 93e15d441..3d71b5165 100644
--- a/tasmota/xdrv_52_3_berry_lvlg.ino
+++ b/tasmota/xdrv_52_3_berry_lvgl.ino
@@ -444,8 +444,11 @@ extern "C" {
   int lv0_start(bvm *vm);
   int lv0_start(bvm *vm) {
     int32_t argc = be_top(vm); // Get the number of arguments
-    if (argc == 1 && be_isstring(vm, 1)) {
-      const char * uconfig = be_tostring(vm, 1);
+    if (argc == 0 || (argc == 1 && be_isstring(vm, 1))) {
+      const char * uconfig = nullptr;
+      if (argc == 1) {
+        be_tostring(vm, 1);
+      }
       start_lvgl(uconfig);
       be_return_nil(vm);
     }
diff --git a/tasmota/xdrv_52_7_berry_embedded.ino b/tasmota/xdrv_52_7_berry_embedded.ino
index da5e94f08..f83254f74 100644
--- a/tasmota/xdrv_52_7_berry_embedded.ino
+++ b/tasmota/xdrv_52_7_berry_embedded.ino
@@ -375,14 +375,6 @@ const char berry_prog[] =
   // "lv = lvgl() "
   "import lvgl as lv "
 
-  // temporarily put udisplay descriptions here (will be solidified later)
-  "udisplay = module('udisplay') "
-
-  "udisplay.ILI9341_M5Stack_Core = ':H,ILI9341,320,240,16,SPI,1,*,*,*,*,*,*,*,40 :B,60,1 :I EF,3,03,80,02 CF,3,00,C1,30 ED,4,64,03,12,81 E8,3,85,00,78 CB,5,39,2C,00,34,02 F7,1,20 EA,2,00,00 C0,1,23 C1,1,10 C5,2,3e,28 C7,1,86 36,1,48 37,1,00 3A,1,55 B1,2,00,18 B6,3,08,82,27 F2,1,00 26,1,01 E0,0F,0F,31,2B,0C,0E,08,4E,F1,37,07,10,03,0E,09,00 E1,0F,00,0E,14,03,11,07,31,C1,48,08,0F,0C,31,36,0F 11,80 29,80 :o,28 :O,29 :A,2A,2B,2C :R,36 :0,08,00,00,00 :1,68,00,00,01 :2,C8,00,00,02 :3,A8,00,00,03 #' "
-  "udisplay.ILI9341 = ':H,ILI9341,240,320,16,SPI,1,*,*,*,*,*,*,*,40 :I EF,3,03,80,02 CF,3,00,C1,30 ED,4,64,03,12,81 E8,3,85,00,78 CB,5,39,2C,00,34,02 F7,1,20 EA,2,00,00 C0,1,23 C1,1,10 C5,2,3e,28 C7,1,86 36,1,48 37,1,00 3A,1,55 B1,2,00,18 B6,3,08,82,27 F2,1,00 26,1,01 E0,0F,0F,31,2B,0C,0E,08,4E,F1,37,07,10,03,0E,09,00 E1,0F,00,0E,14,03,11,07,31,C1,48,08,0F,0C,31,36,0F 11,80 29,80 :o,28 :O,29 :A,2A,2B,2C,16 :R,36 :0,48,00,00,00 :1,28,00,00,01 :2,88,00,00,02 :3,E8,00,00,03 :i,20,21 #' "
-  "udisplay.ILI9342 = ':H,ILI9342,320,240,16,SPI,1,*,*,*,*,*,*,*,40 :I EF,3,03,80,02 CF,3,00,C1,30 ED,4,64,03,12,81 E8,3,85,00,78 CB,5,39,2C,00,34,02 F7,1,20 EA,2,00,00 C0,1,23 C1,1,10 C5,2,3e,28 C7,1,86 36,1,48 37,1,00 3A,1,55 B1,2,00,18 B6,3,08,82,27 F2,1,00 26,1,01 E0,0F,0F,31,2B,0C,0E,08,4E,F1,37,07,10,03,0E,09,00 E1,0F,00,0E,14,03,11,07,31,C1,48,08,0F,0C,31,36,0F 21,80 11,80 29,80 :o,28 :O,29 :A,2A,2B,2C,16 :R,36 :0,08,00,00,00 :1,A8,00,00,01 :2,C8,00,00,02 :3,68,00,00,03 :i,21,20 :TI2,38,22,21 #' "
-  "udisplay.ILI9488 = ':H,ILI9488,480,320,16,SPI,1,*,*,*,*,*,*,*,10 :I E0,0F,00,03,09,08,16,0A,3F,78,4C,09,0A,08,16,1A,0F E1,0F,00,16,19,03,0F,05,32,45,46,04,0E,0D,35,37,0F C0,2,17,15 C1,1,41 C5,3,00,12,80 36,1,48 3A,1,66 B0,1,80 B1,1,A0 B4,1,02 B6,2,02,02 E9,1,00 F7,4,A9,51,2C,82 11,80 29,0 :o,28 :O,29 :A,2A,2B,2C,16 :R,36 ;:0,48,00,00,00 :0,28,00,00,01 :1,28,00,00,00 :2,E8,00,00,03 :3,88,00,00,02 :P,18 :i,20,21 :TI1,38,*,* #' "
-
 #endif // USE_LVGL
 
   // Wire class