4444// #define MAKERFABS_TFT_TOUCH_3_5
4545// #define MAKERFABS_ESP32_S3_TFT_4_0
4646// #define MAKERFABS_ESP32_S3_TFT_4_3_v1_3
47- // #define WT32_SC01
4847// #define XIAO_SAMD21_ROUND_DISPLAY
4948// #define XIAO_ESP32C3_ROUND_DISPLAY
5049// #define XIAO_ESP32S3_ROUND_DISPLAY
50+ // #define WAVESHARE_ESP32_C6_LCD_1_47
51+ // #define WAVESHARE_ESP32_C6_LCD_1_9
5152// #define WAVESHARE_ESP32_S3_LCD_1_3
5253// #define WAVESHARE_ESP32_S3_LCD_1_3_PRISM
5354// #define WAVESHARE_ESP32_S3_LCD_1_46
5455// #define WAVESHARE_ESP32_S3_LCD_2_8
56+ // #define WAVESHARE_ESP32_S3_TOUCH_AMOLED_1_64
5557// #define WAVESHARE_ESP32_S3_TOUCH_AMOLED_2_41
56- // #define WAVESHARE_ESP32_C6_LCD_1_47
57- // #define WAVESHARE_ESP32_C6_LCD_1_9
5858// #define WAVESHARE_RP2040_LCD_0_96
5959// #define WAVESHARE_RP2040_LCD_1_28 // Waveshare RP2040-LCD-1.28 or RP2350-LCD-1.28
60+ // #define WT32_SC01
6061// #define WZ8048C050 // or called "Elecrow Wizee-ESP32"
6162// #define ZX2D10GE10R_V4848
6263// #define ZX3D50CE02S // or called "WT32-SC01 PLUS"
@@ -708,27 +709,26 @@ Arduino_ESP32RGBPanel *rgbpanel = new Arduino_ESP32RGBPanel(
708709Arduino_RGB_Display * gfx = new Arduino_RGB_Display (
709710 800 /* width */ , 480 /* height */ , rgbpanel , 0 /* rotation */ , true /* auto_flush */ );
710711
711- #elif defined(WT32_SC01 )
712- #define GFX_DEV_DEVICE WT32_SC01
713- #define GFX_BL 23
714- Arduino_DataBus * bus = new Arduino_ESP32SPI (21 /* DC */ , 15 /* CS */ , 14 /* SCK */ , 13 /* MOSI */ , GFX_NOT_DEFINED /* MISO */ );
715- Arduino_GFX * gfx = new Arduino_ST7796 (bus , 22 /* RST */ , 3 /* rotation */ );
712+ #elif defined(WAVESHARE_ESP32_C6_LCD_1_47 )
713+ #define GFX_DEV_DEVICE WAVESHARE_ESP32_C6_LCD_1_47
714+ #define DEV_DEVICE_INIT () \
715+ { \
716+ pinMode(4 /* SD_CS */ , OUTPUT ); \
717+ digitalWrite(4 /* SD_CS */ , HIGH ); \
718+ }
719+ #define GFX_BL 22
720+ Arduino_DataBus * bus = new Arduino_HWSPI (15 /* DC */ , 14 /* CS */ , 7 /* SCK */ , 6 /* MOSI */ , 5 /* MISO */ );
721+ Arduino_GFX * gfx = new Arduino_ST7789 (bus , 21 /* RST */ , 0 /* rotation */ , true /* IPS */ , 172 /* width */ , 320 /* height */ , 34 /* col offset 1 */ , 0 /* row offset 1 */ , 34 /* col offset 2 */ , 0 /* row offset 2 */ );
716722
717- #elif defined(WZ8048C050 )
718- #define GFX_DEV_DEVICE WZ8048C050
719- #define GFX_BL 2
720- #define RGB_PANEL
721- Arduino_ESP32RGBPanel * rgbpanel = new Arduino_ESP32RGBPanel (
722- 40 /* DE */ , 41 /* VSYNC */ , 39 /* HSYNC */ , 0 /* PCLK */ ,
723- 45 /* R0 */ , 48 /* R1 */ , 47 /* R2 */ , 21 /* R3 */ , 14 /* R4 */ ,
724- 5 /* G0 */ , 6 /* G1 */ , 7 /* G2 */ , 15 /* G3 */ , 16 /* G4 */ , 4 /* G5 */ ,
725- 8 /* B0 */ , 3 /* B1 */ , 46 /* B2 */ , 9 /* B3 */ , 1 /* B4 */ ,
726- 0 /* hsync_polarity */ , 8 /* hsync_front_porch */ , 4 /* hsync_pulse_width */ , 43 /* hsync_back_porch */ ,
727- 0 /* vsync_polarity */ , 8 /* vsync_front_porch */ , 4 /* vsync_pulse_width */ , 12 /* vsync_back_porch */ ,
728- 1 /* pclk_active_neg */ , 16000000 /* prefer_speed */ , false /* useBigEndian */ ,
729- 0 /* de_idle_high */ , 0 /* pclk_idle_high */ , 0 /* bounce_buffer_size_px */ );
730- Arduino_RGB_Display * gfx = new Arduino_RGB_Display (
731- 800 /* width */ , 480 /* height */ , rgbpanel , 0 /* rotation */ , true /* auto_flush */ );
723+ #elif defined(WAVESHARE_ESP32_C6_LCD_1_9 )
724+ #define GFX_DEV_DEVICE WAVESHARE_ESP32_C6_LCD_1_9
725+ #define DEV_DEVICE_INIT () \
726+ { \
727+ pinMode(15 /* LCD_BL */ , OUTPUT ); \
728+ digitalWrite(15 /* LCD_BL */ , LOW ); \
729+ }
730+ Arduino_DataBus * bus = new Arduino_HWSPI (6 /* DC */ , 7 /* CS */ , 5 /* SCK */ , 4 /* MOSI */ , 19 /* MISO */ );
731+ Arduino_GFX * gfx = new Arduino_ST7789 (bus , 14 /* RST */ , 0 /* rotation */ , true /* IPS */ , 170 /* width */ , 320 /* height */ , 35 /* col offset 1 */ , 0 /* row offset 1 */ , 35 /* col offset 2 */ , 0 /* row offset 2 */ );
732732
733733#elif defined(WAVESHARE_ESP32_S3_LCD_1_3 )
734734#define GFX_DEV_DEVICE WAVESHARE_ESP32_S3_LCD_1_3
@@ -757,6 +757,15 @@ Arduino_Canvas *gfx = new Arduino_Canvas(412 /* width */, 412 /* height */, g, 0
757757Arduino_DataBus * bus = new Arduino_HWSPI (41 /* DC */ , 42 /* CS */ , 40 /* SCK */ , 45 /* MOSI */ , 46 /* MISO */ );
758758Arduino_GFX * gfx = new Arduino_ST7789 (bus , 39 /* RST */ , 0 /* rotation */ , true /* IPS */ );
759759
760+ #elif defined(WAVESHARE_ESP32_S3_TOUCH_AMOLED_1_64 )
761+ #define GFX_DEV_DEVICE WAVESHARE_ESP32_S3_TOUCH_AMOLED_1_64
762+ Arduino_DataBus * bus = new Arduino_ESP32QSPI (
763+ 9 /* CS */ , 10 /* SCK */ , 11 /* D0 */ , 12 /* D1 */ , 13 /* D2 */ , 14 /* D3 */ );
764+ Arduino_GFX * g = new Arduino_CO5300 (bus , 21 /* RST */ , 0 /* rotation */ , false /* IPS */ , 280 , 456 ,
765+ 20 /* col offset 1 */ , 0 /* row offset 1 */ , 180 /* col_offset2 */ , 24 /* row_offset2 */ );
766+ #define CANVAS
767+ Arduino_Canvas * gfx = new Arduino_Canvas (280 /* width */ , 456 /* height */ , g , 0 /* output_x */ , 0 /* output_y */ , 0 /* rotation */ );
768+
760769#elif defined(WAVESHARE_ESP32_S3_TOUCH_AMOLED_2_41 )
761770#define GFX_DEV_DEVICE WAVESHARE_ESP32_S3_TOUCH_AMOLED_2_41
762771#define DEV_DEVICE_INIT () \
@@ -770,27 +779,6 @@ Arduino_GFX *g = new Arduino_RM690B0(bus, 21 /* RST */, 0 /* rotation */, 450 /*
770779#define CANVAS
771780Arduino_Canvas * gfx = new Arduino_Canvas (450 /* width */ , 600 /* height */ , g );
772781
773- #elif defined(WAVESHARE_ESP32_C6_LCD_1_47 )
774- #define GFX_DEV_DEVICE WAVESHARE_ESP32_C6_LCD_1_47
775- #define DEV_DEVICE_INIT () \
776- { \
777- pinMode(4 /* SD_CS */ , OUTPUT ); \
778- digitalWrite(4 /* SD_CS */ , HIGH ); \
779- }
780- #define GFX_BL 22
781- Arduino_DataBus * bus = new Arduino_HWSPI (15 /* DC */ , 14 /* CS */ , 7 /* SCK */ , 6 /* MOSI */ , 5 /* MISO */ );
782- Arduino_GFX * gfx = new Arduino_ST7789 (bus , 21 /* RST */ , 0 /* rotation */ , true /* IPS */ , 172 /* width */ , 320 /* height */ , 34 /* col offset 1 */ , 0 /* row offset 1 */ , 34 /* col offset 2 */ , 0 /* row offset 2 */ );
783-
784- #elif defined(WAVESHARE_ESP32_C6_LCD_1_9 )
785- #define GFX_DEV_DEVICE WAVESHARE_ESP32_C6_LCD_1_9
786- #define DEV_DEVICE_INIT () \
787- { \
788- pinMode(15 /* LCD_BL */ , OUTPUT ); \
789- digitalWrite(15 /* LCD_BL */ , LOW ); \
790- }
791- Arduino_DataBus * bus = new Arduino_HWSPI (6 /* DC */ , 7 /* CS */ , 5 /* SCK */ , 4 /* MOSI */ , 19 /* MISO */ );
792- Arduino_GFX * gfx = new Arduino_ST7789 (bus , 14 /* RST */ , 0 /* rotation */ , true /* IPS */ , 170 /* width */ , 320 /* height */ , 35 /* col offset 1 */ , 0 /* row offset 1 */ , 35 /* col offset 2 */ , 0 /* row offset 2 */ );
793-
794782#elif defined(WAVESHARE_RP2040_LCD_0_96 )
795783#define GFX_DEV_DEVICE WAVESHARE_RP2040_LCD_0_96
796784#define GFX_BL 25
@@ -803,6 +791,28 @@ Arduino_GFX *gfx = new Arduino_ST7735(bus, 12 /* RST */, 0 /* rotation */, true
803791Arduino_DataBus * bus = new Arduino_RPiPicoSPI (8 /* DC */ , 9 /* CS */ , 10 /* SCK */ , 11 /* MOSI */ , GFX_NOT_DEFINED /* MISO */ , spi1 /* spi */ );
804792Arduino_GFX * gfx = new Arduino_GC9A01 (bus , 12 /* RST */ , 0 /* rotation */ , true /* IPS */ );
805793
794+ #elif defined(WT32_SC01 )
795+ #define GFX_DEV_DEVICE WT32_SC01
796+ #define GFX_BL 23
797+ Arduino_DataBus * bus = new Arduino_ESP32SPI (21 /* DC */ , 15 /* CS */ , 14 /* SCK */ , 13 /* MOSI */ , GFX_NOT_DEFINED /* MISO */ );
798+ Arduino_GFX * gfx = new Arduino_ST7796 (bus , 22 /* RST */ , 3 /* rotation */ );
799+
800+ #elif defined(WZ8048C050 )
801+ #define GFX_DEV_DEVICE WZ8048C050
802+ #define GFX_BL 2
803+ #define RGB_PANEL
804+ Arduino_ESP32RGBPanel * rgbpanel = new Arduino_ESP32RGBPanel (
805+ 40 /* DE */ , 41 /* VSYNC */ , 39 /* HSYNC */ , 0 /* PCLK */ ,
806+ 45 /* R0 */ , 48 /* R1 */ , 47 /* R2 */ , 21 /* R3 */ , 14 /* R4 */ ,
807+ 5 /* G0 */ , 6 /* G1 */ , 7 /* G2 */ , 15 /* G3 */ , 16 /* G4 */ , 4 /* G5 */ ,
808+ 8 /* B0 */ , 3 /* B1 */ , 46 /* B2 */ , 9 /* B3 */ , 1 /* B4 */ ,
809+ 0 /* hsync_polarity */ , 8 /* hsync_front_porch */ , 4 /* hsync_pulse_width */ , 43 /* hsync_back_porch */ ,
810+ 0 /* vsync_polarity */ , 8 /* vsync_front_porch */ , 4 /* vsync_pulse_width */ , 12 /* vsync_back_porch */ ,
811+ 1 /* pclk_active_neg */ , 16000000 /* prefer_speed */ , false /* useBigEndian */ ,
812+ 0 /* de_idle_high */ , 0 /* pclk_idle_high */ , 0 /* bounce_buffer_size_px */ );
813+ Arduino_RGB_Display * gfx = new Arduino_RGB_Display (
814+ 800 /* width */ , 480 /* height */ , rgbpanel , 0 /* rotation */ , true /* auto_flush */ );
815+
806816#elif defined(XIAO_SAMD21_ROUND_DISPLAY )
807817#define GFX_DEV_DEVICE XIAO_SAMD21_ROUND_DISPLAY
808818Arduino_DataBus * bus = new Arduino_HWSPI (3 /* DC */ , 1 /* CS */ );
0 commit comments