Skip to content

Commit 4869ac1

Browse files
committed
feat(board): add board Waveshare:ESP32_S3_TOUCH_LCD_1_85_C @hegdi (#208)
Closes #208
1 parent a1927d1 commit 4869ac1

File tree

12 files changed

+29
-11
lines changed

12 files changed

+29
-11
lines changed

CHANGELOG.md

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

77
* feat(docs): provides an example of how to integrate this library into micropython by @tsteinruecken (#190)
8+
* feat(board): add board Waveshare:ESP32_S3_TOUCH_LCD_1_85_C @hegdi (#208)
89

910
### Bugfixes:
1011

esp_panel_board_supported_conf.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@
9393
* Waveshare Supported Boards (https://www.waveshare.com/):
9494
*
9595
* -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
96+
* -BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85_C (ESP32_S3_Touch_LCD_1_85_C): https://www.waveshare.com/esp32-s3-touch-lcd-1.85c.htm
9697
* -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
9798
* -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
9899
* -BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_4_3_B (ESP32_S3_Touch_LCD_4_3_B): https://www.waveshare.com/esp32-s3-touch-lcd-4.3B.htm
@@ -102,6 +103,7 @@
102103
* -BOARD_WAVESHARE_ESP32_P4_NANO (ESP32_P4_NANO): https://www.waveshare.com/esp32-p4-nano.htm
103104
*/
104105
// #define BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85
106+
// #define BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85_C
105107
// #define BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_2_1
106108
// #define BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_4_3
107109
// #define BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_4_3_B

examples/arduino/board/board_static_config/esp_panel_board_supported_conf.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@
9393
* Waveshare Supported Boards (https://www.waveshare.com/):
9494
*
9595
* -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
96+
* -BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85_C (ESP32_S3_Touch_LCD_1_85_C): https://www.waveshare.com/esp32-s3-touch-lcd-1.85c.htm
9697
* -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
9798
* -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
9899
* -BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_4_3_B (ESP32_S3_Touch_LCD_4_3_B): https://www.waveshare.com/esp32-s3-touch-lcd-4.3B.htm
@@ -102,6 +103,7 @@
102103
* -BOARD_WAVESHARE_ESP32_P4_NANO (ESP32_P4_NANO): https://www.waveshare.com/esp32-p4-nano.htm
103104
*/
104105
// #define BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85
106+
// #define BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85_C
105107
// #define BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_2_1
106108
// #define BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_4_3
107109
// #define BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_4_3_B

examples/arduino/gui/lvgl_v8/simple_port/esp_panel_board_supported_conf.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@
9393
* Waveshare Supported Boards (https://www.waveshare.com/):
9494
*
9595
* -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
96+
* -BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85_C (ESP32_S3_Touch_LCD_1_85_C): https://www.waveshare.com/esp32-s3-touch-lcd-1.85c.htm
9697
* -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
9798
* -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
9899
* -BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_4_3_B (ESP32_S3_Touch_LCD_4_3_B): https://www.waveshare.com/esp32-s3-touch-lcd-4.3B.htm
@@ -102,6 +103,7 @@
102103
* -BOARD_WAVESHARE_ESP32_P4_NANO (ESP32_P4_NANO): https://www.waveshare.com/esp32-p4-nano.htm
103104
*/
104105
// #define BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85
106+
// #define BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85_C
105107
// #define BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_2_1
106108
// #define BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_4_3
107109
// #define BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_4_3_B

examples/arduino/gui/lvgl_v8/simple_rotation/esp_panel_board_supported_conf.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@
9393
* Waveshare Supported Boards (https://www.waveshare.com/):
9494
*
9595
* -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
96+
* -BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85_C (ESP32_S3_Touch_LCD_1_85_C): https://www.waveshare.com/esp32-s3-touch-lcd-1.85c.htm
9697
* -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
9798
* -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
9899
* -BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_4_3_B (ESP32_S3_Touch_LCD_4_3_B): https://www.waveshare.com/esp32-s3-touch-lcd-4.3B.htm
@@ -102,6 +103,7 @@
102103
* -BOARD_WAVESHARE_ESP32_P4_NANO (ESP32_P4_NANO): https://www.waveshare.com/esp32-p4-nano.htm
103104
*/
104105
// #define BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85
106+
// #define BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85_C
105107
// #define BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_2_1
106108
// #define BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_4_3
107109
// #define BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_4_3_B

examples/arduino/gui/lvgl_v8/squareline_port/esp_panel_board_supported_conf.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@
9393
* Waveshare Supported Boards (https://www.waveshare.com/):
9494
*
9595
* -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
96+
* -BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85_C (ESP32_S3_Touch_LCD_1_85_C): https://www.waveshare.com/esp32-s3-touch-lcd-1.85c.htm
9697
* -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
9798
* -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
9899
* -BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_4_3_B (ESP32_S3_Touch_LCD_4_3_B): https://www.waveshare.com/esp32-s3-touch-lcd-4.3B.htm
@@ -102,6 +103,7 @@
102103
* -BOARD_WAVESHARE_ESP32_P4_NANO (ESP32_P4_NANO): https://www.waveshare.com/esp32-p4-nano.htm
103104
*/
104105
// #define BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85
106+
// #define BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85_C
105107
// #define BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_2_1
106108
// #define BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_4_3
107109
// #define BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_4_3_B

examples/arduino/gui/lvgl_v8/squareline_wifi_clock/esp_panel_board_supported_conf.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@
9393
* Waveshare Supported Boards (https://www.waveshare.com/):
9494
*
9595
* -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
96+
* -BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85_C (ESP32_S3_Touch_LCD_1_85_C): https://www.waveshare.com/esp32-s3-touch-lcd-1.85c.htm
9697
* -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
9798
* -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
9899
* -BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_4_3_B (ESP32_S3_Touch_LCD_4_3_B): https://www.waveshare.com/esp32-s3-touch-lcd-4.3B.htm
@@ -102,6 +103,7 @@
102103
* -BOARD_WAVESHARE_ESP32_P4_NANO (ESP32_P4_NANO): https://www.waveshare.com/esp32-p4-nano.htm
103104
*/
104105
// #define BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85
106+
// #define BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85_C
105107
// #define BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_2_1
106108
// #define BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_4_3
107109
// #define BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_4_3_B

src/board/supported/esp_panel_board_config_supported.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
+ defined(BOARD_JINGCAI_JC8048W550C) \
9393
/* Waveshare */ \
9494
+ defined(BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85) \
95-
+ defined(BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85C) \
95+
+ defined(BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85_C) \
9696
+ defined(BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_2_1) \
9797
+ defined(BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_4_3) \
9898
+ defined(BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_4_3_B) \
@@ -161,8 +161,8 @@
161161
/* Waveshare */
162162
#elif defined(BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85)
163163
#include "waveshare/BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85.h"
164-
#elif defined(BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85C)
165-
#include "waveshare/BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85C.h"
164+
#elif defined(BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85_C)
165+
#include "waveshare/BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85_C.h"
166166
#elif defined(BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_2_1)
167167
#include "waveshare/BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_2_1.h"
168168
#elif defined(BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_4_3)

src/board/supported/esp_panel_board_kconfig_supported.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,9 @@
118118
#define BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85 CONFIG_BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85
119119
#endif
120120
#endif
121-
#ifndef BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85C
122-
#ifdef CONFIG_BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85C
123-
#define BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85C CONFIG_BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85C
121+
#ifndef BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85_C
122+
#ifdef CONFIG_BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85_C
123+
#define BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85_C CONFIG_BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85_C
124124
#endif
125125
#endif
126126
#ifndef BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_2_1

src/board/supported/waveshare/BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85C.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66
/**
7-
* @file BOARD_ESP32_S3_TOUCH_LCD_1_85C.h
8-
* @brief Configuration file for Waveshare ESP32_S3_TOUCH_LCD_1_85C
7+
* @file BOARD_ESP32_S3_TOUCH_LCD_1_85_C.h
8+
* @brief Configuration file for Waveshare ESP32_S3_TOUCH_LCD_1_85_C
99
* @author @martinroger & Waveshare@H-sw123
1010
* @link https://www.waveshare.com/esp32-s3-touch-lcd-1.85c.htm
1111
*/
@@ -20,7 +20,7 @@
2020
/**
2121
* @brief Board name
2222
*/
23-
#define ESP_PANEL_BOARD_NAME "Waveshare:ESP32_S3_TOUCH_LCD_1_85C"
23+
#define ESP_PANEL_BOARD_NAME "Waveshare:ESP32_S3_TOUCH_LCD_1_85_C"
2424

2525
/**
2626
* @brief Panel resolution configuration in pixels

src/board/supported/waveshare/Kconfig.waveshare

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ config BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85
33
help
44
https://www.waveshare.com/esp32-s3-touch-lcd-1.85.htm
55

6-
config BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85C
7-
bool "ESP32_S3_TOUCH_LCD_1_85C"
6+
config BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85_C
7+
bool "ESP32_S3_TOUCH_LCD_1_85_C"
88
help
99
https://www.waveshare.com/esp32-s3-touch-lcd-1.85c.htm
1010

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
CONFIG_IDF_TARGET="esp32s3"
2+
CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG=y
3+
CONFIG_SPIRAM_MODE_OCT=y
4+
5+
CONFIG_BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85_C=y

0 commit comments

Comments
 (0)