Skip to content

feat: Simplify main by using new esp-box, t-deck, and wrover-kit components #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jul 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ jobs:
- name: Build Examples
uses: espressif/esp-idf-ci-action@v1
with:
esp_idf_version: release-v5.2
esp_idf_version: v5.2.2
target: esp32s3
path: '.'
2 changes: 1 addition & 1 deletion .github/workflows/package_main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Build Main Code
uses: espressif/esp-idf-ci-action@v1
with:
esp_idf_version: release-v5.2
esp_idf_version: v5.2.2
target: esp32s3
path: '.'
command: 'idf.py build'
Expand Down
14 changes: 13 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,21 @@ set(EXTRA_COMPONENT_DIRS
"components/esp-protocols/components"
)

# set the hal component to use based on the target
if(IDF_TARGET STREQUAL "esp32")
#append the components that we want to use
set(HAL_COMPONENTS "wrover-kit")
message(WARNING "ESP32 target, using components: ${HAL_COMPONENTS}")
elseif(IDF_TARGET STREQUAL "esp32s3")
set(HAL_COMPONENTS "t-deck esp-box")
message(WARNING "ESP32-S3 target, using components: ${HAL_COMPONENTS}")
else()
message(FATAL_ERROR "Unsupported target: ${IDF_TARGET}")
endif()

set(
COMPONENTS
"main esptool_py driver lwip button display display_drivers input_drivers logger lvgl mdns socket task tt21100 gt911 wifi gui i2c"
"main esptool_py driver lwip button logger lvgl mdns socket task wifi gui nvs ${HAL_COMPONENTS}"
CACHE STRING
"List of components to include"
)
Expand Down
2 changes: 1 addition & 1 deletion components/esp-protocols
Submodule esp-protocols updated 259 files
2 changes: 1 addition & 1 deletion components/espp
Submodule espp updated 544 files
9 changes: 9 additions & 0 deletions dependencies.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
dependencies:
idf:
component_hash: null
source:
type: idf
version: 5.2.2
manifest_hash: 3b2f19acb78af92ba73aad159d4776bc678f2d95005e555536493d6d06488be2
target: esp32s3
version: 1.0.0
7 changes: 4 additions & 3 deletions main/Kconfig.projbuild
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@ menu "Wireless Debug Display Configuration"
help
Select the dev-kit / hardware you're using.
config HARDWARE_WROVER_KIT
depends on IDF_TARGET_ESP32
bool "ESP32 WROVER KIT V4"
config HARDWARE_BOX
bool "ESP BOX"
config HARDWARE_BOX_3
bool "ESP BOX 3"
depends on IDF_TARGET_ESP32S3
bool "ESP BOX (ESP32-S3-BOX or ESP32-S3-BOX-3)"
config HARDWARE_TDECK
depends on IDF_TARGET_ESP32S3
bool "LILYGO T DECK"
endchoice

Expand Down
33 changes: 0 additions & 33 deletions main/box.hpp

This file was deleted.

35 changes: 0 additions & 35 deletions main/box_3.hpp

This file was deleted.

Loading