Skip to content

Commit 69f3dfb

Browse files
david-cermakdavid-cermak
authored
Merge pull request #92 from david-cermak/update/wrmt_v1.2.2
[v1.2.2]: Update per recent v6.1 changes
2 parents 75e1ac9 + cfbede3 commit 69f3dfb

File tree

17 files changed

+188
-96
lines changed

17 files changed

+188
-96
lines changed

‎.github/workflows/build.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,10 @@ jobs:
8181
run: |
8282
${IDF_PATH}/install.sh --enable-ci
8383
. ${IDF_PATH}/export.sh
84+
if [ "${{matrix.example.path}}" == "esp_wifi_remote/examples/mqtt" ]; then
85+
echo -e "config ESP32P4_SELECTS_REV_LESS_V3 # ignore: multiple-definition\n bool\n default y\n" >> ./components/${{matrix.example.path}}/main/Kconfig.projbuild
86+
cat ./components/${{matrix.example.path}}/main/Kconfig.projbuild
87+
fi
8488
if [ "${{matrix.example.app}}" == "esp_hosted_slave" ]; then
8589
idf.py create-project-from-example "espressif/esp_hosted:slave"
8690
rm slave/sdkconfig.ci.*

‎.github/workflows/smoke_compat.yml‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,33 @@ jobs:
5353
. ${IDF_PATH}/export.sh
5454
export OVERRIDE_PATH=`pwd`/components/esp_wifi_remote
5555
echo ${OVERRIDE_PATH}
56+
# Determine the correct path for MQTT example based on what exists
57+
TEST_PATH="${{matrix.test.path}}"
58+
if [ "${{matrix.test.app}}" = "idf_mqtt_example" ]; then
59+
# Check if the newer path structure exists (latest and release-v6.0)
60+
if [ -f "${IDF_PATH}/examples/protocols/mqtt/main/idf_component.yml" ]; then
61+
TEST_PATH="examples/protocols/mqtt"
62+
# Fall back to older path structure (release-v5.x and earlier)
63+
elif [ -f "${IDF_PATH}/examples/protocols/mqtt/tcp/main/idf_component.yml" ]; then
64+
TEST_PATH="examples/protocols/mqtt/tcp"
65+
else
66+
echo "Error: Could not find MQTT example at either path"
67+
ls -la ${IDF_PATH}/examples/protocols/mqtt/ || true
68+
exit 1
69+
fi
70+
echo "Using MQTT example path: ${TEST_PATH}"
71+
fi
5672
if [ "${{matrix.test.app}}" = "wifi_enterprise" ]; then
57-
cd ${IDF_PATH}/${{matrix.test.path}}
73+
cd ${IDF_PATH}/${TEST_PATH}
5874
echo -e "dependencies:\n espressif/esp_wifi_remote:\n version: \"*\"\n rules:\n - if: \"target in [esp32p4, esp32h2]\"" > main/idf_component.yml
5975
echo -e "CONFIG_ESP_WIFI_REMOTE_EAP_ENABLED=y" > sdkconfig.defaults
6076
cd -
6177
fi
62-
sed -i '/espressif\/esp_wifi_remote:/a \ \ \ \ override_path: "${OVERRIDE_PATH}"' ${IDF_PATH}/${{matrix.test.path}}/main/idf_component.yml
63-
cat ${IDF_PATH}/${{matrix.test.path}}/main/idf_component.yml
78+
sed -i '/espressif\/esp_wifi_remote:/a \ \ \ \ override_path: "${OVERRIDE_PATH}"' ${IDF_PATH}/${TEST_PATH}/main/idf_component.yml
79+
cat ${IDF_PATH}/${TEST_PATH}/main/idf_component.yml
6480
export PEDANTIC_FLAGS="-DIDF_CI_BUILD -Werror -Werror=deprecated-declarations -Werror=unused-variable -Werror=unused-but-set-variable -Werror=unused-function"
6581
export EXTRA_CFLAGS="${PEDANTIC_FLAGS} -Wstrict-prototypes"
6682
export EXTRA_CXXFLAGS="${PEDANTIC_FLAGS}"
67-
cd ${IDF_PATH}/${{matrix.test.path}}
83+
cd ${IDF_PATH}/${TEST_PATH}
6884
idf-build-apps find --config sdkconfig.ci* -vv --target ${{ matrix.idf_target }}
6985
idf-build-apps build --config sdkconfig.ci* -vv --target ${{ matrix.idf_target }}

‎components/esp_wifi_remote/.cz.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ commitizen:
33
bump_message: 'bump(wifi_remote): $current_version -> $new_version'
44
pre_bump_hooks: python ../../ci/changelog.py esp_wifi_remote
55
tag_format: wifi_remote-v$version
6-
version: 1.2.1
6+
version: 1.2.2
77
version_files:
88
- idf_component.yml

‎components/esp_wifi_remote/CHANGELOG.md‎

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

