add ED060SCT display

vroland · Mar 27, 2021 · 4de1b51 · 4de1b51
1 parent 0c51175
commit 4de1b51
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 # Rules for generating waveform and font headers from raw data.
 
-SUPPORTRED_DISPLAYS := ED060SC4 ED097OC4 ED097TC2 ED047TC1 ED133UT2 ED060XC3
+SUPPORTRED_DISPLAYS := ED060SC4 ED097OC4 ED097TC2 ED047TC1 ED133UT2 ED060XC3 ED060SCT
 
 # Generate 16 grascale update waveforms + epdiy special waveforms
 EXPORTED_MODES ?= 1,2,5,16,17

diff --git a/scripts/epdiy_waveform_gen.py b/scripts/epdiy_waveform_gen.py
@@ -15,6 +15,7 @@
     "ED060XC3": [5.0, 4.0, 3.0, 3.0, 3.0, 3.0, 4.0, 4.0, 4.0, 5.0, 5.0, 5.0, 10.0, 20.0, 120.0],
     "ED047TC1": [3.0, 3.0, 2.0, 2.0, 3.0, 3.0, 3.0, 4.0, 4.0, 5.0, 5.0, 5.0, 10.0, 20.0, 30.0],
     "ED097TC2": [1.5, .8, .8, .8, .8, .8, 1.0, 1.0, 1.0, 1.0, 2.0, 2.0, 5.0, 10.0, 20.0],
+    "ED060SCT": [1.5, .8, .8, .8, .8, .8, 1.0, 1.0, 1.0, 1.0, 2.0, 2.0, 5.0, 10.0, 20.0],
     "ED133UT2": [6.0, 3.0, 2.0, 2.0, 2.0, 2.0, 2.0, 3.0, 3.0, 3.0, 5.0, 5.0, 10.0, 20.0, 30.0],
 }
 
@@ -26,6 +27,7 @@
     "ED060XC3": [1.0, 1.0, .5, .5, .5, .5, .5, .5, .5, 1.0, 1.0, 2.0, 2.0, 10.0, 30.0],
     "ED047TC1": [1.0, 1.0, .8, .8, .8, .8, .8, 1.0, 1.0, 1.5, 1.5, 2.0, 2.0, 10.0, 30.0],
     "ED097TC2": [1.5, .8, .4, .3, .3, .3, .3, .6, .6, .6, .6, 1.5, 2.0, 5.0, 15.0],
+    "ED060SCT": [1.5, .8, .4, .3, .3, .3, .3, .6, .6, .6, .6, 1.5, 2.0, 5.0, 15.0],
     "ED133UT2": [2.0, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 2.0, 3.0, 3.0, 5.0, 10.0, 20.0]
 }
 
@@ -36,6 +38,7 @@
     "ED060XC3": [100, 100, 100, 100],
     "ED047TC1": [100, 100, 100, 100, 100],
     "ED097TC2": [100, 100, 100, 100, 100],
+    "ED060SCT": [100, 100, 100, 100, 100],
     "ED133UT2": [100, 100, 100, 100]
 }
 

diff --git a/src/epd_driver/Kconfig b/src/epd_driver/Kconfig
@@ -14,6 +14,9 @@ menu "E-Paper Driver"
         config EPD_DISPLAY_TYPE_ED060XC3
             bool "ED060XC3"
 
+		config EPD_DISPLAY_TYPE_ED060SCT
+            bool "ED060SCT"
+
         config EPD_DISPLAY_TYPE_ED097TC2
             bool "ED097TC2"
 

diff --git a/src/epd_driver/builtin_waveforms.c b/src/epd_driver/builtin_waveforms.c
@@ -4,6 +4,7 @@
 #include "waveforms/epdiy_ED047TC1.h"
 #include "waveforms/epdiy_ED060SC4.h"
 #include "waveforms/epdiy_ED060XC3.h"
+#include "waveforms/epdiy_ED060SCT.h"
 #include "waveforms/epdiy_ED097OC4.h"
 #include "waveforms/epdiy_ED097TC2.h"
 #include "waveforms/epdiy_ED133UT2.h"
diff --git a/src/epd_driver/include/epd_internals.h b/src/epd_driver/include/epd_internals.h
@@ -36,6 +36,11 @@
 #define EPD_WIDTH 800
 /// Height of the display area in pixels.
 #define EPD_HEIGHT 600
+#elif defined(CONFIG_EPD_DISPLAY_TYPE_ED060SCT)
+/// Width of the display area in pixels.
+#define EPD_WIDTH 800
+/// Height of the display area in pixels.
+#define EPD_HEIGHT 600
 #elif defined(CONFIG_EPD_DISPLAY_TYPE_ED060XC3)
 /// Width of the display area in pixels.
 #define EPD_WIDTH 1024
@@ -87,6 +92,7 @@ extern const EpdWaveform epdiy_ED097OC4;
 extern const EpdWaveform epdiy_ED047TC1;
 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)
@@ -95,6 +101,8 @@ extern const EpdWaveform epdiy_ED133UT2;
 #define EPD_BUILTIN_WAVEFORM &epdiy_ED060SC4
 #elif defined(CONFIG_EPD_DISPLAY_TYPE_ED060XC3)
 #define EPD_BUILTIN_WAVEFORM &epdiy_ED060XC3
+#elif defined(CONFIG_EPD_DISPLAY_TYPE_ED060SCT)
+#define EPD_BUILTIN_WAVEFORM &epdiy_ED060SCT
 #elif defined(CONFIG_EPD_DISPLAY_TYPE_ED097OC4) || defined(CONFIG_EPD_DISPLAY_TYPE_ED097OC4_LQ)
 #define EPD_BUILTIN_WAVEFORM &epdiy_ED097OC4
 #elif defined(CONFIG_EPD_DISPLAY_TYPE_ED097TC2)

diff --git a/src/epd_driver/waveforms/epdiy_ED060SCT.h b/src/epd_driver/waveforms/epdiy_ED060SCT.h