Skip to content

Commit a66b165

Browse files
authored
Merge pull request #117 from martinroger/master
Implementation of Waveshare ESP32_S3_Touch_LCD_2.1 (RGB)
2 parents 3f6322b + 7c467f4 commit a66b165

File tree

15 files changed

+377
-14
lines changed

15 files changed

+377
-14
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# ChangeLog
22

3+
## v0.1.9 - 2024-10-29
4+
5+
* feat(board): add support for Waveshare ESP32-S3-Touch-LCD-2.1
6+
37
## v0.1.8 - 2024-10-25
48

59
* feat(board): add support for Waveshare ESP32-S3-Touch-LCD-1.85

ESP_Panel_Board_Supported.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,12 @@
7979
*
8080
* - BOARD_WAVESHARE_ESP32_S3_Touch_LCD_4_3 (ESP32_S3_Touch_LCD_4_3): https://www.waveshare.com/esp32-s3-touch-lcd-4.3.htm
8181
* - BOARD_WAVESHARE_ESP32_S3_Touch_LCD_1_85 (ESP32_S3_Touch_LCD_1_85): https://www.waveshare.com/esp32-s3-touch-lcd-1.85.htm
82+
* - BOARD_WAVESHARE_ESP32_S3_Touch_LCD_2_1 (ESP32_S3_Touch_LCD_2_1): https://www.waveshare.com/esp32-s3-touch-lcd-2.1.htm
8283
*
8384
*/
8485
// #define BOARD_WAVESHARE_ESP32_S3_Touch_LCD_4_3
8586
// #define BOARD_WAVESHARE_ESP32_S3_Touch_LCD_1_85
87+
// #define BOARD_WAVESHARE_ESP32_S3_Touch_LCD_2_1
8688

8789
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
8890
/////////////////////////////////////////////// File Version ///////////////////////////////////////////////////////////
@@ -99,7 +101,7 @@
99101
*
100102
*/
101103
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MAJOR 0
102-
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR 4
104+
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR 5
103105
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_PATCH 0
104106

