Skip to content

Commit 567f0b4

Browse files
committed
feat(repo): refactor with using esp-lib-utils
1 parent f9ed184 commit 567f0b4

File tree

443 files changed

+29987
-16450
lines changed

Some content is hidden

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

443 files changed

+29987
-16450
lines changed

.codespellrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[codespell]
2-
skip = ./src/touch/base/esp_lcd_touch_xpt2046.c
2+
skip = ./src/touch/port/esp_lcd_touch_xpt2046.c,

.github/workflows/upload_component.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ jobs:
1515
- name: Upload components to component service
1616
uses: espressif/upload-components-ci-action@v1
1717
with:
18-
name: "ESP32_Display_Panel"
18+
name: "esp32_display_panel"
1919
namespace: "espressif"
2020
api_token: ${{ secrets.IDF_COMPONENT_API_TOKEN }}

.gitlab/ci/rules.yml

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# component common files
1212
.patterns-component_common: &patterns-component_common
1313
- "CMakeLists.txt"
14-
- "ESP_Panel_Conf.h"
14+
- "esp_panel_conf.h"
1515
- "idf_component.yml"
1616
- "Kconfig"
1717
- "src/*"
@@ -42,8 +42,8 @@
4242

4343
.patterns-component_bus_3wire_spi_rgb: &patterns-component_bus_3wire_spi_rgb
4444
- .patterns-component_bus_rgb
45-
- "src/bus/base/esp_lcd_panel_io_3wire_spi.c"
46-
- "src/bus/base/esp_lcd_panel_io_additions.h"
45+
- "src/bus/port/esp_lcd_panel_io_3wire_spi.c"
46+
- "src/bus/port/esp_lcd_panel_io_additions.h"
4747

4848
.patterns-component_bus_spi: &patterns-component_bus_spi
4949
- .patterns-component_bus_common
@@ -55,31 +55,31 @@
5555

5656
# component lcd files
5757
.patterns-component_lcd_common: &patterns-component_lcd_common
58-
- "src/lcd/base/esp_lcd_vendor_types.h"
58+
- "src/lcd/port/esp_panel_lcd_vendor_types.h"
5959
- "src/lcd/ESP_PanelLcd.*"
6060

6161
.patterns-component_lcd_mipi_dsi: &patterns-component_lcd_mipi_dsi
6262
- .patterns-component_bus_mipi_dsi
6363
- .patterns-component_lcd_common
64-
- "src/lcd/base/esp_lcd_ek79007.*"
64+
- "src/lcd/port/esp_lcd_ek79007.*"
6565
- "src/lcd/EK79007.*"
66-
- "src/lcd/base/esp_lcd_ili9881c.*"
66+
- "src/lcd/port/esp_lcd_ili9881c.*"
6767
- "src/lcd/ILI9881C.*"
68-
- "src/lcd/base/esp_lcd_jd9365.*"
68+
- "src/lcd/port/esp_lcd_jd9365.*"
6969
- "src/lcd/JD9365.*"
7070

7171
.patterns-component_lcd_qspi: &patterns-component_lcd_qspi
7272
- .patterns-component_bus_qspi
7373
- .patterns-component_lcd_common
74-
- "src/lcd/base/esp_lcd_gc9b71.*"
74+
- "src/lcd/port/esp_lcd_gc9b71.*"
7575
- "src/lcd/GC9B71.*"
76-
- "src/lcd/base/esp_lcd_sh8601.*"
76+
- "src/lcd/port/esp_lcd_sh8601.*"
7777
- "src/lcd/SH8601.*"
78-
- "src/lcd/base/esp_lcd_spd2010.*"
78+
- "src/lcd/port/esp_lcd_spd2010.*"
7979
- "src/lcd/SPD2010.*"
80-
- "src/lcd/base/esp_lcd_st77916.*"
80+
- "src/lcd/port/esp_lcd_st77916.*"
8181
- "src/lcd/ST77916.*"
82-
- "src/lcd/base/esp_lcd_st77922.*"
82+
- "src/lcd/port/esp_lcd_st77922.*"
8383
- "src/lcd/ST77922.*"
8484

