Skip to content

Commit 8ae5cd3

Browse files
committed
feat: update
1 parent 3d344f7 commit 8ae5cd3

File tree

401 files changed

+19292
-12636
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

401 files changed

+19292
-12636
lines changed

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,15 +94,15 @@ repos:
9494
name: Update when configuration files change
9595
entry: python3 tools/sync_conf_files.py ./
9696
language: system
97-
files: '.*esp_panel_(board_custom|board_supported|drivers_conf)\.h'
97+
files: '.*esp_panel_(board_custom|board_supported|drivers)_conf\.h'
9898

9999
- repo: local
100100
hooks:
101101
- id: check-file-versions
102102
name: Update when versions change
103103
entry: python3 tools/check_file_version.py ./
104104
language: system
105-
files: '(.*esp_panel_(board_custom|board_supported|drivers_conf)\.h|library.properties|.*esp_panel_versions.h)'
105+
files: '(.*esp_panel_(board_custom|board_supported|drivers)_conf\.h|library.properties|.*esp_panel_versions.h)'
106106

107107
- repo: local
108108
hooks:

docs/FAQ.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ When encountering screen drift issue when driving RGB LCD with ESP32-S3, you can
4444

4545
- **Step 2**: If you are using supported development boards, usually there's no need to modify the code as they set `ESP_PANEL_BOARD_LCD_RGB_BOUNCE_BUF_SIZE` to `(ESP_PANEL_BOARD_WIDTH * 10)` by default. If the issue persists, refer to the example code below to increase the size of the `Bounce Buffer`.
4646

47-
- **Step 3**: If you are using a custom board, confirm in the `esp_panel_board_custom.h` file whether `ESP_PANEL_BOARD_LCD_RGB_BOUNCE_BUF_SIZE` is set to non-zero. If the issue persists, increase the size of the `Bounce Buffer`.
47+
- **Step 3**: If you are using a custom board, confirm in the `esp_panel_board_custom_conf.h` file whether `ESP_PANEL_BOARD_LCD_RGB_BOUNCE_BUF_SIZE` is set to non-zero. If the issue persists, increase the size of the `Bounce Buffer`.
4848

4949
- **Step 4**: If you are using an independent driver, refer to the example code below to set the size of the `Bounce Buffer`.
5050

@@ -86,13 +86,13 @@ You can refer to the example [PlatformIO](../examples/PlatformIO/) to use the ES
8686

8787
## How to add an LVGL library and how to configure?
8888
* How to use it normally
89-
89+
9090
1.Download the LVGL library in Arduino, it is best to choose the `V8.4.0` version.
91-
91+
9292
2.Find the downloaded LVGL library, copy and paste the `lv_conf_template.h` file into the same directory as the LVGL library.
93-
93+
9494
3.Change the `lv_conf_template.h` file name to `lv_conf.h`.
95-
95+
9696
4.Open `lv_conf.h` to modify the macro definition and save: `#if 0`--> `#if 1`
9797
```c
9898
...
@@ -113,33 +113,33 @@ You can refer to the example [PlatformIO](../examples/PlatformIO/) to use the ES
113113
/*==================
114114
* EXAMPLES
115115
*==================*/
116-
116+
117117
/*Enable the examples to be built with the library*/
118118
#define LV_BUILD_EXAMPLES 1
119-
119+
120120
/*===================
121121
* DEMO USAGE
122122
====================*/
123-
123+
124124
/*Show some widget. It might be required to increase `LV_MEM_SIZE` */
125125
#define LV_USE_DEMO_WIDGETS 1
126126
#if LV_USE_DEMO_WIDGETS
127127
#define LV_DEMO_WIDGETS_SLIDESHOW 0
128128
#endif
129-
129+
130130
/*Demonstrate the usage of encoder and keyboard*/
131131
#define LV_USE_DEMO_KEYPAD_AND_ENCODER 0
132-
132+
133133
/*Benchmark your system*/
134134
#define LV_USE_DEMO_BENCHMARK 0
135135
#if LV_USE_DEMO_BENCHMARK
136136
/*Use RGB565A8 images with 16 bit color depth instead of ARGB8565*/
137137
#define LV_DEMO_BENCHMARK_RGB565A8 0
138138
#endif
139-
139+
140140
/*Stress test for LVGL*/
141141
#define LV_USE_DEMO_STRESS 0
142-
142+
143143
/*Music player demo*/
144144
#define LV_USE_DEMO_MUSIC 0
145145
#if LV_USE_DEMO_MUSIC

docs/FAQ_CN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ arduino-esp32 v3.x.x 版本的 SDK 位于默认安装路径下的 `tools > esp32
4343