3+
## [1.2.2](https://github.com/espressif/esp-wifi-remote/commits/wifi_remote-v1.2.2)
4+
5+
### Bug Fixes
6+
7+
- Remove legacy compat esp_interface.h ([e67f024](https://github.com/espressif/esp-wifi-remote/commit/e67f024), [#80](https://github.com/espressif/esp-wifi-remote/issues/80))
8+
- Use P4 chip-rev 1 in CI ([cbd9d1b](https://github.com/espressif/esp-wifi-remote/commit/cbd9d1b))
9+
- Add optional mqtt dependency ([548b002](https://github.com/espressif/esp-wifi-remote/commit/548b002))
10+
- Mark IDF v6.1 as master ([8a18cf7](https://github.com/espressif/esp-wifi-remote/commit/8a18cf7))
11+
- Update per v6.0 changes ([0b57724](https://github.com/espressif/esp-wifi-remote/commit/0b57724))
12+
- Update per recent v6.1 changes ([e3bf8fd](https://github.com/espressif/esp-wifi-remote/commit/e3bf8fd))
13+
314
## [1.2.1](https://github.com/espressif/esp-wifi-remote/commits/wifi_remote-v1.2.1)
415

516
### Bug Fixes

‎components/esp_wifi_remote/examples/mqtt/main/idf_component.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,7 @@ dependencies:
55
wifi_remote_over_eppp:
66
version: "*"
77
override_path: ../../../../wifi_remote_over_eppp
8+
espressif/mqtt:
9+
rules:
10+
- if: idf_version >=6.0
11+
version: ^1.0.0

‎components/esp_wifi_remote/examples/mqtt/sdkconfig.ci.hosted‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
CONFIG_IDF_TARGET="esp32p4"
2+
CONFIG_ESP32P4_SELECTS_REV_LESS_V3=y
3+
CONFIG_ESP32P4_REV_MIN_100=y
24
CONFIG_ESP_WIFI_SSID="local_mosquitto"
35
CONFIG_ESP_WIFI_PASSWORD="local_mosquitto_password"
46
CONFIG_ESP_WIFI_REMOTE_LIBRARY_EPPP=n

‎components/esp_wifi_remote/examples/mqtt/sdkconfig.ci.p4‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
CONFIG_IDF_TARGET="esp32p4"
2+
CONFIG_ESP32P4_SELECTS_REV_LESS_V3=y
3+
CONFIG_ESP32P4_REV_MIN_100=y
24
CONFIG_ESP_WIFI_SSID="local_mosquitto"
35
CONFIG_ESP_WIFI_PASSWORD="local_mosquitto_password"
46
CONFIG_WIFI_RMT_OVER_EPPP_UART_TX_PIN=47

‎components/esp_wifi_remote/examples/mqtt/sdkconfig.ci.p4_1‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
CONFIG_IDF_TARGET="esp32p4"
2+
CONFIG_ESP32P4_SELECTS_REV_LESS_V3=y
3+
CONFIG_ESP32P4_REV_MIN_100=y
24
CONFIG_ESP_WIFI_SSID="local_mosquitto"
35
CONFIG_ESP_WIFI_PASSWORD="local_mosquitto_password"
46
CONFIG_WIFI_RMT_OVER_EPPP_UART_TX_PIN=47

‎components/esp_wifi_remote/idf_component.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: 1.2.1
1+
version: 1.2.2
22
url: https://github.com/espressif/esp-wifi-remote
33
description: Utility wrapper for esp_wifi functionality on remote targets
44
dependencies:

‎components/esp_wifi_remote/idf_v6.0/Kconfig.soc_wifi_caps.in‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,10 @@ if SLAVE_IDF_TARGET_ESP32C3
106106
bool
107107
default y
108108

109+
config SLAVE_SOC_WIFI_TXOP_SUPPORT # ignore: multiple-definition
110+
bool
111+
default y
112+
109113
config SLAVE_SOC_WIFI_CSI_SUPPORT # ignore: multiple-definition
110114
bool
111115
default y
@@ -158,6 +162,10 @@ if SLAVE_IDF_TARGET_ESP32S3
158162
bool
159163
default y
160164

165+
config SLAVE_SOC_WIFI_TXOP_SUPPORT # ignore: multiple-definition
166+
bool
167+
default y
168+
161169
config SLAVE_SOC_WIFI_CSI_SUPPORT # ignore: multiple-definition
162170
bool
163171
default y
@@ -198,6 +206,10 @@ if SLAVE_IDF_TARGET_ESP32C2
198206
bool
199207
default y
200208

209+
config SLAVE_SOC_WIFI_TXOP_SUPPORT # ignore: multiple-definition
210+
bool
211+
default y
212+
201213
config SLAVE_SOC_WIFI_SUPPORT_VARIABLE_BEACON_WINDOW # ignore: multiple-definition
202214
bool
203215
default y
@@ -242,6 +254,10 @@ if SLAVE_IDF_TARGET_ESP32C6
242254
bool
243255
default y
244256

257+
config SLAVE_SOC_WIFI_TXOP_SUPPORT # ignore: multiple-definition
258+
bool
259+
default y
260+
245261
config SLAVE_SOC_WIFI_CSI_SUPPORT # ignore: multiple-definition
246262
bool
247263
default y
@@ -294,6 +310,10 @@ if SLAVE_IDF_TARGET_ESP32C5
294310
bool
295311
default y
296312

313+
config SLAVE_SOC_WIFI_TXOP_SUPPORT # ignore: multiple-definition
314+
bool
315+
default y
316+
297317
config SLAVE_SOC_WIFI_CSI_SUPPORT # ignore: multiple-definition
298318
bool
299319
default y
@@ -354,6 +374,10 @@ if SLAVE_IDF_TARGET_ESP32C61
354374
bool
355375
default y
356376

377+
config SLAVE_SOC_WIFI_TXOP_SUPPORT # ignore: multiple-definition
378+
bool
379+
default y
380+
357381
config SLAVE_SOC_WIFI_CSI_SUPPORT # ignore: multiple-definition
358382
bool
359383
default y

0 commit comments

Comments
 (0)