Skip to content

Commit caa35a7

Browse files
authored
feat: Simplify main by using new esp-box, t-deck, and wrover-kit components (#6)
* feat: Simplify main by using new esp-box, t-deck, and wrover-kit components * update espp to latest main and copy sdkconfig defaults from other projects * update esp-protocols to latest * added dependencies.lock since it seems to be needed now -.- * test pinning to 5.2.2
1 parent 10e97ad commit caa35a7

13 files changed

+91
-402
lines changed

.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ jobs:
1616
- name: Build Examples
1717
uses: espressif/esp-idf-ci-action@v1
1818
with:
19-
esp_idf_version: release-v5.2
19+
esp_idf_version: v5.2.2
2020
target: esp32s3
2121
path: '.'

.github/workflows/package_main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Build Main Code
2222
uses: espressif/esp-idf-ci-action@v1
2323
with:
24-
esp_idf_version: release-v5.2
24+
esp_idf_version: v5.2.2
2525
target: esp32s3
2626
path: '.'
2727
command: 'idf.py build'

CMakeLists.txt

+13-1
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,21 @@ set(EXTRA_COMPONENT_DIRS
1111
"components/esp-protocols/components"
1212
)
1313

14+
# set the hal component to use based on the target
15+
if(IDF_TARGET STREQUAL "esp32")
16+
#append the components that we want to use
17+
set(HAL_COMPONENTS "wrover-kit")
18+
message(WARNING "ESP32 target, using components: ${HAL_COMPONENTS}")
19+
elseif(IDF_TARGET STREQUAL "esp32s3")
20+
set(HAL_COMPONENTS "t-deck esp-box")
21+
message(WARNING "ESP32-S3 target, using components: ${HAL_COMPONENTS}")
22+
else()
23+
message(FATAL_ERROR "Unsupported target: ${IDF_TARGET}")
24+
endif()
25+
1426
set(
1527
COMPONENTS
16-
"main esptool_py driver lwip button display display_drivers input_drivers logger lvgl mdns socket task tt21100 gt911 wifi gui i2c"
28+
"main esptool_py driver lwip button logger lvgl mdns socket task wifi gui nvs ${HAL_COMPONENTS}"
1729
CACHE STRING
1830
"List of components to include"
1931
)

components/esp-protocols

Submodule esp-protocols updated 259 files

components/espp

Submodule espp updated 544 files

dependencies.lock

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
dependencies:
2+
idf:
3+
component_hash: null
4+
source:
5+
type: idf
6+
version: 5.2.2
7+
manifest_hash: 3b2f19acb78af92ba73aad159d4776bc678f2d95005e555536493d6d06488be2
8+
target: esp32s3
9+
version: 1.0.0

main/Kconfig.projbuild

+4-3
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ menu "Wireless Debug Display Configuration"
66
help
77
Select the dev-kit / hardware you're using.
88
config HARDWARE_WROVER_KIT
9+
depends on IDF_TARGET_ESP32
910
bool "ESP32 WROVER KIT V4"
1011
config HARDWARE_BOX
11-
bool "ESP BOX"
12-
config HARDWARE_BOX_3
13-
bool "ESP BOX 3"
12+
depends on IDF_TARGET_ESP32S3
13+
bool "ESP BOX (ESP32-S3-BOX or ESP32-S3-BOX-3)"
1414
config HARDWARE_TDECK
15+
depends on IDF_TARGET_ESP32S3
1516
bool "LILYGO T DECK"
1617
endchoice
1718

main/box.hpp

-33
This file was deleted.

main/box_3.hpp

-35
This file was deleted.

0 commit comments

Comments
 (0)