4444
- **Step2**:如果您使用的是支持的开发板,则通常无需修改代码,因为它们默认设置了 `ESP_PANEL_BOARD_LCD_RGB_BOUNCE_BUF_SIZE``(ESP_PANEL_BOARD_WIDTH * 10)`。如果问题仍然存在,请参考下面的示例代码来增大 `Bounce Buffer` 的大小。
4545

46-
- **Step3**:如果您使用的是自定义的开发板,请在 `esp_panel_board_custom.h` 文件中确认 `ESP_PANEL_BOARD_LCD_RGB_BOUNCE_BUF_SIZE` 是否设置为非 0。如果问题仍然存在,请增大 `Bounce Buffer` 的大小。
46+
- **Step3**:如果您使用的是自定义的开发板,请在 `esp_panel_board_custom_conf.h` 文件中确认 `ESP_PANEL_BOARD_LCD_RGB_BOUNCE_BUF_SIZE` 是否设置为非 0。如果问题仍然存在,请增大 `Bounce Buffer` 的大小。
4747

4848
- **Step4**:如果您使用的是独立的驱动,请参考下面的示例代码来设置 `Bounce Buffer` 的大小。
4949

docs/How_To_Use.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ Below are detailed instructions on how to configure ESP32_Display_Panel, mainly
7878
4. If multiple projects need to use the same configuration, users can place the configuration files in the [Arduino Library Directory](./FAQ.md#where-is-the-directory-for-arduino-libraries), so that all projects can share the same configuration.
7979

8080
> [!WARNING]
81-
> * The same directory can simultaneously contain both `esp_panel_board_supported.h` and `esp_panel_board_custom.h` configuration files, but they cannot be enabled at the same time, meaning `ESP_PANEL_BOARD_DEFAULT_USE_SUPPORTED` and `ESP_PANEL_BOARD_DEFAULT_USE_CUSTOM` can only have one set to `1`.
81+
> * The same directory can simultaneously contain both `esp_panel_board_supported_conf.h` and `esp_panel_board_custom_conf.h` configuration files, but they cannot be enabled at the same time, meaning `ESP_PANEL_BOARD_DEFAULT_USE_SUPPORTED` and `ESP_PANEL_BOARD_DEFAULT_USE_CUSTOM` can only have one set to `1`.
8282
> * If neither of the above two configuration files is enabled, users cannot use the `ESP_Panel` driver and can only use other standalone device drivers, such as `ESP_PanelBus`, `ESP_PanelLcd`, etc.
8383
> * Since the configurations within these files might change, such as adding, deleting, or renaming, to ensure the compatibility of the program, the library manages the versions of these files independently and checks whether the configuration files currently used by the user are compatible with the library during compilation. Detailed version information and checking rules can be found at the end of the file.
8484
@@ -95,12 +95,12 @@ ESP32_Display_Panel configures driver functionality and parameters based on the
9595

9696
#### Using Supported Development Boards
9797

98-
ESP32_Display_Panel configures `ESP_Panel` as the driver for the target development board based on the [esp_panel_board_supported.h](../esp_panel_board_supported.h) file. Users can select supported development boards by modifying macro definitions in this file. For example, to use the *ESP32-S3-BOX-3* development board, follow these steps:
98+
ESP32_Display_Panel configures `ESP_Panel` as the driver for the target development board based on the [esp_panel_board_supported_conf.h](../esp_panel_board_supported_conf.h) file. Users can select supported development boards by modifying macro definitions in this file. For example, to use the *ESP32-S3-BOX-3* development board, follow these steps:
9999

100-
1. Set the `ESP_PANEL_BOARD_DEFAULT_USE_SUPPORTED` macro definition in the `esp_panel_board_supported.h` file to `1`.
100+
1. Set the `ESP_PANEL_BOARD_DEFAULT_USE_SUPPORTED` macro definition in the `esp_panel_board_supported_conf.h` file to `1`.
101101
2. Uncomment the corresponding macro definition for the target development board model.
102102

103-
Here is a snippet of the modified `esp_panel_board_supported.h` file:
103+
Here is a snippet of the modified `esp_panel_board_supported_conf.h` file:
104104

105105
```c
106106
...
@@ -109,19 +109,19 @@ Here is a snippet of the modified `esp_panel_board_supported.h` file:
109109

110110
#if ESP_PANEL_BOARD_DEFAULT_USE_SUPPORTED
111111
...
112-
// #define BOARD_ESP32_C3_LCDKIT
113-
// #define BOARD_ESP32_S3_BOX
114-
#define BOARD_ESP32_S3_BOX_3
115-
// #define BOARD_ESP32_S3_BOX_3_BETA
112+
// #define BOARD_ESPRESSIF_ESP32_C3_LCDKIT
113+
// #define BOARD_ESPRESSIF_ESP32_S3_BOX
114+
#define BOARD_ESPRESSIF_ESP32_S3_BOX_3
115+
// #define BOARD_ESPRESSIF_ESP32_S3_BOX_3_BETA
116116
...
117117
#endif /* ESP_PANEL_BOARD_DEFAULT_USE_SUPPORTED */
118118
```
119119

120120
#### Using Custom Development Boards
121121

122-
ESP32_Display_Panel configures `ESP_Panel` as the driver for custom development boards based on the [esp_panel_board_custom.h](../esp_panel_board_custom.h) file. Users need to modify this file according to the actual parameters of the custom development board. For example, to use a custom development board with a *480x480 RGB ST7701 LCD + I2C GT911 Touch*, follow these steps:
122+
ESP32_Display_Panel configures `ESP_Panel` as the driver for custom development boards based on the [esp_panel_board_custom_conf.h](../esp_panel_board_custom_conf.h) file. Users need to modify this file according to the actual parameters of the custom development board. For example, to use a custom development board with a *480x480 RGB ST7701 LCD + I2C GT911 Touch*, follow these steps:
123123

124-
1. Set the `ESP_PANEL_BOARD_DEFAULT_USE_CUSTOM` macro definition in the `esp_panel_board_custom.h` file to `1`.
124+
1. Set the `ESP_PANEL_BOARD_DEFAULT_USE_CUSTOM` macro definition in the `esp_panel_board_custom_conf.h` file to `1`.
125125
2. Set the LCD-related macro definitions:
126126
a. Set `ESP_PANEL_BOARD_DEFAULT_USE_LCD` to `1`.
127127
b. Set `ESP_PANEL_BOARD_WIDTH` and `ESP_PANEL_BOARD_HEIGHT` to `480`.
@@ -135,7 +135,7 @@ ESP32_Display_Panel configures `ESP_Panel` as the driver for custom development
135135
c. Modify other Touch configurations as needed.
136136
4. Enable other driver macro definitions as needed, such as `ESP_PANEL_BOARD_DEFAULT_USE_BACKLIGHT`, `ESP_PANEL_BOARD_DEFAULT_USE_EXPANDER`, etc.
137137

138-
Here is a snippet of the modified `esp_panel_board_custom.h` file:
138+
Here is a snippet of the modified `esp_panel_board_custom_conf.h` file:
139139

140140
```c
141141
...

docs/How_To_Use_CN.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ idf.py add-dependency "espressif/esp32_display_panel"
7878
4. 如果有多个工程需要使用相同的配置,用户可以将配置文件放在 [Arduino 库目录](./FAQ_CN.md#arduino-库的目录在哪儿)中,这样所有的工程都可以共享相同的配置。
7979

8080
> [!WARNING]
81-
> * 同一个目录下可以同时包含 `esp_panel_board_supported.h``esp_panel_board_custom.h` 两种配置文件,但是它们不能同时被使能,即 `ESP_PANEL_BOARD_DEFAULT_USE_SUPPORTED``ESP_PANEL_BOARD_DEFAULT_USE_CUSTOM` 最多只能有一个为 `1`
81+
> * 同一个目录下可以同时包含 `esp_panel_board_supported_conf.h``esp_panel_board_custom_conf.h` 两种配置文件,但是它们不能同时被使能,即 `ESP_PANEL_BOARD_DEFAULT_USE_SUPPORTED``ESP_PANEL_BOARD_DEFAULT_USE_CUSTOM` 最多只能有一个为 `1`
8282
> * 如果以上两个配置文件都被没有被使能,那么用户就无法使用 `ESP_Panel` 驱动,只能使用其他独立的设备驱动,如 `ESP_PanelBus`, `ESP_PanelLcd` 等。
8383
> * 由于这些文件内的配置可能会发生变化,比如新增、删除或重命名,为了保证程序的兼容性,库对它们分别进行了独立的版本管理,并在编译时检查用户当前使用的配置文件与库是否兼容。详细的版本信息以及检查规则可以在文件的末尾处找到。
8484
@@ -95,12 +95,12 @@ ESP32_Display_Panel 会根据 [esp_panel_drivers_conf.h](../esp_panel_drivers_co
9595

9696
#### 使用支持的开发板
9797

98-
ESP32_Display_Panel 会根据 [esp_panel_board_supported.h](../esp_panel_board_supported.h) 文件来配置 `ESP_Panel` 成为目标开发板的驱动,用户可以通过修改此文件中的宏定义来选择支持的开发板。以使用 *ESP32-S3-BOX-3* 开发板为例,修改步骤如下:
98+
ESP32_Display_Panel 会根据 [esp_panel_board_supported_conf.h](../esp_panel_board_supported_conf.h) 文件来配置 `ESP_Panel` 成为目标开发板的驱动,用户可以通过修改此文件中的宏定义来选择支持的开发板。以使用 *ESP32-S3-BOX-3* 开发板为例,修改步骤如下:
9999

100-
1. 设置 `esp_panel_board_supported.h` 文件中的 `ESP_PANEL_BOARD_DEFAULT_USE_SUPPORTED` 宏定义为 `1`
100+
1. 设置 `esp_panel_board_supported_conf.h` 文件中的 `ESP_PANEL_BOARD_DEFAULT_USE_SUPPORTED` 宏定义为 `1`
101101
2. 根据目标开发板的型号,取消对应的宏定义的注释。
102102

103-
下面是修改后的 `esp_panel_board_supported.h` 文件的部分内容:
103+
下面是修改后的 `esp_panel_board_supported_conf.h` 文件的部分内容:
104104

105105
```c
106106
...
@@ -109,19 +109,19 @@ ESP32_Display_Panel 会根据 [esp_panel_board_supported.h](../esp_panel_board_s
109109

110110
#if ESP_PANEL_BOARD_DEFAULT_USE_SUPPORTED
111111
...
112-
// #define BOARD_ESP32_C3_LCDKIT
113-
// #define BOARD_ESP32_S3_BOX
114-
#define BOARD_ESP32_S3_BOX_3
115-
// #define BOARD_ESP32_S3_BOX_3_BETA
112+
// #define BOARD_ESPRESSIF_ESP32_C3_LCDKIT
113+
// #define BOARD_ESPRESSIF_ESP32_S3_BOX
114+
#define BOARD_ESPRESSIF_ESP32_S3_BOX_3
115+
// #define BOARD_ESPRESSIF_ESP32_S3_BOX_3_BETA
116116
...
117117
#endif
118118
```
119119

120120
#### 使用自定义开发板
121121

122-
ESP32_Display_Panel 会根据 [esp_panel_board_custom.h](../esp_panel_board_custom.h) 文件来配置 `ESP_Panel` 成为自定义开发板的驱动,用户需要根据自定义开发板的实际参数对此文件进行修改。以使用 *480x480 RGB ST7701 LCD + I2C GT911 Touch* 的自定义开发板为例,修改步骤如下:
122+
ESP32_Display_Panel 会根据 [esp_panel_board_custom_conf.h](../esp_panel_board_custom_conf.h) 文件来配置 `ESP_Panel` 成为自定义开发板的驱动,用户需要根据自定义开发板的实际参数对此文件进行修改。以使用 *480x480 RGB ST7701 LCD + I2C GT911 Touch* 的自定义开发板为例,修改步骤如下:
123123

124-
1. 设置 `esp_panel_board_custom.h` 文件中的 `ESP_PANEL_BOARD_DEFAULT_USE_CUSTOM` 宏定义为 `1`
124+
1. 设置 `esp_panel_board_custom_conf.h` 文件中的 `ESP_PANEL_BOARD_DEFAULT_USE_CUSTOM` 宏定义为 `1`
125125
2. 设置 LCD 相关宏定义:
126126
a. 设置 `ESP_PANEL_BOARD_DEFAULT_USE_LCD``1`
127127
b. 设置 `ESP_PANEL_BOARD_WIDTH``ESP_PANEL_BOARD_HEIGHT``480`
@@ -135,7 +135,7 @@ ESP32_Display_Panel 会根据 [esp_panel_board_custom.h](../esp_panel_board_cust
135135
c. 根据需要修改其他 Touch 配置
136136
3. 根据需要使能其他驱动的宏定义,如 `ESP_PANEL_BOARD_DEFAULT_USE_BACKLIGHT`, `ESP_PANEL_BOARD_DEFAULT_USE_EXPANDER` 等。
137137

138-
下面是修改后的 `esp_panel_board_custom.h` 文件的部分内容:
138+
下面是修改后的 `esp_panel_board_custom_conf.h` 文件的部分内容:
139139

140140
```c
141141
...

esp_panel_board_custom.h renamed to esp_panel_board_custom_conf.h

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66
/**
7-
* @file esp_panel_board_custom.h
7+
* @file esp_panel_board_custom_conf.h
88
* @brief Configuration file for custom ESP development boards
99
* @author
1010
* @link
@@ -347,6 +347,7 @@
347347
*
348348
* Supported controllers:
349349
* - `AXS15231B`
350+
* - `CHSC6540`
350351
* - `CST816S`
351352
* - `FT5x06`
352353
* - `GT911`, `GT1151`
@@ -566,7 +567,7 @@
566567
/*
567568
#define ESP_PANEL_BOARD_PRE_BEGIN_FUNCTION(p) \
568569
{ \
569-
auto board = static_cast<esp_panel::Board *>(p); \
570+
auto board = static_cast<Board *>(p); \
570571
return true; \
571572
}
572573
*/
@@ -580,7 +581,7 @@
580581
/*
581582
#define ESP_PANEL_BOARD_POST_BEGIN_FUNCTION(p) \
582583
{ \
583-
auto board = static_cast<esp_panel::Board *>(p); \
584+
auto board = static_cast<Board *>(p); \
584585
return true; \
585586
}
586587
*/
@@ -594,7 +595,7 @@
594595
/*
595596
#define ESP_PANEL_BOARD_PRE_DEL_FUNCTION(p) \
596597
{ \
597-
auto board = static_cast<esp_panel::Board *>(p); \
598+
auto board = static_cast<Board *>(p); \
598599
return true; \
599600
}
600601
*/
@@ -608,7 +609,7 @@
608609
/*
609610
#define ESP_PANEL_BOARD_POST_DEL_FUNCTION(p) \
610611
{ \
611-
auto board = static_cast<esp_panel::Board *>(p); \
612+
auto board = static_cast<Board *>(p); \
612613
return true; \
613614
}
614615
*/
@@ -622,7 +623,7 @@
622623
/*
623624
#define ESP_PANEL_BOARD_EXPANDER_PRE_BEGIN_FUNCTION(p) \
624625
{ \
625-
auto board = static_cast<esp_panel::Board *>(p); \
626+
auto board = static_cast<Board *>(p); \
626627
return true; \
627628
}
628629
*/
@@ -636,7 +637,7 @@
636637
/*
637638
#define ESP_PANEL_BOARD_EXPANDER_POST_BEGIN_FUNCTION(p) \
638639
{ \
639-
auto board = static_cast<esp_panel::Board *>(p); \
640+
auto board = static_cast<Board *>(p); \
640641
return true; \
641642
}
642643
*/
@@ -650,7 +651,7 @@
650651
/*
651652
#define ESP_PANEL_BOARD_LCD_PRE_BEGIN_FUNCTION(p) \
652653
{ \
653-
auto board = static_cast<esp_panel::Board *>(p); \
654+
auto board = static_cast<Board *>(p); \
654655
return true; \
655656
}
656657
*/
@@ -664,7 +665,7 @@
664665
/*
665666
#define ESP_PANEL_BOARD_LCD_POST_BEGIN_FUNCTION(p) \
666667
{ \
667-
auto board = static_cast<esp_panel::Board *>(p); \
668+
auto board = static_cast<Board *>(p); \
668669
return true; \
669670
}
670671
*/
@@ -678,7 +679,7 @@
678679
/*
679680
#define ESP_PANEL_BOARD_TOUCH_PRE_BEGIN_FUNCTION(p) \
680681
{ \
681-
auto board = static_cast<esp_panel::Board *>(p); \
682+
auto board = static_cast<Board *>(p); \
682683
return true; \
683684
}
684685
*/
@@ -692,7 +693,7 @@
692693
/*
693694
#define ESP_PANEL_BOARD_TOUCH_POST_BEGIN_FUNCTION(p) \
694695
{ \
695-
auto board = static_cast<esp_panel::Board *>(p); \
696+
auto board = static_cast<Board *>(p); \
696697
return true; \
697698
}
698699
*/
@@ -706,7 +707,7 @@
706707
/*
707708
#define ESP_PANEL_BOARD_BACKLIGHT_PRE_BEGIN_FUNCTION(p) \
708709
{ \
709-
auto board = static_cast<esp_panel::Board *>(p); \
710+
auto board = static_cast<Board *>(p); \
710711
return true; \
711712
}
712713
*/
@@ -720,7 +721,7 @@
720721
/*
721722
#define ESP_PANEL_BOARD_BACKLIGHT_POST_BEGIN_FUNCTION(p) \
722723
{ \
723-
auto board = static_cast<esp_panel::Board *>(p); \
724+
auto board = static_cast<Board *>(p); \
724725
return true; \
725726
}
726727
*/

0 commit comments

Comments
 (0)