105107
#endif

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Below is a list of [supported development boards](docs/Board_Instructions.md):
6666
| [Elecrow](docs/Board_Instructions.md#elecrow) | CrowPanel 7.0" |
6767
| [M5Stack](docs/Board_Instructions.md#m5stack) | M5STACK-M5CORE2, M5STACK-M5DIAL, M5STACK-M5CORES3 |
6868
| [Jingcai](docs/Board_Instructions.md#shenzhen-jingcai-intelligent) | ESP32-4848S040C_I_Y_3 |
69-
| [Waveshare](docs/Board_Instructions.md#waveshare) | ESP32-S3-Touch-LCD-4.3, ESP32-S3-Touch-LCD-1.85 |
69+
| [Waveshare](docs/Board_Instructions.md#waveshare) | ESP32-S3-Touch-LCD-4.3, ESP32-S3-Touch-LCD-1.85, ESP32-S3-Touch-LCD-2.1 |
7070

7171
Developers and manufacturers are welcomed to contribute PRs to add more development boards. For detailed instructions, please refer to the [`Board Development Guide`](./docs/Board_Contribution_Guide.md).
7272

README_CN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ ESP32_Display_Panel 的功能框图如下所示,主要包含以下特性:
6666
| [M5Stack](docs/Board_Instructions.md#m5stack) | M5STACK-M5CORE2, M5STACK-M5DIAL, M5STACK-M5CORES3 |
6767
| [Elecrow](docs/Board_Instructions.md#elecrow) | CrowPanel 7.0" |
6868
| [Jingcai](docs/Board_Instructions.md#shenzhen-jingcai-intelligent) | ESP32-4848S040C_I_Y_3 |
69-
| [Waveshare](docs/Board_Instructions.md#waveshare) | ESP32-S3-Touch-LCD-4.3, ESP32-S3-Touch-LCD-1.85 |
69+
| [Waveshare](docs/Board_Instructions.md#waveshare) | ESP32-S3-Touch-LCD-4.3, ESP32-S3-Touch-LCD-1.85, ESP32-S3-Touch-LCD-2.1 |
7070

7171
欢迎开发者和厂商贡献 PR 来添加更多的开发板,详细说明请参考 [`开发板贡献指南`](./docs/Board_Contribution_Guide_CN.md)
7272

docs/Board_Instructions.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
| :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------: | :--------------: | :----------------: | ------------------ | :-----------: | :------------------: |
4545
| <img src="https://www.waveshare.com/media/catalog/product/cache/1/small_image/171x171/9df78eab33525d08d6e5fb8d27136e95/e/s/esp32-s3-touch-lcd-4.3-1.jpg" width="150"> | [ESP32-S3-Touch-LCD-4.3](https://www.waveshare.com/esp32-s3-touch-lcd-4.3.htm) | RGB | ST7262 | 800x480 | I2C | GT911 |
4646
| <img src="https://www.waveshare.com/w/upload/5/5f/ESP32-S3-Touch-LCD-1.85_Entity.jpg" width="150"> | [ESP32-S3-Touch-LCD-1.85](https://www.waveshare.com/esp32-s3-touch-lcd-1.85.htm) | QSPI | ST77916 | 360x360 | I2C | CST816 |
47+
| <img src="https://www.waveshare.com/w/upload/thumb/1/10/ESP32-S3-Touch-LCD-2.1.jpg/300px-ESP32-S3-Touch-LCD-2.1.jpg" width="150"> | [ESP32-S3-Touch-LCD-1.85](https://www.waveshare.com/esp32-s3-touch-lcd-2.1.htm) | RGB | ST7701 | 480x480 | I2C | CST820 (CST816-like) |
4748

4849
## Recommended Configurations in the Arduino IDE
4950

@@ -68,6 +69,7 @@ Below are recommended configurations for developing GUI applications on differen
6869
| ElecrowCrowPanel 7.0" | ESP32S3 Dev Module | OPI | QIO 80MHz | 4MB | Disabled | Huge App (3MB) |
6970
| Waveshare-ESP32-S3-Touch-LCD-4.3 | ESP32S3 Dev Module | OPI | QIO 80MHz | 8MB | Disabled | 8M with spiffs |
7071
| Waveshare-ESP32-S3-Touch-LCD-1.85 | ESP32S3 Dev Module | OPI | QIO 80MHz | 16MB | Enabled | 16M Flash (3MB) |
72+
| Waveshare-ESP32-S3-Touch-LCD-2.1 | ESP32S3 Dev Module | OPI | QIO 80MHz | 16MB | Enabled | 16M Flash (3MB) |
7173

7274
**Notes:**
7375

examples/LVGL/v8/Porting/ESP_Panel_Board_Supported.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,12 @@
7979
*
8080
* - BOARD_WAVESHARE_ESP32_S3_Touch_LCD_4_3 (ESP32_S3_Touch_LCD_4_3): https://www.waveshare.com/esp32-s3-touch-lcd-4.3.htm
8181
* - BOARD_WAVESHARE_ESP32_S3_Touch_LCD_1_85 (ESP32_S3_Touch_LCD_1_85): https://www.waveshare.com/esp32-s3-touch-lcd-1.85.htm
82+
* - BOARD_WAVESHARE_ESP32_S3_Touch_LCD_2_1 (ESP32_S3_Touch_LCD_2_1): https://www.waveshare.com/esp32-s3-touch-lcd-2.1.htm
8283
*
8384
*/
8485
// #define BOARD_WAVESHARE_ESP32_S3_Touch_LCD_4_3
8586
// #define BOARD_WAVESHARE_ESP32_S3_Touch_LCD_1_85
87+
// #define BOARD_WAVESHARE_ESP32_S3_Touch_LCD_2_1
8688

8789
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
8890
/////////////////////////////////////////////// File Version ///////////////////////////////////////////////////////////
@@ -99,7 +101,7 @@
99101
*
100102
*/
101103
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MAJOR 0
102-
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR 4
104+
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR 5
103105
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_PATCH 0
104106

105107
#endif

examples/LVGL/v8/Rotation/ESP_Panel_Board_Supported.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,12 @@
7979
*
8080
* - BOARD_WAVESHARE_ESP32_S3_Touch_LCD_4_3 (ESP32_S3_Touch_LCD_4_3): https://www.waveshare.com/esp32-s3-touch-lcd-4.3.htm
8181
* - BOARD_WAVESHARE_ESP32_S3_Touch_LCD_1_85 (ESP32_S3_Touch_LCD_1_85): https://www.waveshare.com/esp32-s3-touch-lcd-1.85.htm
82+
* - BOARD_WAVESHARE_ESP32_S3_Touch_LCD_2_1 (ESP32_S3_Touch_LCD_2_1): https://www.waveshare.com/esp32-s3-touch-lcd-2.1.htm
8283
*
8384
*/
8485
// #define BOARD_WAVESHARE_ESP32_S3_Touch_LCD_4_3
8586
// #define BOARD_WAVESHARE_ESP32_S3_Touch_LCD_1_85
87+
// #define BOARD_WAVESHARE_ESP32_S3_Touch_LCD_2_1
8688

8789
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
8890
/////////////////////////////////////////////// File Version ///////////////////////////////////////////////////////////
@@ -99,7 +101,7 @@
99101
*
100102
*/
101103
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MAJOR 0
102-
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR 4
104+
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR 5
103105
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_PATCH 0
104106

105107
#endif

examples/Panel/PanelTest/ESP_Panel_Board_Supported.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,12 @@
7979
*
8080
* - BOARD_WAVESHARE_ESP32_S3_Touch_LCD_4_3 (ESP32_S3_Touch_LCD_4_3): https://www.waveshare.com/esp32-s3-touch-lcd-4.3.htm
8181
* - BOARD_WAVESHARE_ESP32_S3_Touch_LCD_1_85 (ESP32_S3_Touch_LCD_1_85): https://www.waveshare.com/esp32-s3-touch-lcd-1.85.htm
82+
* - BOARD_WAVESHARE_ESP32_S3_Touch_LCD_2_1 (ESP32_S3_Touch_LCD_2_1): https://www.waveshare.com/esp32-s3-touch-lcd-2.1.htm
8283
*
8384
*/
8485
// #define BOARD_WAVESHARE_ESP32_S3_Touch_LCD_4_3
8586
// #define BOARD_WAVESHARE_ESP32_S3_Touch_LCD_1_85
87+
// #define BOARD_WAVESHARE_ESP32_S3_Touch_LCD_2_1
8688

8789
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
8890
/////////////////////////////////////////////// File Version ///////////////////////////////////////////////////////////
@@ -99,7 +101,7 @@
99101
*
100102
*/
101103
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MAJOR 0
102-
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR 4
104+
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR 5
103105
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_PATCH 0
104106

105107
#endif

examples/PlatformIO/src/ESP_Panel_Board_Supported.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,12 @@
7979
*
8080
* - BOARD_WAVESHARE_ESP32_S3_Touch_LCD_4_3 (ESP32_S3_Touch_LCD_4_3): https://www.waveshare.com/esp32-s3-touch-lcd-4.3.htm
8181
* - BOARD_WAVESHARE_ESP32_S3_Touch_LCD_1_85 (ESP32_S3_Touch_LCD_1_85): https://www.waveshare.com/esp32-s3-touch-lcd-1.85.htm
82+
* - BOARD_WAVESHARE_ESP32_S3_Touch_LCD_2_1 (ESP32_S3_Touch_LCD_2_1): https://www.waveshare.com/esp32-s3-touch-lcd-2.1.htm
8283
*
8384
*/
8485
// #define BOARD_WAVESHARE_ESP32_S3_Touch_LCD_4_3
8586
// #define BOARD_WAVESHARE_ESP32_S3_Touch_LCD_1_85
87+
// #define BOARD_WAVESHARE_ESP32_S3_Touch_LCD_2_1
8688

8789
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
8890
/////////////////////////////////////////////// File Version ///////////////////////////////////////////////////////////
@@ -99,7 +101,7 @@
99101
*
100102
*/
101103
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MAJOR 0
102-
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR 4
104+
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR 5
103105
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_PATCH 0
104106

105107
#endif

examples/SquareLine/v8/Porting/ESP_Panel_Board_Supported.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,12 @@
7979
*
8080
* - BOARD_WAVESHARE_ESP32_S3_Touch_LCD_4_3 (ESP32_S3_Touch_LCD_4_3): https://www.waveshare.com/esp32-s3-touch-lcd-4.3.htm
8181
* - BOARD_WAVESHARE_ESP32_S3_Touch_LCD_1_85 (ESP32_S3_Touch_LCD_1_85): https://www.waveshare.com/esp32-s3-touch-lcd-1.85.htm
82+
* - BOARD_WAVESHARE_ESP32_S3_Touch_LCD_2_1 (ESP32_S3_Touch_LCD_2_1): https://www.waveshare.com/esp32-s3-touch-lcd-2.1.htm
8283
*
8384
*/
8485
// #define BOARD_WAVESHARE_ESP32_S3_Touch_LCD_4_3
8586
// #define BOARD_WAVESHARE_ESP32_S3_Touch_LCD_1_85
87+
// #define BOARD_WAVESHARE_ESP32_S3_Touch_LCD_2_1
8688

8789
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
8890
/////////////////////////////////////////////// File Version ///////////////////////////////////////////////////////////
@@ -99,7 +101,7 @@
99101
*
100102
*/
101103
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MAJOR 0
102-
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR 4
104+
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR 5
103105
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_PATCH 0
104106

105107
#endif

0 commit comments

Comments
 (0)