Skip to content

Commit 1169a4a

Browse files
mathertelmathertel
authored
Merge branch 'moononournation:master' into master
2 parents 5377fa2 + e71519b commit 1169a4a

File tree

5 files changed

+123
-77
lines changed

5 files changed

+123
-77
lines changed

‎README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,11 @@ ESP32LCD8, ESP32LCD16 and ESP32RGBPanel only supported by arduino-esp32 v2.x and
353353
* [Makerfabs ESP32-S3 TFT 4.3" v1.3](https://www.makerfabs.com/esp32-s3-parallel-tft-with-touch-4-3-inch.html) [[demo video](https://youtu.be/oQ57L2gTHoo)]
354354
* [Odroid Go](https://www.hardkernel.com/shop/odroid-go/)
355355
* [seeed studio Wio Terminal](https://wiki.seeedstudio.com/Wio-Terminal-Getting-Started/)
356-
* [Waveshare RP2040-LCD-1.28](https://www.waveshare.com/wiki/RP2040-LCD-1.28)
356+
* [Waveshare RP2040-LCD-0.96](https://www.waveshare.com/rp2040-lcd-0.96.htm?&aff_id=107987)
357+
* [Waveshare RP2040-LCD-1.28](https://www.waveshare.com/rp2040-lcd-1.28.htm?&aff_id=107987)
358+
* [Waveshare RP2350-LCD-0.96](https://www.waveshare.com/rp2350-lcd-0.96.htm?&aff_id=107987)
359+
* [Waveshare ESP32-C6-LCD-1.47](https://www.waveshare.com/esp32-c6-lcd-1.47.htm?&aff_id=107987)
360+
* [Waveshare ESP32-S3-Touch-LCD-2.8](https://www.waveshare.com/esp32-s3-touch-lcd-2.8.htm?&aff_id=107987)
357361
* [wireless-tag WT-32-SC01](http://www.wireless-tag.com/portfolio/wt32-sc01/)
358362
* [Elecrow ESP Terminal with 3.5" parallel RGB display DLC35010R](https://www.elecrow.com/esp-terminal-with-esp32-3-5-inch-parallel-480x320-tft-capacitive-touch-display-rgb-by-chip-ili9488.html) [[demo video](https://youtu.be/QRDVuwayNFw)]
359363
* [Elecrow Wizee-ESP32 WZ8048C050](https://www.elecrow.com/esp32-display-5-inch-hmi-display-rgb-tft-lcd-touch-screen-support-lvgl.html)

‎examples/PDQgraphicstest/Arduino_GFX_dev_device.h

Lines changed: 101 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,10 @@
4848
// #define XIAO_ESP32C3_ROUND_DISPLAY
4949
// #define XIAO_ESP32S3_ROUND_DISPLAY
5050
// #define WAVESHARE_ESP32_S3_LCD_2_8
51+
// #define WAVESHARE_ESP32_S3_TOUCH_AMOLED_2_41
5152
// #define WAVESHARE_ESP32_C6_LCD_1_47
5253
// #define WAVESHARE_RP2040_LCD_0_96
54+
// #define WAVESHARE_RP2040_LCD_1_28 // Waveshare RP2040-LCD-1.28 or RP2350-LCD-1.28
5355
// #define WZ8048C050 // or called "Elecrow Wizee-ESP32"
5456
// #define ZX2D10GE10R_V4848
5557
// #define ZX3D50CE02S // or called "WT32-SC01 PLUS"
@@ -62,21 +64,21 @@
6264
#include <Wire.h>
6365
#include <Adafruit_AW9523.h>
6466
Adafruit_AW9523 aw;
65-
#define DEV_DEVICE_INIT() \
66-
{ \
67-
Wire.begin(6 /* SDA */, 5 /* SCL */); \
68-
aw.begin(0x59); \
69-
aw.pinMode(8, OUTPUT); /* LCD_LEDK */ \
70-
aw.pinMode(9, OUTPUT); /* LCD_LEDK */ \
71-
aw.pinMode(10, OUTPUT); /* LCD_LEDK */ \
72-
aw.pinMode(11, OUTPUT); /* LCD_LEDK */ \
73-
aw.pinMode(14, OUTPUT); /* LCD_RST */ \
74-
aw.digitalWrite(8, LOW); /* LCD_LEDK */ \
75-
aw.digitalWrite(9, LOW); /* LCD_LEDK */ \
76-
aw.digitalWrite(10, LOW); /* LCD_LEDK */ \
77-
aw.digitalWrite(11, LOW); /* LCD_LEDK */ \
78-
aw.digitalWrite(14, HIGH); /* LCD_RST */ \
79-
}
67+
#define DEV_DEVICE_INIT() \
68+
{ \
69+
Wire.begin(6 /* SDA */, 5 /* SCL */); \
70+
aw.begin(0x59); \
71+
aw.pinMode(8, OUTPUT); /* LCD_LEDK */ \
72+
aw.pinMode(9, OUTPUT); /* LCD_LEDK */ \
73+
aw.pinMode(10, OUTPUT); /* LCD_LEDK */ \
74+
aw.pinMode(11, OUTPUT); /* LCD_LEDK */ \
75+
aw.pinMode(14, OUTPUT); /* LCD_RST */ \
76+
aw.digitalWrite(8, LOW); /* LCD_LEDK */ \
77+
aw.digitalWrite(9, LOW); /* LCD_LEDK */ \
78+
aw.digitalWrite(10, LOW); /* LCD_LEDK */ \
79+
aw.digitalWrite(11, LOW); /* LCD_LEDK */ \
80+
aw.digitalWrite(14, HIGH); /* LCD_RST */ \
81+
}
8082
Arduino_DataBus *bus = new Arduino_ESP32LCD8(
8183
45 /* DC */, GFX_NOT_DEFINED /* CS */, 10 /* WR */, GFX_NOT_DEFINED /* RD */,
8284
9 /* D0 */, 4 /* D1 */, 3 /* D2 */, 8 /* D3 */, 18 /* D4 */, 17 /* D5 */, 16 /* D6 */, 15 /* D7 */);
@@ -296,13 +298,13 @@ Arduino_GFX *gfx = new Arduino_ILI9342(bus, GFX_NOT_DEFINED /* RST */, 0 /* rota
296298

297299
#elif defined(ESP32_S3_EYE)
298300
#define GFX_DEV_DEVICE ESP32_S3_EYE
299-
#define DEV_DEVICE_INIT() \
300-
{ \
301-
pinMode(3 /* camera indicator */, OUTPUT); \
302-
digitalWrite(3 /* camera indicator */, LOW); \
303-
pinMode(48 /* BACKLIGHT */, OUTPUT); \
304-
digitalWrite(48 /* BACKLIGHT */, LOW); \
305-
}
301+
#define DEV_DEVICE_INIT() \
302+
{ \
303+
pinMode(3 /* camera indicator */, OUTPUT); \
304+
digitalWrite(3 /* camera indicator */, LOW); \
305+
pinMode(48 /* BACKLIGHT */, OUTPUT); \
306+
digitalWrite(48 /* BACKLIGHT */, LOW); \
307+
}
306308
Arduino_DataBus *bus = new Arduino_ESP32SPI(43 /* DC */, 44 /* CS */, 21 /* SCK */, 47 /* MOSI */, GFX_NOT_DEFINED /* MISO */);
307309
Arduino_GFX *gfx = new Arduino_ST7789(bus, GFX_NOT_DEFINED /* RST */, 0 /* rotation */, true /* IPS */, 240 /* width */, 240 /* height */, 0 /* col offset 1 */, 0 /* row offset 1 */, 0 /* col offset 2 */, 80 /* row offset 2 */);
308310

@@ -469,36 +471,36 @@ Arduino_GFX *gfx = new Arduino_ST77916(bus, 47 /* RST */, 0 /* rotation */, true
469471

470472
#elif defined(LILYGO_T_DECK)
471473
#define GFX_DEV_DEVICE LILYGO_T_DECK
472-
#define DEV_DEVICE_INIT() \
473-
{ \
474-
pinMode(9 /* TDECK_RADIO_CS */, OUTPUT); \
475-
digitalWrite(9 /* TDECK_RADIO_CS */, HIGH); \
476-
pinMode(12 /* TDECK_LCD_CS */, OUTPUT); \
477-
digitalWrite(12 /* TDECK_LCD_CS */, HIGH); \
478-
pinMode(39 /* TDECK_SDCARD_CS */, OUTPUT); \
479-
digitalWrite(39 /* TDECK_SDCARD_CS */, HIGH); \
480-
pinMode(10 /* TDECK_PERI_POWERON */, OUTPUT); \
481-
digitalWrite(10 /* TDECK_PERI_POWERON */, HIGH); \
482-
delay(500); \
483-
}
474+
#define DEV_DEVICE_INIT() \
475+
{ \
476+
pinMode(9 /* TDECK_RADIO_CS */, OUTPUT); \
477+
digitalWrite(9 /* TDECK_RADIO_CS */, HIGH); \
478+
pinMode(12 /* TDECK_LCD_CS */, OUTPUT); \
479+
digitalWrite(12 /* TDECK_LCD_CS */, HIGH); \
480+
pinMode(39 /* TDECK_SDCARD_CS */, OUTPUT); \
481+
digitalWrite(39 /* TDECK_SDCARD_CS */, HIGH); \
482+
pinMode(10 /* TDECK_PERI_POWERON */, OUTPUT); \
483+
digitalWrite(10 /* TDECK_PERI_POWERON */, HIGH); \
484+
delay(500); \
485+
}
484486
#define GFX_BL 42
485487
Arduino_DataBus *bus = new Arduino_HWSPI(11 /* DC */, 12 /* CS */, 40 /* SCK */, 41 /* MOSI */, 38 /* MISO */);
486488
Arduino_GFX *gfx = new Arduino_ST7789(bus, GFX_NOT_DEFINED /* RST */, 1 /* rotation */, false /* IPS */);
487489

488490
#elif defined(LILYGO_T_DECK_PLUS)
489491
#define GFX_DEV_DEVICE LILYGO_T_DECK_PLUS
490-
#define DEV_DEVICE_INIT() \
491-
{ \
492-
pinMode(9 /* TDECK_RADIO_CS */, OUTPUT); \
493-
digitalWrite(9 /* TDECK_RADIO_CS */, HIGH); \
494-
pinMode(12 /* TDECK_LCD_CS */, OUTPUT); \
495-
digitalWrite(12 /* TDECK_LCD_CS */, HIGH); \
496-
pinMode(39 /* TDECK_SDCARD_CS */, OUTPUT); \
497-
digitalWrite(39 /* TDECK_SDCARD_CS */, HIGH); \
498-
pinMode(10 /* TDECK_PERI_POWERON */, OUTPUT); \
499-
digitalWrite(10 /* TDECK_PERI_POWERON */, HIGH); \
500-
delay(500); \
501-
}
492+
#define DEV_DEVICE_INIT() \
493+
{ \
494+
pinMode(9 /* TDECK_RADIO_CS */, OUTPUT); \
495+
digitalWrite(9 /* TDECK_RADIO_CS */, HIGH); \
496+
pinMode(12 /* TDECK_LCD_CS */, OUTPUT); \
497+
digitalWrite(12 /* TDECK_LCD_CS */, HIGH); \
498+
pinMode(39 /* TDECK_SDCARD_CS */, OUTPUT); \
499+
digitalWrite(39 /* TDECK_SDCARD_CS */, HIGH); \
500+
pinMode(10 /* TDECK_PERI_POWERON */, OUTPUT); \
501+
digitalWrite(10 /* TDECK_PERI_POWERON */, HIGH); \
502+
delay(500); \
503+
}
502504
#define GFX_BL 42
503505
Arduino_DataBus *bus = new Arduino_HWSPI(11 /* DC */, 12 /* CS */, 40 /* SCK */, 41 /* MOSI */, 38 /* MISO */);
504506
Arduino_GFX *gfx = new Arduino_ST7789(bus, GFX_NOT_DEFINED /* RST */, 1 /* rotation */, false /* IPS */);
@@ -511,11 +513,11 @@ Arduino_GFX *gfx = new Arduino_ST7789(bus, 23 /* RST */, 0 /* rotation */, true
511513

512514
#elif defined(LILYGO_T_DISPLAY_S3)
513515
#define GFX_DEV_DEVICE LILYGO_T_DISPLAY_S3
514-
#define DEV_DEVICE_INIT() \
515-
{ \
516-
pinMode(15 /* PWD */, OUTPUT); \
517-
digitalWrite(15 /* PWD */, HIGH); \
518-
}
516+
#define DEV_DEVICE_INIT() \
517+
{ \
518+
pinMode(15 /* PWD */, OUTPUT); \
519+
digitalWrite(15 /* PWD */, HIGH); \
520+
}
519521
#define GFX_BL 38
520522
Arduino_DataBus *bus = new Arduino_ESP32PAR8Q(
521523
7 /* DC */, 6 /* CS */, 8 /* WR */, 9 /* RD */,
@@ -530,11 +532,11 @@ Arduino_GFX *gfx = new Arduino_RM67162(bus, 17 /* RST */, 0 /* rotation */);
530532

531533
#elif defined(LILYGO_T_Display_S3_AMOLED_1_64)
532534
#define GFX_DEV_DEVICE LILYGO_T_DISPLAY_S3_AMOLED_1_64
533-
#define DEV_DEVICE_INIT() \
534-
{ \
535-
pinMode(16 /* LCD_EN */, OUTPUT); \
536-
digitalWrite(16 /* LCD_EN */, HIGH); \
537-
}
535+
#define DEV_DEVICE_INIT() \
536+
{ \
537+
pinMode(16 /* LCD_EN */, OUTPUT); \
538+
digitalWrite(16 /* LCD_EN */, HIGH); \
539+
}
538540
Arduino_DataBus *bus = new Arduino_ESP32QSPI(
539541
10 /* CS */, 12 /* SCK */, 11 /* D0 */, 13 /* D1 */, 14 /* D2 */, 15 /* D3 */);
540542
Arduino_GFX *g = new Arduino_CO5300(bus, 17 /* RST */, 0 /* rotation */, false /* IPS */, 280, 456,
@@ -559,21 +561,21 @@ Arduino_GFX *gfx = new Arduino_ST7796(bus, 47 /* RST */, 0 /* rotation */, true
559561

560562
#elif defined(LILYGO_T_QT)
561563
#define GFX_DEV_DEVICE LILYGO_T_QT
562-
#define DEV_DEVICE_INIT() \
563-
{ \
564-
pinMode(10 /* BL */, OUTPUT); \
565-
digitalWrite(10 /* BL */, LOW); \
566-
}
564+
#define DEV_DEVICE_INIT() \
565+
{ \
566+
pinMode(10 /* BL */, OUTPUT); \
567+
digitalWrite(10 /* BL */, LOW); \
568+
}
567569
Arduino_DataBus *bus = new Arduino_ESP32SPI(6 /* DC */, 5 /* CS */, 3 /* SCK */, 2 /* MOSI */, GFX_NOT_DEFINED /* MISO */);
568570
Arduino_GFX *gfx = new Arduino_GC9107(bus, 1 /* RST */, 0 /* rotation */, true /* IPS */);
569571

570572
#elif defined(LILYGO_T_RGB)
571573
#define GFX_DEV_DEVICE LILYGO_T_RGB
572574
#include <Wire.h>
573-
#define DEV_DEVICE_INIT() \
574-
{ \
575-
Wire.begin(8 /* SDA */, 48 /* SCL */, 800000L /* speed */); \
576-
}
575+
#define DEV_DEVICE_INIT() \
576+
{ \
577+
Wire.begin(8 /* SDA */, 48 /* SCL */, 800000L /* speed */); \
578+
}
577579
#define GFX_BL 46
578580
Arduino_DataBus *bus = new Arduino_XL9535SWSPI(
579581
8 /* SDA */, 48 /* SCL */, 2 /* XL PWD */, 3 /* XL CS */, 5 /* XL SCK */, 4 /* XL MOSI */);
@@ -592,11 +594,11 @@ Arduino_RGB_Display *gfx = new Arduino_RGB_Display(
592594

593595
#elif defined(LILYGO_T_TRACK)
594596
#define GFX_DEV_DEVICE LILYGO_T_TRACK
595-
#define DEV_DEVICE_INIT() \
596-
{ \
597-
pinMode(4 /* POWER */, OUTPUT); \
598-
digitalWrite(4 /* POWER */, HIGH); \
599-
}
597+
#define DEV_DEVICE_INIT() \
598+
{ \
599+
pinMode(4 /* POWER */, OUTPUT); \
600+
digitalWrite(4 /* POWER */, HIGH); \
601+
}
600602
Arduino_DataBus *bus = new Arduino_ESP32SPIDMA(7 /* DC */, 9 /* CS */, 5 /* SCK */, 6 /* MOSI */, GFX_NOT_DEFINED /* MISO */);
601603
Arduino_G *g = new Arduino_JD9613(bus, 8 /* RST */);
602604
#define CANVAS
@@ -610,11 +612,11 @@ Arduino_GFX *gfx = new Arduino_GC9A01(bus, 27 /* RST */, 0 /* rotation */, true
610612

611613
#elif defined(LILYGO_T4_S3)
612614
#define GFX_DEV_DEVICE LILYGO_T4_S3
613-
#define DEV_DEVICE_INIT() \
614-
{ \
615-
pinMode(9 /* POWER */, OUTPUT); \
616-
digitalWrite(9 /* POWER */, HIGH); \
617-
}
615+
#define DEV_DEVICE_INIT() \
616+
{ \
617+
pinMode(9 /* POWER */, OUTPUT); \
618+
digitalWrite(9 /* POWER */, HIGH); \
619+
}
618620
Arduino_DataBus *bus = new Arduino_ESP32QSPI(
619621
11 /* CS */, 15 /* SCK */, 14 /* D0 */, 10 /* D1 */, 16 /* D2 */, 12 /* D3 */);
620622
Arduino_GFX *g = new Arduino_RM690B0(bus, 13 /* RST */, 0 /* rotation */, 450 /* width */, 600 /* height */, 16 /* col offset 1 */, 0 /* row offset 1 */, 16 /* col offset 2 */, 0 /* row offset 2 */);
@@ -685,8 +687,26 @@ Arduino_RGB_Display *gfx = new Arduino_RGB_Display(
685687
Arduino_DataBus *bus = new Arduino_HWSPI(41 /* DC */, 42 /* CS */, 40 /* SCK */, 45 /* MOSI */, 46 /* MISO */);
686688
Arduino_GFX *gfx = new Arduino_ST7789(bus, 39 /* RST */, 0 /* rotation */, true /* IPS */);
687689

690+
#elif defined(WAVESHARE_ESP32_S3_TOUCH_AMOLED_2_41)
691+
#define GFX_DEV_DEVICE WAVESHARE_ESP32_S3_TOUCH_AMOLED_2_41
692+
#define DEV_DEVICE_INIT() \
693+
{ \
694+
pinMode(16 /* BAT_PWR */, OUTPUT); \
695+
digitalWrite(16 /* BAT_PWR */, HIGH); \
696+
}
697+
Arduino_DataBus *bus = new Arduino_ESP32QSPI(
698+
9 /* CS */, 10 /* SCK */, 11 /* D0 */, 12 /* D1 */, 13 /* D2 */, 14 /* D3 */);
699+
Arduino_GFX *g = new Arduino_RM690B0(bus, 21 /* RST */, 0 /* rotation */, 450 /* width */, 600 /* height */, 16 /* col offset 1 */, 0 /* row offset 1 */, 16 /* col offset 2 */, 0 /* row offset 2 */);
700+
#define CANVAS
701+
Arduino_Canvas *gfx = new Arduino_Canvas(450 /* width */, 600 /* height */, g);
702+
688703
#elif defined(WAVESHARE_ESP32_C6_LCD_1_47)
689704
#define GFX_DEV_DEVICE WAVESHARE_ESP32_C6_LCD_1_47
705+
#define DEV_DEVICE_INIT() \
706+
{ \
707+
pinMode(4 /* SD_CS */, OUTPUT); \
708+
digitalWrite(4 /* SD_CS */, HIGH); \
709+
}
690710
#define GFX_BL 22
691711
Arduino_DataBus *bus = new Arduino_HWSPI(15 /* DC */, 14 /* CS */, 7 /* SCK */, 6 /* MOSI */, 5 /* MISO */);
692712
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 */);
@@ -697,6 +717,12 @@ Arduino_GFX *gfx = new Arduino_ST7789(bus, 21 /* RST */, 0 /* rotation */, true
697717
Arduino_DataBus *bus = new Arduino_RPiPicoSPI(8 /* DC */, 9 /* CS */, 10 /* SCK */, 11 /* MOSI */, GFX_NOT_DEFINED /* MISO */, spi1 /* spi */);
698718
Arduino_GFX *gfx = new Arduino_ST7735(bus, 12 /* RST */, 0 /* rotation */, true /* IPS */, 80 /* width */, 160 /* height */, 26 /* col offset 1 */, 1 /* row offset 1 */, 26 /* col offset 2 */, 1 /* row offset 2 */);
699719

720+
#elif defined(WAVESHARE_RP2040_LCD_1_28)
721+
#define GFX_DEV_DEVICE WAVESHARE_RP2040_LCD_1_28
722+
#define GFX_BL 25
723+
Arduino_DataBus *bus = new Arduino_RPiPicoSPI(8 /* DC */, 9 /* CS */, 10 /* SCK */, 11 /* MOSI */, GFX_NOT_DEFINED /* MISO */, spi1 /* spi */);
724+
Arduino_GFX *gfx = new Arduino_GC9A01(bus, 12 /* RST */, 0 /* rotation */, true /* IPS */);
725+
700726
#elif defined(XIAO_SAMD21_ROUND_DISPLAY)
701727
#define GFX_DEV_DEVICE XIAO_SAMD21_ROUND_DISPLAY
702728
Arduino_DataBus *bus = new Arduino_HWSPI(3 /* DC */, 1 /* CS */);

‎examples/WiFiAnalyzer/ESPWiFiAnalyzer/ESPWiFiAnalyzer.ino

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,10 @@ void setup()
116116
gfx->print("ESP");
117117
gfx->setTextColor(RGB565_WHITE);
118118
gfx->print(" WiFi Analyzer");
119+
120+
#ifdef CANVAS
121+
gfx->flush();
122+
#endif
119123
}
120124

121125
bool matchBssidPrefix(uint8_t *a, uint8_t *b)
@@ -346,6 +350,10 @@ void loop()
346350
}
347351
}
348352

353+
#ifdef CANVAS
354+
gfx->flush();
355+
#endif
356+
349357
// Wait a bit before scanning again
350358
delay(SCAN_INTERVAL);
351359

‎examples/WiFiAnalyzer/ESPWiFiAnalyzerUTF8/ESPWiFiAnalyzerUTF8.ino

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,10 @@ void setup()
120120
gfx->print("ESP");
121121
gfx->setTextColor(RGB565_WHITE);
122122
gfx->print(" WiFi分析儀");
123+
124+
#ifdef CANVAS
125+
gfx->flush();
126+
#endif
123127
}
124128

125129
bool matchBssidPrefix(uint8_t *a, uint8_t *b)
@@ -351,6 +355,10 @@ void loop()
351355
}
352356
}
353357

358+
#ifdef CANVAS
359+
gfx->flush();
360+
#endif
361+
354362
// Wait a bit before scanning again
355363
delay(SCAN_INTERVAL);
356364

‎library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=GFX Library for Arduino
2-
version=1.5.4
2+
version=1.5.5
33
author=Moon On Our Nation <[email protected]>
44
maintainer=Moon On Our Nation <[email protected]>
55
sentence=Arduino_GFX is a GFX library for various color displays with various data bus interfaces

0 commit comments

Comments
 (0)