Skip to content

Commit 0e4526f

Browse files
Dev (#12)
* fix: Fix examples that cannot be compiled Add necessary dependency libraries in run-cl-arduino.yml Make example fixes for specific boards Add examples that cannot be compiled temporarily to ignore.list Correct included header file names to compile on Linux Contains necessary header files to compile through certain examples * feat: Add DMA support for some pprocessors Added DMA support for SAMD21 RA4M1 nRF52840 MG24 Fixed compatibility issues with capacitive screen drivers Fixed compatibility issues with some examples * fix: Fixed header file conflicts Fixed header file conflicts between Round Display and EPaper
1 parent 5173251 commit 0e4526f

File tree

16 files changed

+96
-8
lines changed

16 files changed

+96
-8
lines changed

.github/workflows/run-cl-arduino.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ jobs:
6464
echo "PNG Images/Flash_PNG,Seeeduino:renesas_uno:XIAO_RA4M1" >> ignore.list
6565
echo "PNG Images/Flash_transparent_PNG,Seeeduino:renesas_uno:XIAO_RA4M1" >> ignore.list
6666
echo "Round Display/Arduino_Life,Seeeduino:renesas_uno:XIAO_RA4M1" >> ignore.list
67-
echo "Round Display/GifPlayer ,Seeeduino:nrf52:xiaonRF52840" >> ignore.list
67+
echo "Round Display/GifPlayer ,Seeeduino:renesas_uno:XIAO_RA4M1" >> ignore.list
68+
6869
6970
7071
# no SPIFFS so can't compile

Extensions/EPaper.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,6 @@ class EPaper : public TFT_eSprite
1919

2020
private:
2121
bool _sleep;
22-
};
22+
};
23+
24+
#include "EPaper.cpp"

TFT_eSPI.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#elif defined(ARDUINO_XIAO_RA4M1)
3535
#include "Processors/TFT_eSPI_RA4M1.c"
3636
#elif defined(NRF52840_XXAA)
37-
#include "Processors/TFT_eSPI_NRF52840.c"
37+
#include "Processors/TFT_eSPI_nRF52840.c"
3838
#elif defined (EFR32MG24B220F1536IM48)
3939
#include "Processors/TFT_eSPI_MG24.cpp"
4040
#else

User_Setup_Select.h

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,18 +158,20 @@
158158
//#include <User_Setups/ILI9225.h>
159159

160160

161-
#ifdef WIO_TERMINAL
161+
#if defined(WIO_TERMINAL)
162162
#include <User_Setups/Setup500_Seeed_Wio_Terminal.h> // Setup file for Seeed Wio Terimal with SPI ILI9341 320x240
163-
#else
163+
#elif defined(SEEED_XIAO_ROUND_DISPLAY)
164164
#include <User_Setups/Setup501_Seeed_XIAO_Round_Display.h> // Setup file for Seeed XIAO ROUND with GC9A01 240 x 240
165-
// #include <User_Setups/Setup502_Seeed_XIAO_EPaper_7inch5.h> // Setup file for Seeed XIAO ROUND with GC9A01 240 x 240
165+
#elif defined(SEEED_XIAO_EPAPER_7INCH5)
166+
#include <User_Setups/Setup502_Seeed_XIAO_EPaper_7inch5.h>
167+
#else
168+
#include <User_Setups/Setup666_XIAO_ILI9341.h>
166169
#endif
167170

168171

169172
#endif // USER_SETUP_LOADED
170173

