Skip to content

Commit abacc4c

Browse files
author
MacChu0315-Espressif
committed
feat(board): add new board M5CORES3
feat(docs): update changelog feat(docs): update some docs related to version
1 parent 1886c66 commit abacc4c

File tree

9 files changed

+25
-25
lines changed

9 files changed

+25
-25
lines changed

ESP_Panel_Board_Supported.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
*
7979
*/
8080
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MAJOR 0
81-
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR 3
81+
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR 2
8282
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_PATCH 0
8383

8484
#endif

examples/LVGL/v8/Porting/ESP_Panel_Board_Supported.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
*
7979
*/
8080
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MAJOR 0
81-
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR 3
81+
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR 2
8282
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_PATCH 0
8383

8484
#endif

examples/LVGL/v8/Rotation/ESP_Panel_Board_Supported.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
*
7979
*/
8080
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MAJOR 0
81-
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR 3
81+
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR 2
8282
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_PATCH 0
8383

8484
#endif

examples/Panel/PanelTest/ESP_Panel_Board_Supported.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
*
7979
*/
8080
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MAJOR 0
81-
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR 3
81+
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR 2
8282
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_PATCH 0
8383

8484
#endif

examples/SquareLine/v8/Porting/ESP_Panel_Board_Supported.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
*
7979
*/
8080
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MAJOR 0
81-
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR 3
81+
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR 2
8282
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_PATCH 0
8383

8484
#endif

examples/SquareLine/v8/WiFiClock/ESP_Panel_Board_Supported.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
*
7979
*/
8080
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MAJOR 0
81-
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR 3
81+
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR 2
8282
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_PATCH 0
8383

8484
#endif

src/ESP_PanelVersions.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
/* File `ESP_Panel_Board_Supported.h` */
2727
#define ESP_PANEL_BOARD_SUPPORTED_VERSION_MAJOR 0
28-
#define ESP_PANEL_BOARD_SUPPORTED_VERSION_MINOR 3
28+
#define ESP_PANEL_BOARD_SUPPORTED_VERSION_MINOR 2
2929
#define ESP_PANEL_BOARD_SUPPORTED_VERSION_PATCH 0
3030

3131
/* Check if the current configuration file version is compatible with the library version */

src/board/Board_Contribution_Guide.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ pip3 install pre-commit && pre-commit install
1414

1515
## Modification Content
1616

