Merge branch 'feature/add_ssd1963_screen' into 'master'

display: add ssd1963 ili9488 driver See merge request rd/esp-iot-solution!506
lzujian · Jun 11, 2021 · bd0702d · bd0702d
2 parents d03696c + 0f47c1d
commit bd0702d
Show file tree

Hide file tree

Showing 11 changed files with 1,065 additions and 2 deletions.
diff --git a/components/display/screen/CMakeLists.txt b/components/display/screen/CMakeLists.txt
@@ -5,11 +5,13 @@ set(SCREEN_DIR "controller_driver/ili9341"
             "controller_driver/nt35510"
             "controller_driver/ili9806"
             "controller_driver/ili9486"
+            "controller_driver/ili9488"
             "controller_driver/ssd1351"
             "controller_driver/rm68120"
             "controller_driver/ssd1306"
             "controller_driver/ssd1307"
             "controller_driver/ssd1322"
+            "controller_driver/ssd1963"
             )
 
 idf_component_register(SRC_DIRS "${SCREEN_DIR}" "screen_utility" "interface_driver" "."

diff --git a/components/display/screen/Kconfig b/components/display/screen/Kconfig
@@ -10,6 +10,9 @@ menu "LCD Drivers"
         config LCD_DRIVER_SCREEN_CONTROLLER_ILI9806
             bool "ILI9806"
             default n
+        config LCD_DRIVER_SCREEN_CONTROLLER_ILI9488
+            bool "ILI9488"
+            default n
         config LCD_DRIVER_SCREEN_CONTROLLER_NT35510
             bool "NT35510"
             default n
@@ -19,6 +22,9 @@ menu "LCD Drivers"
         config LCD_DRIVER_SCREEN_CONTROLLER_SSD1351
             bool "SSD1351"
             default n
+        config LCD_DRIVER_SCREEN_CONTROLLER_SSD1963
+            bool "SSD1963"
+            default n
         config LCD_DRIVER_SCREEN_CONTROLLER_ST7789
             bool "ST7789"
             default n

diff --git a/components/display/screen/component.mk b/components/display/screen/component.mk
@@ -10,11 +10,13 @@ SCREEN_DIR = controller_driver/ili9341 \
             controller_driver/nt35510 \
             controller_driver/ili9806 \
             controller_driver/ili9486 \
+            controller_driver/ili9488 \
             controller_driver/ssd1351 \
             controller_driver/rm68120 \
             controller_driver/ssd1306 \
             controller_driver/ssd1307 \
-            controller_driver/ssd1322
+            controller_driver/ssd1322 \
+            controller_driver/ssd1963
 
 COMPONENT_ADD_INCLUDEDIRS := . iface_driver $(SCREEN_DIR) screen_utility
 COMPONENT_SRCDIRS := . iface_driver $(SCREEN_DIR) screen_utility