Skip to content

Commit 293faff

Browse files
authored
Merge pull request #66 from esp-arduino-libs/bugfix/fix_expander_use_touch_host
fix(panel): init expander host with correct macro
2 parents c695ee2 + 291b060 commit 293faff

File tree

16 files changed

+122
-78
lines changed

16 files changed

+122
-78
lines changed

CHANGELOG.md

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

3+
## v0.1.5 - 2024-07-01
4+
5+
### Bugfixes:
6+
7+
* fix(panel): init expander host with correct macro (#65)
8+
39
## v0.1.4 - 2024-06-17
410

511
### Enhancements:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ To port the SquareLine project (v1.3.x), please refer to [here](#porting-squarel
309309

310310
### Configuring Supported Development Boards
311311

312-
For details on how to configure the supported development boards in the Arduino IDE, see [Board_Instructions.md](./src/board/Board_Instructions.md).
312+
For details on how to configure the supported development boards in the Arduino IDE, see [Board_Instructions.md](./src/board/Board_Instructions.md#recommended-configurations-in-the-arduino-ide).
313313

314314
### Configuring LVGL
315315

README_CN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ ESP32_Display_Panel 会根据 [ESP_Panel_Board_Custom.h](./ESP_Panel_Board_Custo
309309

310310
### 配置支持的开发板
311311

312-
关于如何在 Arduino IDE 中配置支持的开发板,请参考 [Board_Instructions.md](./src/board/Board_Instructions.md).
312+
关于如何在 Arduino IDE 中配置支持的开发板,请参考 [Board_Instructions.md](./src/board/Board_Instructions.md#recommended-configurations-in-the-arduino-ide).
313313

314314
### 配置 LVGL
315315

examples/LVGL/v8/Porting/Porting.ino

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,22 @@
1111
*
1212
* Then follow the steps below to configure:
1313
*
14+
* Follow the steps below to configure:
15+
*
1416
* 1. For **ESP32_Display_Panel**:
1517
*
16-
* - [Configure drivers](https://github.com/esp-arduino-libs/ESP32_Display_Panel#configuring-drivers) if needed.
17-
* - If using a supported development board, follow the [steps](https://github.com/esp-arduino-libs/ESP32_Display_Panel#using-supported-development-boards) to configure it.
18-
* - If using a custom board, follow the [steps](https://github.com/esp-arduino-libs/ESP32_Display_Panel#using-custom-development-boards) to configure it.
18+
* - Follow the [steps](https://github.com/esp-arduino-libs/ESP32_Display_Panel#configuring-drivers) to configure drivers if needed.
19+
* - If using a supported development board, follow the [steps](https://github.com/esp-arduino-libs/ESP32_Display_Panel#using-supported-development-boards) to configure it.
20+
* - If using a custom board, follow the [steps](https://github.com/esp-arduino-libs/ESP32_Display_Panel#using-custom-development-boards) to configure it.
21+
*
22+
* 2. For **lvgl**:
23+
*
24+
* - Follow the [steps](https://github.com/esp-arduino-libs/ESP32_Display_Panel#configuring-lvgl) to add *lv_conf.h* file and change the configurations.
25+
* - Modify the macros in the [lvgl_port_v8.h](./lvgl_port_v8.h) file to configure the LVGL porting parameters.
1926
*
20-
* 2. Follow the [steps](https://github.com/esp-arduino-libs/ESP32_Display_Panel#configuring-lvgl) to configure the **lvgl**.
21-
* 3. Modify the macros in the [lvgl_port_v8.h](./lvgl_port_v8.h) file to configure the LVGL porting parameters.
22-
* 4. Navigate to the `Tools` menu in the Arduino IDE to choose a ESP board and configure its parameters, please refter to [Configuring Supported Development Boards](https://github.com/esp-arduino-libs/ESP32_Display_Panel#configuring-supported-development-boards)
23-
* 5. Verify and upload the example to your ESP board.
27+
* 3. Navigate to the `Tools` menu in the Arduino IDE to choose a ESP board and configure its parameters. For supported
28+
* boards, please refter to [Configuring Supported Development Boards](https://github.com/esp-arduino-libs/ESP32_Display_Panel#configuring-supported-development-boards)
29+
* 4. Verify and upload the example to your ESP board.
2430
*
2531
* ## Serial Output
2632
*

examples/LVGL/v8/Porting/README.md

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,21 @@ To use this example, please firstly install the following dependent libraries:
88

99
- lvgl (v8.3.x)
1010

11-
Then follow the steps below to configure:
11+
Follow the steps below to configure:
1212

1313
1. For **ESP32_Display_Panel**:
1414

15-
- [Configure drivers](../../../README.md#configuring-drivers) if needed.
16-
- If using a supported development board, follow the [steps](../../../../README.md#using-supported-development-boards) to configure it.
17-
- If using a custom board, follow the [steps](../../../../README.md#using-custom-development-boards) to configure it.
15+
- Follow the [steps](../../README.md#configuring-drivers) to configure drivers if needed.
16+
- If using a supported development board, follow the [steps](../../README.md#using-supported-development-boards) to configure it.
17+
- If using a custom board, follow the [steps](../../README.md#using-custom-development-boards) to configure it.
1818

19-
2. Follow the [steps](../../../../README.md#configuring-lvgl) to configure the **lvgl**.
20-
3. Modify the macros in the [lvgl_port_v8.h](./lvgl_port_v8.h) file to configure the LVGL porting parameters.
21-
4. Navigate to the `Tools` menu in the Arduino IDE to choose a ESP board and configure its parameters, please refter to [Configuring Supported Development Boards](../../../../README.md#configuring-supported-development-boards)
22-
5. Verify and upload the example to your ESP board.
19+
2. For **lvgl**:
20+
21+
- Follow the [steps](../../README.md#configuring-lvgl) to add *lv_conf.h* file and change the configurations.
22+
- Modify the macros in the [lvgl_port_v8.h](./lvgl_port_v8.h) file to configure the LVGL porting parameters.
23+
24+
3. Navigate to the `Tools` menu in the Arduino IDE to choose a ESP board and configure its parameters. For supported boards, please refter to [Configuring Supported Development Boards](../../README.md#configuring-supported-development-boards)
25+
4. Verify and upload the example to your ESP board.
2326

2427
## Serial Output
2528

examples/LVGL/v8/Rotation/README.md

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,17 @@ Then follow the steps below to configure:
1212

1313
1. For **ESP32_Display_Panel**:
1414

15-
- [Configure drivers](../../../README.md#configuring-drivers) if needed.
16-
- If using a supported development board, follow the [steps](../../../../README.md#using-supported-development-boards) to configure it.
17-
- If using a custom board, follow the [steps](../../../../README.md#using-custom-development-boards) to configure it.
18-
19-
2. Follow the [steps](../../../../README.md#configuring-lvgl) to configure the **lvgl**.
20-
3. Modify the macros in the [lvgl_port_v8.h](./lvgl_port_v8.h) file to configure the LVGL porting parameters.
21-
4. Navigate to the `Tools` menu in the Arduino IDE to choose a ESP board and configure its parameters, please refter to [Configuring Supported Development Boards](../../../../README.md#configuring-supported-development-boards)
22-
5. Verify and upload the example to your ESP board.
15+
- Follow the [steps](../../README.md#configuring-drivers) to configure drivers if needed.
16+
- If using a supported development board, follow the [steps](../../README.md#using-supported-development-boards) to configure it.
17+
- If using a custom board, follow the [steps](../../README.md#using-custom-development-boards) to configure it.
18+
19+
2. For **lvgl**:
20+
21+
- Follow the [steps](../../README.md#configuring-lvgl) to add *lv_conf.h* file and change the configurations.
22+
- Modify the macros in the [lvgl_port_v8.h](./lvgl_port_v8.h) file to configure the LVGL porting parameters.
23+
24+
3. Navigate to the `Tools` menu in the Arduino IDE to choose a ESP board and configure its parameters. For supported boards, please refter to [Configuring Supported Development Boards](../../README.md#configuring-supported-development-boards)
25+
4. Verify and upload the example to your ESP board.
2326

2427
## Serial Output
2528

examples/LVGL/v8/Rotation/Rotation.ino

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,22 @@
99
*
1010
* - lvgl (v8.3.x)
1111
*
12-
* Then follow the steps below to configure:
12+
* Follow the steps below to configure:
1313
*
1414
* 1. For **ESP32_Display_Panel**:
1515
*
16-
* - [Configure drivers](https://github.com/esp-arduino-libs/ESP32_Display_Panel#configuring-drivers) if needed.
16+
* - Follow the [steps](https://github.com/esp-arduino-libs/ESP32_Display_Panel#configuring-drivers) to configure drivers if needed.
1717
* - If using a supported development board, follow the [steps](https://github.com/esp-arduino-libs/ESP32_Display_Panel#using-supported-development-boards) to configure it.
1818
* - If using a custom board, follow the [steps](https://github.com/esp-arduino-libs/ESP32_Display_Panel#using-custom-development-boards) to configure it.
1919
*
20-
* 2. Follow the [steps](https://github.com/esp-arduino-libs/ESP32_Display_Panel#configuring-lvgl) to configure the **lvgl**.
21-
* 3. Modify the macros in the [lvgl_port_v8.h](./lvgl_port_v8.h) file to configure the LVGL porting parameters.
22-
* 4. Navigate to the `Tools` menu in the Arduino IDE to choose a ESP board and configure its parameters, please refter to [Configuring Supported Development Boards](https://github.com/esp-arduino-libs/ESP32_Display_Panel#configuring-supported-development-boards)
23-
* 5. Verify and upload the example to your ESP board.
20+
* 2. For **lvgl**:
21+
*
22+
* - Follow the [steps](https://github.com/esp-arduino-libs/ESP32_Display_Panel#configuring-lvgl) to add *lv_conf.h* file and change the configurations.
23+
* - Modify the macros in the [lvgl_port_v8.h](./lvgl_port_v8.h) file to configure the LVGL porting parameters.
24+
*
25+
* 3. Navigate to the `Tools` menu in the Arduino IDE to choose a ESP board and configure its parameters. For supported
26+
* boards, please refter to [Configuring Supported Development Boards](https://github.com/esp-arduino-libs/ESP32_Display_Panel#configuring-supported-development-boards)
27+
* 4. Verify and upload the example to your ESP board.
2428
*
2529
* ## Serial Output
2630
*

examples/Panel/PanelTest/PanelTest.ino

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,15 @@
77
*
88
* Follow the steps below to configure:
99
*
10-
* 1. [Configure drivers](https://github.com/esp-arduino-libs/ESP32_Display_Panel#configuring-drivers) if needed.
11-
* 2. If using a supported development board, follow the [steps](https://github.com/esp-arduino-libs/ESP32_Display_Panel#using-supported-development-boards) to configure it.
12-
* 3. If using a custom board, follow the [steps](https://github.com/esp-arduino-libs/ESP32_Display_Panel#using-custom-development-boards) to configure it.
13-
* 4. Navigate to the `Tools` menu in the Arduino IDE to choose a ESP board and configure its parameters, please refter to [Configuring Supported Development Boards](https://github.com/esp-arduino-libs/ESP32_Display_Panel#configuring-supported-development-boards)
14-
* 5. Verify and upload the example to your ESP board.
10+
* 1. For **ESP32_Display_Panel**:
11+
*
12+
* - Follow the [steps](https://github.com/esp-arduino-libs/ESP32_Display_Panel#configuring-drivers) to configure drivers if needed.
13+
* - If using a supported development board, follow the [steps](https://github.com/esp-arduino-libs/ESP32_Display_Panel#using-supported-development-boards) to configure it.
14+
* - If using a custom board, follow the [steps](https://github.com/esp-arduino-libs/ESP32_Display_Panel#using-custom-development-boards) to configure it.
15+
*
16+
* 2. Navigate to the `Tools` menu in the Arduino IDE to choose a ESP board and configure its parameters. For supported
17+
* boards, please refter to [Configuring Supported Development Boards](https://github.com/esp-arduino-libs/ESP32_Display_Panel#configuring-supported-development-boards)
18+
* 3. Verify and upload the example to your ESP board.
1519
*
1620
* ## Serial Output
1721
*

examples/Panel/PanelTest/README.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,14 @@ The example demonstrates how to develop built-in or custom development boards us
66

77
Follow the steps below to configure:
88

9-
1. [Configure drivers](../../../README.md#configuring-drivers) if needed.
10-
2. If using a supported development board, follow the [steps](../../../README.md#using-supported-development-boards) to configure it.
11-
3. If using a custom board, follow the [steps](../../../README.md#using-custom-development-boards) to configure it.
12-
4. Navigate to the `Tools` menu in the Arduino IDE to choose a ESP board and configure its parameters, please refter to [Configuring Supported Development Boards](../../../README.md#configuring-supported-development-boards)
13-
5. Verify and upload the example to your ESP board.
9+
1. For **ESP32_Display_Panel**:
10+
11+
- Follow the [steps](../../README.md#configuring-drivers) to configure drivers if needed.
12+
- If using a supported development board, follow the [steps](../../README.md#using-supported-development-boards) to configure it.
13+
- If using a custom board, follow the [steps](../../README.md#using-custom-development-boards) to configure it.
14+
15+
3. Navigate to the `Tools` menu in the Arduino IDE to choose a ESP board and configure its parameters. For supported boards, please refter to [Configuring Supported Development Boards](../../README.md#configuring-supported-development-boards)
16+
4. Verify and upload the example to your ESP board.
1417

1518
## Serial Output
1619

examples/SquareLine/v8/Porting/Porting.ino

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,22 @@
99
*
1010
* - lvgl (v8.3.x)
1111
*
12-
* Then follow the steps below to configure:
12+
* Follow the steps below to configure:
1313
*
1414
* 1. For **ESP32_Display_Panel**:
1515
*
16-
* - [Configure drivers](https://github.com/esp-arduino-libs/ESP32_Display_Panel#configuring-drivers) if needed.
17-
* - If using a supported development board, follow the [steps](https://github.com/esp-arduino-libs/ESP32_Display_Panel#using-supported-development-boards) to configure it.
18-
* - If using a custom board, follow the [steps](https://github.com/esp-arduino-libs/ESP32_Display_Panel#using-custom-development-boards) to configure it.
16+
* - Follow the [steps](https://github.com/esp-arduino-libs/ESP32_Display_Panel#configuring-drivers) to configure drivers if needed.
17+
* - If using a supported development board, follow the [steps](https://github.com/esp-arduino-libs/ESP32_Display_Panel#using-supported-development-boards) to configure it.
18+
* - If using a custom board, follow the [steps](https://github.com/esp-arduino-libs/ESP32_Display_Panel#using-custom-development-boards) to configure it.
1919
*
20-
* 2. Follow the [steps](https://github.com/esp-arduino-libs/ESP32_Display_Panel#configuring-lvgl) to configure the **lvgl**.
21-
* 3. To directly use the example, please copy the [ui](./libraries/ui/) folder from `libraries` to [Arduino Library directory](https://github.com/esp-arduino-libs/ESP32_Display_Panel#where-is-the-directory-for-arduino-libraries). What's more, you can follow the [steps](https://github.com/esp-arduino-libs/ESP32_Display_Panel#porting-squareline-project) to port your own **SquareLine** project.
22-
* 4. Modify the macros in the [lvgl_port_v8.h](./lvgl_port_v8.h) file to configure the LVGL porting parameters.
23-
* 5. Navigate to the `Tools` menu in the Arduino IDE to choose a ESP board and configure its parameters, please refter to [Configuring Supported Development Boards](https://github.com/esp-arduino-libs/ESP32_Display_Panel#configuring-supported-development-boards)
24-
* 6. Verify and upload the example to your ESP board.
20+
* 2. For **lvgl**:
21+
*
22+
* - Follow the [steps](https://github.com/esp-arduino-libs/ESP32_Display_Panel#configuring-lvgl) to add *lv_conf.h* file and change the configurations.
23+
* - Modify the macros in the [lvgl_port_v8.h](./lvgl_port_v8.h) file to configure the LVGL porting parameters.
24+
*
25+
* 3. Navigate to the `Tools` menu in the Arduino IDE to choose a ESP board and configure its parameters. For supported
26+
* boards, please refter to [Configuring Supported Development Boards](https://github.com/esp-arduino-libs/ESP32_Display_Panel#configuring-supported-development-boards)
27+
* 4. Verify and upload the example to your ESP board.
2528
*
2629
* ## Serial Output
2730
*

examples/SquareLine/v8/Porting/README.md

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,18 @@ Then follow the steps below to configure:
1212

1313
1. For **ESP32_Display_Panel**:
1414

15-
- [Configure drivers](../../../README.md#configuring-drivers) if needed.
16-
- If using a supported development board, follow the [steps](../../../../README.md#using-supported-development-boards) to configure it.
17-
- If using a custom board, follow the [steps](../../../../README.md#using-custom-development-boards) to configure it.
15+
- [Configure drivers](../../../../README.md#configuring-drivers) if needed.
16+
- If using a supported development board, follow the [steps](../../../../README.md#using-supported-development-boards) to configure it.
17+
- If using a custom board, follow the [steps](../../../../README.md#using-custom-development-boards) to configure it.
18+
19+
2. For **lvgl**:
20+
21+
- Follow the [steps](../../README.md#configuring-lvgl) to add *lv_conf.h* file and change the configurations.
22+
- Modify the macros in the [lvgl_port_v8.h](./lvgl_port_v8.h) file to configure the LVGL porting parameters.
1823

19-
2. Follow the [steps](../../../../README.md#configuring-lvgl) to configure the **lvgl**.
2024
3. To directly use the example, please copy the [ui](./libraries/ui/) folder from `libraries` to [Arduino Library directory](../../../../README.md#where-is-the-directory-for-arduino-libraries). What's more, you can follow the [steps](../../../../README.md#porting-squareline-project) to port your own **SquareLine** project.
21-
4. Modify the macros in the [lvgl_port_v8.h](./lvgl_port_v8.h) file to configure the LVGL porting parameters.
22-
5. Navigate to the `Tools` menu in the Arduino IDE to choose a ESP board and configure its parameters, please refter to [Configuring Supported Development Boards](../../../../README.md#configuring-supported-development-boards)
23-
6. Verify and upload the example to your ESP board.
25+
4. Navigate to the `Tools` menu in the Arduino IDE to choose a ESP board and configure its parameters. For supported boards, please refter to [Configuring Supported Development Boards](../../README.md#configuring-supported-development-boards)
26+
5. Verify and upload the example to your ESP board.
2427

2528
## Serial Output
2629

examples/SquareLine/v8/WiFiClock/README.md

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,24 @@ Then follow the steps below to configure the example.
1414

1515
1. For **ESP32_Display_Panel**:
1616

17-
- [Configure drivers](../../../README.md#configuring-drivers) if needed.
18-
- If using a supported development board, follow the [steps](../../../../README.md#using-supported-development-boards) to configure it.
19-
- If using a custom board, follow the [steps](../../../../README.md#using-custom-development-boards) to configure it.
17+
- [Configure drivers](../../../../README.md#configuring-drivers) if needed.
18+
- If using a supported development board, follow the [steps](../../../../README.md#using-supported-development-boards) to configure it.
19+
- If using a custom board, follow the [steps](../../../../README.md#using-custom-development-boards) to configure it.
2020

2121
2. Copy the [ui](./libraries/ui/) folder from `libraries` to [Arduino Library directory](../../../../README.md#where-is-the-directory-for-arduino-libraries).
2222

23-
3. Follow the [steps](../../../../README.md#configuring-lvgl) to configure the **lvgl**. Additionally, set the following configurations to `1`:
23+
3. For **lvgl**:
2424

25-
- `LV_FONT_MONTSERRAT_12`
26-
- `LV_FONT_MONTSERRAT_14`
27-
- `LV_FONT_MONTSERRAT_16`
28-
- `LV_FONT_MONTSERRAT_32`
29-
- `LV_FONT_MONTSERRAT_48`
30-
- `LV_USE_LARGE_COORD`
25+
- Follow the [steps](../../../../README.md#configuring-lvgl) to add *lv_conf.h* file and change the configurations. Additionally, set the following configurations to `1`:
26+
27+
- `LV_FONT_MONTSERRAT_12`
28+
- `LV_FONT_MONTSERRAT_14`
29+
- `LV_FONT_MONTSERRAT_16`
30+
- `LV_FONT_MONTSERRAT_32`
31+
- `LV_FONT_MONTSERRAT_48`
32+
- `LV_USE_LARGE_COORD`
33+
34+
- Modify the macros in the [lvgl_port_v8.h](./lvgl_port_v8.h) file to configure the LVGL porting parameters.
3135

3236
4. Modify the macros in the [lvgl_port_v8.h](./lvgl_port_v8.h) file to configure the LVGL porting parameters.
3337
5. To obtain weather information after connecting to Wi-Fi, please follow these steps to configure the example:
@@ -59,4 +63,4 @@ wifi_list_switch: false
5963

6064
## Troubleshooting
6165

62-
Please check the [FAQ](../../../../README.md#faq) first to see if the same question exists. If not, please create a [Github issue](https://github.com/esp-arduino-libs/ESP32_Display_Panel/issues). We will get back to you as soon as possible.
66+
Please check the [FAQ](../../../../README.md#faq) first to see if the same question exists. If not, please create a [Github issue](../../../../README.md/issues). We will get back to you as soon as possible.

0 commit comments

Comments
 (0)