17-
Using the adaption of the `M5Stack M5CORE2` development board as an example. Following this guide, changes below will be made under the project:
17+
Using the adaption of the [`M5Stack M5DIAL`](https://github.com/esp-arduino-libs/ESP32_Display_Panel/commit/1886c668468626b9dd2ae975f7db12df5413378e) development board as an example. Following this guide, changes below will be made under the project:
1818

1919
```
2020
| -ESP32_Display_Panel
2121
| -src
2222
| -board
2323
| -m5stack [A]
24-
| -M5CORE2.h [A]
24+
| -M5DIAL.h [A]
2525
| -ESP_PanelBoard [M]
2626
| -README.md [M]
2727
| -ESP_PanelVersions.h [M]
@@ -36,26 +36,26 @@ Note: [A] stands for 'append' and [M] stands for 'modify'
3636

3737
## Modification Process
3838

39-
Using the adaption of `M5Stack M5CORE2` as an example, follow these steps to modify the relevant files:
39+
Using the adaption of `M5Stack M5DIAL` as an example, follow these steps to modify the relevant files:
4040

41-
1. **[M]** *[ESP_Panel_Board_Supported.h](../../ESP_Panel_Board_Supported.h)*: Add a macro for the new development board, such as `BOARD_M5STACK_M5CORE2`. Ensure the macro is in uppercase. Include the manufacturer's name and link, as well as the target development board's link.
42-
2. **[A]** *[src/board/m5stack/M5CORE2.h](../board/m5stack/M5CORE2.h)*: Use the *ESP_Panel_Board_Custom.h* file in the root directory as a template to create a new configuration header file for the development board. Follow the naming conventions of existing development boards.
41+
1. **[M]** *[ESP_Panel_Board_Supported.h](../../ESP_Panel_Board_Supported.h)*: Add a macro for the new development board, such as `BOARD_M5STACK_M5DIAL`. Ensure the macro is in uppercase. Include the manufacturer's name and link, as well as the target development board's link.
42+
2. **[A]** *[src/board/m5stack/M5DIAL.h](../board/m5stack/M5DIAL.h)*: Use the *ESP_Panel_Board_Custom.h* file in the root directory as a template to create a new configuration header file for the development board. Follow the naming conventions of existing development boards.
4343
3. **[M]** *[src/board/ESP_PanelBoard.h](../board/ESP_PanelBoard.h)*: Add the macro check for the new development board by referring to the existing boards in the file, and modify the file to use the correct header file for this development board.
4444

4545
**Note**: At this point, you can verify the above steps:
4646

4747
- Choose an example, such as *[examples/Panel/PanelTest](../../examples/Panel/PanelTest/)*.
48-
- modify the macro `ESP_PANEL_USE_SUPPORTED_BOARD` to enable this header file. Define the development board macro, such as `BOARD_M5STACK_M5CORE2`, to enable the new header file *[src/board/m5stack/M5CORE2.h](../board/m5stack/M5CORE2.h)*.
48+
- modify the macro `ESP_PANEL_USE_SUPPORTED_BOARD` to enable this header file. Define the development board macro, such as `BOARD_M5STACK_M5DIAL`, to enable the new header file *[src/board/m5stack/M5DIAL.h](../board/m5stack/M5DIAL.h)*.
4949
- Verify the example's ino file. If successful, proceed to the following steps.
5050

51-
4. **[M]** *[src/board/m5stack/M5CORE2.h](../board/m5stack/M5CORE2.h)*: Modify the configuration header file for the new development board:
51+
4. **[M]** *[src/board/m5stack/M5DIAL.h](../board/m5stack/M5DIAL.h)*: Modify the configuration header file for the new development board:
5252
- Review the hardware schematics of the development board, focusing on the BUS type used for the LCD screen, the LCD driver name, the BUS type used for touch, the touch driver name, and the chip pin numbers used for each interface of the LCD and touch.
5353
- The best practice is to first get the screen working, then work on the touch functionality.
5454
- If the new development board's driver is compatible with an existing driver, there is no need to add a new driver. Simply note in the comments that this driver is compatible with an existing one and use the existing driver.
55-
- If the driver used by the new development board is not compatible with existing drivers or has other special configurations, you can achieve this by modifying the macro functions at the end of the new development board's configuration header file, such as `ESP_PANEL_BEGIN_BACKLIGHT_START_FUNCTION`, `ESP_PANEL_BEGIN_END_FUNCTION`, etc. Refer to *[src/board/espressif/ESP32_S3_BOX_3.h](../board/espressif/ESP32_S3_BOX_3.h)* or *[src/board/m5stack/M5CORE2.h](../board/m5stack/M5CORE2.h)* for specific implementations.
55+
- If the driver used by the new development board is not compatible with existing drivers or has other special configurations, you can achieve this by modifying the macro functions at the end of the new development board's configuration header file, such as `ESP_PANEL_BEGIN_BACKLIGHT_START_FUNCTION`, `ESP_PANEL_BEGIN_END_FUNCTION`, etc. Refer to *[src/board/espressif/ESP32_S3_BOX_3.h](../board/espressif/ESP32_S3_BOX_3.h)* or *[src/board/m5stack/M5DIAL.h](../board/m5stack/M5DIAL.h)* for specific implementations.
5656
- Run examples other than *[examples/LCD](../../examples/LCD/)* and *[examples/Touch](../../examples/Touch/)*, and continuously adjust the configuration header file to ensure correct settings.
5757

5858
5. **[M]** *[ESP_Panel_Board_Supported](../../ESP_Panel_Board_Supported.h)*, *[library.properties](../../library.properties)*, *[board/Board_Instructions.md](../board/Board_Instructions.md)*, *[README_CN.md](../../README_CN.md)*, *[README.md](../../README.md)*: Update the supported development boards information in these files.
5959
6. **[M]** *[src/board/Board_Instructions.md](../board/Board_Instructions.md)*: Update the recommended configuration for the new development board.
60-
7. **[M]** *[src/ESP_PanelVersions.h](../ESP_PanelVersions.h)*: Ensure that the version under `Library Version` should be ahead of the latest tag version in terms of the minor version; when changes occur to *[ESP_Panel_Board_Custom.h](../../ESP_Panel_Board_Custom.h)*, *[ESP_Panel_Board_Supported.h](../../ESP_Panel_Board_Supported.h)*, and *[ESP_Panel_Conf.h](../../ESP_Panel_Conf.h)* in the root directory, the minor version number but patch version number at the end of the corresponding file and at the beginging of *[src/ESP_PanelVersions.h](../ESP_PanelVersions.h)* should be increased by one and reset the patch version number to 0.
60+
7. **[M]** *[src/ESP_PanelVersions.h](../ESP_PanelVersions.h)*: Ensure that the version under `Library Version` should be ahead of the latest tag version in terms of the tag version; when changes occur to *[ESP_Panel_Board_Custom.h](../../ESP_Panel_Board_Custom.h)*, *[ESP_Panel_Board_Supported.h](../../ESP_Panel_Board_Supported.h)*, and *[ESP_Panel_Conf.h](../../ESP_Panel_Conf.h)* in the root directory, ensure that the version number at the end of the corresponding file and at the beginging of *[src/ESP_PanelVersions.h](../ESP_PanelVersions.h)* should be ahead of the latest tag version in terms of the minor version.
6161
8. **[M]** *[CHANGELOG.md](../../CHANGELOG.md)*: Update the changelog.

src/board/Board_Contribution_Guide_CN.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ pip3 install pre-commit && pre-commit install
1414

1515
## 需修改内容
1616

17-
以适配 `M5Stack M5CORE2` 开发板为例。按照本指南,以下更改将在项目中进行:
17+
以适配 [`M5Stack M5DIAL`](https://github.com/esp-arduino-libs/ESP32_Display_Panel/commit/1886c668468626b9dd2ae975f7db12df5413378e) 开发板为例。按照本指南,以下更改将在项目中进行:
1818

1919
```
2020
| -ESP32_Display_Panel
2121
| -src
2222
| -board
2323
| -m5stack [A]
24-
| -M5CORE2.h [A]
24+
| -M5DIAL.h [A]
2525
| -ESP_PanelBoard [M]
2626
| -README.md [M]
2727
| -ESP_PanelVersions.h [M]
@@ -36,26 +36,26 @@ pip3 install pre-commit && pre-commit install
3636

3737
## 各文件修改流程
3838

39-
以适配 `M5Stack M5CORE2` 为例,按照以下步骤修改相关文件:
39+
以适配 `M5Stack M5DIAL` 为例,按照以下步骤修改相关文件:
4040

41-
1. **[M]** *[ESP_Panel_Board_Supported.h](../../ESP_Panel_Board_Supported.h)*:为新开发板添加一个宏,例如 `BOARD_M5STACK_M5CORE2`。命名时注意宏名大写。注意附上开发板制造商的名称和链接,以及目标开发板的链接。
42-
2. **[A]** *[src/board/m5stack/M5CORE2.h](../board/m5stack/M5CORE2.h)*:使用根目录中的 *ESP_Panel_Board_Custom.h* 文件作为模板,为开发板创建一个新的配置头文件。文件命名请参考已有开发板。
41+
1. **[M]** *[ESP_Panel_Board_Supported.h](../../ESP_Panel_Board_Supported.h)*:为新开发板添加一个宏,例如 `BOARD_M5STACK_M5DIAL`。命名时注意宏名大写。注意附上开发板制造商的名称和链接,以及目标开发板的链接。
42+
2. **[A]** *[src/board/m5stack/M5DIAL.h](../board/m5stack/M5DIAL.h)*:使用根目录中的 *ESP_Panel_Board_Custom.h* 文件作为模板,为开发板创建一个新的配置头文件。文件命名请参考已有开发板。
4343
3. **[M]** *[src/board/ESP_PanelBoard.h](../board/ESP_PanelBoard.h)*:参照文件中其他开发板的写法,添加新开发板的宏名判断,并注意修改此开发板所使用的头文件。
4444

4545
**注意**:此时,可以验证上述步骤:
4646

4747
- 选择一个示例,例如 *[examples/Panel/PanelTest](../../examples/Panel/PanelTest/)*
48-
- 修改宏 `ESP_PANEL_USE_SUPPORTED_BOARD` 以启用此头文件。定义开发板宏,例如 `BOARD_M5STACK_M5CORE2`,以启用新的头文件 *[src/board/m5stack/M5CORE2.h](../board/m5stack/M5CORE2.h)*
48+
- 修改宏 `ESP_PANEL_USE_SUPPORTED_BOARD` 以启用此头文件。定义开发板宏,例如 `BOARD_M5STACK_M5DIAL`,以启用新的头文件 *[src/board/m5stack/M5DIAL.h](../board/m5stack/M5DIAL.h)*
4949
- 验证示例的 ino 文件。如果成功,继续后续步骤。
5050

51-
4. **[M]** *[src/board/m5stack/M5CORE2.h](../board/m5stack/M5CORE2.h)*:修改新开发板的配置头文件:
51+
4. **[M]** *[src/board/m5stack/M5DIAL.h](../board/m5stack/M5DIAL.h)*:修改新开发板的配置头文件:
5252
- 审查开发板的硬件原理图,重点关注LCD 屏幕所使用 BUS 类型、 LCD 驱动名、touch 所使用 BUS 类型、touch 驱动名,以及 LCD 和 touch 各接口所使用的芯片管脚号。
5353
- 修改技巧是先亮屏再 touch。
5454
- 如果新开发板的驱动程序与现有驱动程序兼容,则无需添加新驱动程序。只需在注释中注明该驱动程序与现有驱动程序兼容,并使用现有驱动程序。
55-
- 如果新开发板使用的驱动程序与现有驱动程序不兼容或有其他特殊配置,可以通过修改新开发板配置头文件末尾的宏函数来实现,例如 `ESP_PANEL_BEGIN_BACKLIGHT_START_FUNCTION``ESP_PANEL_BEGIN_END_FUNCTION` 等。具体实现请参考 *[src/board/espressif/ESP32_S3_BOX_3.h](../board/espressif/ESP32_S3_BOX_3.h)**[src/board/m5stack/M5CORE2.h](../board/m5stack/M5CORE2.h)*
55+
- 如果新开发板使用的驱动程序与现有驱动程序不兼容或有其他特殊配置,可以通过修改新开发板配置头文件末尾的宏函数来实现,例如 `ESP_PANEL_BEGIN_BACKLIGHT_START_FUNCTION``ESP_PANEL_BEGIN_END_FUNCTION` 等。具体实现请参考 *[src/board/espressif/ESP32_S3_BOX_3.h](../board/espressif/ESP32_S3_BOX_3.h)**[src/board/m5stack/M5DIAL.h](../board/m5stack/M5DIAL.h)*
5656
- 运行除 *[examples/LCD](../../examples/LCD/)**[examples/Touch](../../examples/Touch/)* 以外的示例,并不断调整配置头文件以确保设置正确。
5757

5858
5. **[M]** *[ESP_Panel_Board_Supported](../../ESP_Panel_Board_Supported.h)**[library.properties](../../library.properties)**[board/Board_Instructions.md](../board/Board_Instructions.md)**[README_CN.md](../../README_CN.md)**[README.md](../../README.md)*:更新上述文件中“已支持开发板”说明。
5959
6. **[M]** *[src/board/Board_Instructions.md](../board/Board_Instructions.md)*:更新新开发板的推荐配置。
60-
7. **[M]** *[src/ESP_PanelVersions.h](../ESP_PanelVersions.h)*:确保 `Library Version` 下的版本应领先于最新标签版本的小版本;当根目录下的 *[ESP_Panel_Board_Custom.h](../../ESP_Panel_Board_Custom.h)**[ESP_Panel_Board_Supported.h](../../ESP_Panel_Board_Supported.h)**[ESP_Panel_Conf.h](../../ESP_Panel_Conf.h)* 发生变化时,相应文件末尾和 *[src/ESP_PanelVersions.h](../ESP_PanelVersions.h)* 开头的小版本号应增加一个,并将补丁版本号重置为 0
60+
7. **[M]** *[src/ESP_PanelVersions.h](../ESP_PanelVersions.h)*:确保 `Library Version` 下的版本应小版本领先于最新 tag 版本。当根目录下的 *[ESP_Panel_Board_Custom.h](../../ESP_Panel_Board_Custom.h)**[ESP_Panel_Board_Supported.h](../../ESP_Panel_Board_Supported.h)**[ESP_Panel_Conf.h](../../ESP_Panel_Conf.h)* 发生变化时,相应文件末尾和 *[src/ESP_PanelVersions.h](../ESP_PanelVersions.h)* 开头的版本号应中版本领先于最新 tag 版本
6161
8. **[M]** *[CHANGELOG.md](../../CHANGELOG.md)*:更新变更日志。

0 commit comments

Comments
 (0)