Skip to content

Commit 704e0f8

Browse files
authored
Merge pull request #189 from baba-dev/codex/fix-compile-break-and-clean-dependencies
fix: clean wifi remote dependencies
2 parents db53f04 + c5dde79 commit 704e0f8

3 files changed

Lines changed: 25 additions & 23 deletions

File tree

.github/workflows/idf-build-and-webflash.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,15 @@ jobs:
4141
esp_idf_version: v5.4.2
4242
target: esp32p4
4343
path: platforms/tab5
44-
command: idf.py build
44+
command: |
45+
set -euo pipefail
46+
if grep -R "espressif/settings_core" -n .; then
47+
echo "Do not reference espressif/settings_core"
48+
exit 1
49+
fi
50+
rm -rf managed_components
51+
idf.py reconfigure
52+
idf.py build
4553
4654
- name: Merge firmware for ESP Web Tools
4755
shell: bash
Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
menu "Tab5 application"
1+
menu "Project Options"
22

33
config APP_LOG_LEVEL
44
int "Default application log level"
@@ -11,14 +11,10 @@ config APP_LOG_LEVEL
1111
menu "App Features"
1212

1313
config APP_ENABLE_WIFI_HOSTED
14-
bool "Enable ESP-Hosted (Wi-Fi over SDIO) on Tab5"
15-
default n
14+
bool "Enable Wi-Fi over ESP-Hosted"
15+
default y
1616
help
17-
When enabled, the firmware will power on the ESP-Hosted SDIO coprocessor
18-
and bring up the remote Wi-Fi stack. Disable this to keep SDIO idle while
19-
other system issues are being debugged.
20-
21-
endmenu
17+
Build the app with remote Wi-Fi (ESP-Hosted/esp_wifi_remote) enabled.
2218

2319
config HAL_AUDIO_ENABLE_LONG_DEMO
2420
bool "Enable long Canon in D demo"
@@ -29,3 +25,5 @@ config HAL_AUDIO_ENABLE_LONG_DEMO
2925
reduce build times.
3026

3127
endmenu
28+
29+
endmenu

platforms/tab5/main/idf_component.yml

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
1-
## IDF Component Manager Manifest File
1+
version: "0.1.0"
2+
23
dependencies:
3-
## Required IDF version
44
idf: "~5.4"
5-
espressif/esp_hosted:
6-
version: 1.4.0
7-
rules:
8-
- if: "$CONFIG{CONFIG_APP_ENABLE_WIFI_HOSTED} == y"
9-
espressif/esp_wifi_remote:
10-
version: 0.8.5
11-
rules:
12-
- if: "$CONFIG{CONFIG_APP_ENABLE_WIFI_HOSTED} == y"
13-
chmorgan/esp-audio-player: 1.0.7
14-
chmorgan/esp-file-iterator: 1.0.0
15-
espressif/led_strip: 3.0.0
16-
espressif/esp_lcd_ili9881c: ^1.0.1
5+
6+
espressif/esp_wifi_remote: "*"
7+
8+
chmorgan/esp-audio-player: "1.0.7"
9+
chmorgan/esp-file-iterator: "1.0.0"
10+
espressif/led_strip: "3.0.0"
11+
espressif/esp_lcd_ili9881c: "^1.0.1"
12+
1713
settings_core:
1814
path: ../../../components/settings_core
1915
settings_ui:

0 commit comments

Comments
 (0)