Add: Waveshare Electronics 7" ESP32-S3 Touch Screen Support

CMakeLists.txt

@@ -20,10 +20,14 @@
 
 # WHOLE_ARCHIVE option is supported only with esp-idf 5.x
 # A link option will be used with esp-idf 4.x
-if (IDF_VERSION_MAJOR GREATER_EQUAL 5)
+if (IDF_VERSION_MAJOR GREATER_EQUAL 5 AND IDF_TARGET STREQUAL "esp32s3")
     set(OPTIONAL_WHOLE_ARCHIVE WHOLE_ARCHIVE)
+    set(OPTIONAL_ESP_LCD_REQUIRES "esp_lcd")
+    set(OPTIONAL_RGB_LCD_SRCS "rgb_lcd_display_driver.c")
 else()
     set(OPTIONAL_WHOLE_ARCHIVE "")
+    set(OPTIONAL_ESP_LCD_REQUIRES "")
+    set(OPTIONAL_RGB_LCD_SRCS "")
 endif()
 
 idf_component_register(SRCS
@@ -44,14 +48,15 @@ idf_component_register(SRCS
     "memory_display_driver.c"
     "oled_commands.c"
     "oled_display_driver.c"
+    ${OPTIONAL_RGB_LCD_SRCS}
     "spi_dc_driver.c"
     "spi_display.c"
     "ufontlib.c"
     "backlight_gpio.c"
     "image_helpers.c"
     "spng.c"
     "miniz.c"
-    PRIV_REQUIRES "libatomvm" "avm_sys" "avm_builtins" "driver" "sdmmc" "vfs" "fatfs"
+    PRIV_REQUIRES "libatomvm" "avm_sys" "avm_builtins" "driver" ${OPTIONAL_ESP_LCD_REQUIRES} "sdmmc" "vfs" "fatfs"
     ${OPTIONAL_WHOLE_ARCHIVE}
 )
 

README.Md

@@ -88,6 +88,8 @@ software dithering
 * `sharp,memory-lcd`: Sharp Memory LCDs - 400x240, 1-bit monochrome
 * `solomon-systech,ssd1306`: Solomon Systech SSD1306 - 128x64, 1-bit monochrome
 * `sino-wealth,sh1106`: Sino Wealth SH1106 - 128x64, 1-bit monochrome
+* `esp_lcd,rgb` / `waveshare,esp32-s3-touch-lcd-7`: RGB LCD panels using the ESP32-S3 LCD peripheral,
+requires ESP-IDF 5 or later, 16-bit colors (RGB565)
 
 [SDL Linux display](sdl_display/) is also supported and can be built as an AtomVM plugin.
 

dcs_lcd_color.h

@@ -44,17 +44,29 @@ static inline uint8_t rgba8888_get_alpha(uint32_t color)
 static inline uint16_t rgba8888_color_to_rgb565(uint32_t color)
 {
     uint8_t r = color >> 24;
-    uint8_t g = (color >> 16) & 0xFF;
-    uint8_t b = (color >> 8) & 0xFF;
+    uint8_t g = color >> 16;
+    uint8_t b = color >> 8;
 
     return (((uint16_t) (r >> 3)) << 11) | (((uint16_t) (g >> 2)) << 5) | ((uint16_t) b >> 3);
 }
 
+static inline uint16_t display_color_to_rgb565(uint32_t color)
+{
+    return rgba8888_color_to_rgb565(color);
+}
+
 static inline uint16_t rgb565_color_to_surface(uint16_t color16)
 {
     return (uint16_t) SPI_SWAP_DATA_TX(color16, 16);
 }
 
+static inline uint16_t display_color_to_surface(uint32_t color)
+{
+    uint16_t color16 = display_color_to_rgb565(color);
+
+    return rgb565_color_to_surface(color16);
+}
+
 static inline uint16_t uint32_color_to_surface(uint32_t color)
 {
     uint16_t color16 = rgba8888_color_to_rgb565(color);