8585
.patterns-component_lcd_rgb: &patterns-component_lcd_rgb
@@ -91,56 +91,56 @@
9191
.patterns-component_lcd_3wire_spi_rgb: &patterns-component_lcd_3wire_spi_rgb
9292
- .patterns-component_bus_3wire_spi_rgb
9393
- .patterns-component_lcd_common
94-
- "src/lcd/base/esp_lcd_gc9503.*"
94+
- "src/lcd/port/esp_lcd_gc9503.*"
9595
- "src/lcd/GC9503.*"
96-
- "src/lcd/base/esp_lcd_st7701.*"
96+
- "src/lcd/port/esp_lcd_st7701.*"
9797
- "src/lcd/ST7701.*"
9898

9999
.patterns-component_lcd_spi: &patterns-component_lcd_spi
100100
- .patterns-component_bus_spi
101101
- .patterns-component_lcd_common
102-
- "src/lcd/base/esp_lcd_gc9a01.*"
102+
- "src/lcd/port/esp_lcd_gc9a01.*"
103103
- "src/lcd/GC9A01.*"
104-
- "src/lcd/base/esp_lcd_gc9b71.*"
104+
- "src/lcd/port/esp_lcd_gc9b71.*"
105105
- "src/lcd/GC9B71.*"
106-
- "src/lcd/base/esp_lcd_ILI9341.*"
106+
- "src/lcd/port/esp_lcd_ILI9341.*"
107107
- "src/lcd/ILI9341.*"
108-
- "src/lcd/base/esp_lcd_nv3022b.*"
108+
- "src/lcd/port/esp_lcd_nv3022b.*"
109109
- "src/lcd/NV3022B.*"
110-
- "src/lcd/base/esp_lcd_sh8601.*"
110+
- "src/lcd/port/esp_lcd_sh8601.*"
111111
- "src/lcd/SH8601.*"
112-
- "src/lcd/base/esp_lcd_spd2010.*"
112+
- "src/lcd/port/esp_lcd_spd2010.*"
113113
- "src/lcd/SPD2010.*"
114-
- "src/lcd/base/esp_lcd_st7789.*"
114+
- "src/lcd/port/esp_lcd_st7789.*"
115115
- "src/lcd/ST7789.*"
116-
- "src/lcd/base/esp_lcd_st77916.*"
116+
- "src/lcd/port/esp_lcd_st77916.*"
117117
- "src/lcd/ST77916.*"
118-
- "src/lcd/base/esp_lcd_st77922.*"
118+
- "src/lcd/port/esp_lcd_st77922.*"
119119
- "src/lcd/ST77922.*"
120120

121121
# component touch files
122122
.patterns-component_touch_common: &patterns-component_touch_common
123-
- "src/touch/base/esp_lcd_touch.*"
123+
- "src/touch/port/esp_lcd_touch.*"
124124
- "src/touch/ESP_PanelTouch.*"
125125

126126
.patterns-component_touch_spi: &patterns-component_touch_spi
127127
- .patterns-component_bus_spi
128-
- "src/touch/base/esp_lcd_touch_xpt2046.*"
128+
- "src/touch/port/esp_lcd_touch_xpt2046.*"
129129
- "src/touch/XPT2046.*"
130130