171174
// Compatible with some examples
172-
// #include "TFT_Drivers/ILI9341_Defines.h"
173175
#ifdef NRF52840_XXAA
174176
#include <avr/dtostrf.h>
175177
#endif
Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
#include <Wire.h>
2+
3+
#define USER_SETUP_ID 666
4+
5+
#define ILI9341_DRIVER
6+
7+
// #define TFT_INVERSION_ON
8+
#define TFT_RGB_ORDER TFT_RBG // Colour order Blue-Green-Red
9+
// #define TFT_WIDTH 240
10+
// #define TFT_HEIGHT 240 // GC9A01 240 x 240
11+
12+
#define TFT_SCLK D8
13+
#define TFT_MISO D9
14+
#define TFT_MOSI D10
15+
16+
#define TFT_CS D1 // Chip select control pin
17+
#define TFT_DC D3 // Data Command control pin
18+
// #define TFT_BL D6
19+
20+
// #define TFT_BACKLIGHT_ON HIGH
21+
#define TFT_RST D0 // Reset pin (could connect to RST pin)
22+
23+
// Touchscreen
24+
#define CHSCX6X_DRIVER
25+
#define TOUCH_INT D7
26+
#define TOUCH_WIRE Wire
27+
28+
#define LOAD_GLCD // Font 1. Original Adafruit 8 pixel font needs ~1820 bytes in FLASH
29+
#define LOAD_FONT2 // Font 2. Small 16 pixel high font, needs ~3534 bytes in FLASH, 96 characters
30+
#define LOAD_FONT4 // Font 4. Medium 26 pixel high font, needs ~5848 bytes in FLASH, 96 characters
31+
#define LOAD_FONT6 // Font 6. Large 48 pixel font, needs ~2666 bytes in FLASH, only characters 1234567890:-.apm
32+
#define LOAD_FONT7 // Font 7. 7 segment 48 pixel font, needs ~2438 bytes in FLASH, only characters 1234567890:-.
33+
#define LOAD_FONT8 // Font 8. Large 75 pixel font needs ~3256 bytes in FLASH, only characters 1234567890:-.
34+
#define LOAD_FONT8N // Font 8. Alternative to Font 8 above, slightly narrower, so 3 digits fit a 160 pixel TFT
35+
#define LOAD_GFXFF // FreeFonts. Include access to the 48 Adafruit_GFX free fonts FF1 to FF48 and custom fonts
36+
37+
#define SMOOTH_FONT
38+
39+
40+
#if defined(SEEED_XIAO_M0)
41+
#define SPI_FREQUENCY 12000000
42+
#define SPI_READ_FREQUENCY 4000000
43+
#elif defined(ARDUINO_XIAO_ESP32S3)
44+
#define SPI_FREQUENCY 50000000
45+
#define SPI_READ_FREQUENCY 12000000
46+
#define USE_HSPI_PORT
47+
#elif defined(ARDUINO_XIAO_ESP32C3)
48+
#define SPI_FREQUENCY 40000000
49+
#define SPI_READ_FREQUENCY 6000000
50+
#elif defined(ARDUINO_XIAO_ESP32C6)
51+
#define SPI_FREQUENCY 40000000
52+
#define SPI_READ_FREQUENCY 6000000
53+
#elif defined(ARDUINO_SEEED_XIAO_NRF52840) || defined(ARDUINO_SEEED_XIAO_NRF52840_SENSE) || defined(ARDUINO_Seeed_XIAO_nRF52840) || defined(ARDUINO_Seeed_XIAO_nRF52840_Sense)
54+
#define SPI_FREQUENCY 12000000
55+
#define SPI_READ_FREQUENCY 4000000
56+
#define ltoa itoa
57+
#elif defined(ARDUINO_SEEED_XIAO_RP2040) || defined(ARDUINO_SEEED_XIAO_RP2350)
58+
#define SPI_FREQUENCY 62500000
59+
#define SPI_READ_FREQUENCY 12000000
60+
#elif defined(ARDUINO_XIAO_RA4M1)
61+
#define SPI_FREQUENCY 25000000
62+
#define SPI_READ_FREQUENCY 4000000
63+
#elif defined (EFR32MG24B220F1536IM48)
64+
#define SPI_FREQUENCY 25000000
65+
#define SPI_READ_FREQUENCY 4000000
66+
#else
67+
#message "Unknown board using default SPI settings (25MHz)"
68+
#define SPI_FREQUENCY 25000000
69+
#define SPI_READ_FREQUENCY 4000000
70+
#endif

examples/Round Display/Arduino_Life/Arduino_Life.ino

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
// Adapted by Bodmer
88

9+
#define SEEED_XIAO_ROUND_DISPLAY
910
#include <TFT_eSPI.h> // Hardware-specific library
1011
#include <SPI.h>
1112

examples/Round Display/GifPlayer/GifPlayer.ino

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include <vector>
2+
#define SEEED_XIAO_ROUND_DISPLAY
23
#include <TFT_eSPI.h>
34
#include <SPI.h>
45
#include <SD.h>

examples/Round Display/Pong_v3/Pong_v3.ino

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#define WHITE 0xFFFF
99
#define GREY 0x5AEB
1010

11+
#define SEEED_XIAO_ROUND_DISPLAY
1112
#include <TFT_eSPI.h> // Graphics and font library for ST7735 driver chip
1213
#include <SPI.h>
1314

examples/Round Display/TFT_Clock/TFT_Clock.ino

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#include <Arduino.h>
2+
3+
#define SEEED_XIAO_ROUND_DISPLAY
24
#include <TFT_eSPI.h>
35
#include <SPI.h>
46
#include <Wire.h>

examples/Round Display/TFT_flash_jpg/TFT_flash_jpg.ino

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
//----------------------------------------------------------------------------------------------------
1313

1414
#include <SPI.h>
15+
#define SEEED_XIAO_ROUND_DISPLAY
1516
#include <TFT_eSPI.h>
1617

1718
TFT_eSPI tft = TFT_eSPI();

0 commit comments

Comments
 (0)