Merge pull request #172 from martinberlin/vroland-master

Fix Lilygo EPD47 waveform adding ED047TC1 as default #171
vroland · Apr 30, 2022 · ef18857 · ef18857
2 parents 24b5f70 + 19a4f04
commit ef18857
Show file tree

Hide file tree

Showing 5 changed files with 94 additions and 54 deletions.
diff --git a/src/epd_driver/Kconfig b/src/epd_driver/Kconfig
@@ -24,7 +24,9 @@ menu "E-Paper Driver"
             bool "ED133UT2"
 
         config EPD_DISPLAY_TYPE_ED047TC1
-            bool "ED047TC1 (LILYGO 4.7 inch)"
+            bool "ED047TC1 LILYGO 4.7 inch, correct grays"
+        config EPD_DISPLAY_TYPE_ED047TC2
+            bool "ED047TC2 New waveform, slower and 7 times bigger, darker black"
 
         config EPD_DISPLAY_TYPE_ED097OC4_LQ
             bool "ED097OC4 Low Quality"

diff --git a/src/epd_driver/builtin_waveforms.c b/src/epd_driver/builtin_waveforms.c
@@ -2,6 +2,11 @@
 
 
 #include "waveforms/epdiy_ED047TC1.h"
+
+// Note: Alternative Waveform added by Lilygo on Oct 2021, size: 266 Kb (ED047TC1 is 37 Kb, 7 times smaller)
+#if defined(CONFIG_EPD_DISPLAY_TYPE_ED047TC2)
+  #include "waveforms/epdiy_ED047TC2.h"
+#endif
 #include "waveforms/epdiy_ED060SC4.h"
 #include "waveforms/epdiy_ED060XC3.h"
 #include "waveforms/epdiy_ED060SCT.h"

diff --git a/src/epd_driver/include/epd_internals.h b/src/epd_driver/include/epd_internals.h
@@ -46,7 +46,7 @@
 #define EPD_WIDTH 1024
 /// Height of the display area in pixels.
 #define EPD_HEIGHT 758
-#elif defined(CONFIG_EPD_DISPLAY_TYPE_ED047TC1)
+#elif defined(CONFIG_EPD_DISPLAY_TYPE_ED047TC1) || defined(CONFIG_EPD_DISPLAY_TYPE_ED047TC2)
 /// Width of the display area in pixels.
 #define EPD_WIDTH 960
 /// Height of the display area in pixels.
@@ -90,13 +90,18 @@ typedef struct {
 extern const EpdWaveform epdiy_ED060SC4;
 extern const EpdWaveform epdiy_ED097OC4;
 extern const EpdWaveform epdiy_ED047TC1;
+#if defined(CONFIG_EPD_DISPLAY_TYPE_ED047TC2)
+  extern const EpdWaveform epdiy_ED047TC2;
+#endif
 extern const EpdWaveform epdiy_ED097TC2;
 extern const EpdWaveform epdiy_ED060XC3;
 extern const EpdWaveform epdiy_ED060SCT;
 extern const EpdWaveform epdiy_ED133UT2;
 
 #if defined(CONFIG_EPD_DISPLAY_TYPE_ED047TC1)
 #define EPD_BUILTIN_WAVEFORM &epdiy_ED047TC1
+#elif defined(CONFIG_EPD_DISPLAY_TYPE_ED047TC2)
+#define EPD_BUILTIN_WAVEFORM &epdiy_ED047TC2
 #elif defined(CONFIG_EPD_DISPLAY_TYPE_ED060SC4)
 #define EPD_BUILTIN_WAVEFORM &epdiy_ED060SC4
 #elif defined(CONFIG_EPD_DISPLAY_TYPE_ED060XC3)

diff --git a/src/epd_driver/waveforms/epdiy_ED047TC1.h b/src/epd_driver/waveforms/epdiy_ED047TC1.h
diff --git a/src/epd_driver/waveforms/epdiy_ED047TC2.h b/src/epd_driver/waveforms/epdiy_ED047TC2.h