131131
.patterns-component_touch_i2c: &patterns-component_touch_i2c
132132
- .patterns-component_bus_i2c
133-
- "src/touch/base/esp_lcd_touch_cst816s.*"
133+
- "src/touch/port/esp_lcd_touch_cst816s.*"
134134
- "src/touch/CST816S.*"
135-
- "src/touch/base/esp_lcd_touch_ft5x06.*"
135+
- "src/touch/port/esp_lcd_touch_ft5x06.*"
136136
- "src/touch/FT5x06.*"
137-
- "src/touch/base/esp_lcd_touch_gt911.*"
137+
- "src/touch/port/esp_lcd_touch_gt911.*"
138138
- "src/touch/GT911.*"
139-
- "src/touch/base/esp_lcd_touch_gt1151.*"
139+
- "src/touch/port/esp_lcd_touch_gt1151.*"
140140
- "src/touch/GT1151.*"
141-
- "src/touch/base/esp_lcd_touch_st7123.*"
141+
- "src/touch/port/esp_lcd_touch_st7123.*"
142142
- "src/touch/ST7123.*"
143-
- "src/touch/base/esp_lcd_touch_tt21100.*"
143+
- "src/touch/port/esp_lcd_touch_tt21100.*"
144144
- "src/touch/TT21100.*"
145145

146146
# component panel files

.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|Conf)\.h'
97+
files: '.*esp_panel_(board_custom|board_supported|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|Conf)\.h|library.properties|.*ESP_PanelVersions.h)'
105+
files: '(.*esp_panel_(board_custom|board_supported|conf)\.h|library.properties|.*esp_panel_versions.h)'
106106

107107
- repo: local
108108
hooks:

CHANGELOG.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
* fix(examples): fix WiFiClock log HTTP error code to serial console by @lboue (#97)
6464
* fix(examples): fix WiFiClock description
6565
* fix(gt911): allow to set the GT911 touch device address by @lboue (#86)
66-
* fix(conf): fix the issue that the `ESP_PANEL_EXPANDER_HOST_ID` flag is not working properly
66+
* fix(conf): fix the issue that the `ESP_PANEL_BOARD_EXPANDER_HOST_ID` flag is not working properly
6767
* fix(conf): fix `LCD Venbdor` typo (#92)
6868

6969
## v0.1.5 - 2024-07-09
@@ -74,12 +74,12 @@
7474
* feat(lvgl_port): set the lvgl task to run on the same core as the Arduino task by default
7575
* feat(board): increase the RGB pclk frequency to 26MHz for `ESP32_4848S040C_I_Y_3`
7676
* feat(board): add new board `elecrow: CROWPANEL_7_0` by @lboue (#71)
77-
* feat(conf): add connection comments for the RGB pins in *ESP_Panel_Board_Custom.h* (#58, #68)
77+
* feat(conf): add connection comments for the RGB pins in *esp_panel_board_custom.h* (#58, #68)
7878

7979
### Bugfixes:
8080

8181
* fix(panel): init expander host with correct macro (#65)
82-
* fix(panel): don't reset the LCD if the bus is RGB bus and the `ESP_PANEL_LCD_FLAGS_AUTO_DEL_PANEL_IO` is enabled
82+
* fix(panel): don't reset the LCD if the bus is RGB bus and the `ESP_PANEL_BOARD_LCD_FLAGS_ENABLE_IO_MULTIPLEX` is enabled
8383
* fix(examples): fix lvgl port rotation issue when enabling avoid tearing by @NecroMancer05
8484
* fix(pre-commit): switch to Python 3 for pre-commit @lboue (#70)
8585
* fix(docs): specify lvgl version >= v8.3.9 and < 9

CMakeLists.txt

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,9 @@ file(GLOB_RECURSE CPP_SRCS "${SRCS_DIR}/*.cpp")
44
file(GLOB_RECURSE C_SRCS "${SRCS_DIR}/*.c")
55

66
idf_component_register(
7-
SRCS
8-
${C_SRCS} ${CPP_SRCS}
9-
INCLUDE_DIRS
10-
${SRCS_DIR}
11-
REQUIRES
12-
driver esp_lcd
7+
SRCS ${C_SRCS} ${CPP_SRCS}
8+
INCLUDE_DIRS ${SRCS_DIR}
9+
REQUIRES driver esp_lcd
1310
)
1411

15-
target_compile_options(${COMPONENT_LIB} PRIVATE -Wno-missing-field-initializers -Wno-narrowing)
12+
target_compile_options(${COMPONENT_LIB} PUBLIC -Wno-missing-field-initializers)

0 commit comments

Comments
 (0)