Merge pull request #91 from david-cermak/update/v1.2.1

[v1.2.1]: Update per recent changes

Author: david-cermak

.github/workflows/build_at.yml

@@ -13,7 +13,7 @@ jobs:
     name: Build WiFi Remote over AT Test
     strategy:
       matrix:
-        idf_ver: ["latest", "release-v5.5", "release-v5.4", "release-v5.3"]
+        idf_ver: ["latest", "release-v6.0", "release-v5.5", "release-v5.4", "release-v5.3"]
         test: [ { app: sample_app, path: "tests/sample" }]
     runs-on: ubuntu-latest
     container: espressif/idf:${{ matrix.idf_ver }}

.github/workflows/build_eppp.yml

@@ -13,7 +13,7 @@ jobs:
     name: Build WiFi Remote over EPPP Test
     strategy:
       matrix:
-        idf_ver: ["latest", "release-v5.5", "release-v5.4", "release-v5.3"]
+        idf_ver: ["latest", "release-v6.0", "release-v5.5", "release-v5.4", "release-v5.3"]
         test: [ { app: sample_app, path: "tests/sample" }]
     runs-on: ubuntu-latest
     container: espressif/idf:${{ matrix.idf_ver }}

.github/workflows/smoke_compat.yml

@@ -14,7 +14,7 @@ jobs:
     name: Check API compatibility of WiFi Remote
     strategy:
       matrix:
-        idf_ver: ["latest", "release-v5.5", "release-v5.4", "release-v5.3", "v5.4", "v5.4.1", "v5.4.2", "v5.3.3", "v5.3.2", "v5.3.1", "v5.5", "v5.5.1", "v5.3"]
+        idf_ver: ["latest", "release-v6.0", "release-v5.5", "release-v5.4", "release-v5.3", "v5.4", "v5.4.1", "v5.4.2", "v5.3.3", "v5.3.2", "v5.3.1", "v5.5", "v5.5.1", "v5.3"]
     runs-on: ubuntu-latest
     container: espressif/idf:${{ matrix.idf_ver }}
     steps:
@@ -34,7 +34,7 @@ jobs:
     name: Build IDF examples with WiFi Remote
     strategy:
       matrix:
-        idf_ver: ["latest", "release-v5.5", "release-v5.4", "release-v5.3", "v5.4.1", "v5.3.3", "v5.3.1", "v5.3.2", "v5.4", "v5.4.2", "v5.5", "v5.5.1", "v5.3"]
+        idf_ver: ["latest", "release-v6.0", "release-v5.5", "release-v5.4", "release-v5.3", "v5.4.1", "v5.3.3", "v5.3.1", "v5.3.2", "v5.4", "v5.4.2", "v5.5", "v5.5.1", "v5.3"]
         idf_target: ["esp32p4", "esp32h2", "esp32s3"]
         test: [ { app: idf_mqtt_example, path: "examples/protocols/mqtt/tcp" }, { app: wifi_enterprise, path: "examples/wifi/wifi_enterprise" }]
     runs-on: ubuntu-latest

components/esp_wifi_remote/.cz.yaml

@@ -3,6 +3,6 @@ commitizen:
   bump_message: 'bump(wifi_remote): $current_version -> $new_version'
   pre_bump_hooks: python ../../ci/changelog.py esp_wifi_remote
   tag_format: wifi_remote-v$version
-  version: 1.2.0
+  version: 1.2.1
   version_files:
   - idf_component.yml

components/esp_wifi_remote/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [1.2.1](https://github.com/espressif/esp-wifi-remote/commits/wifi_remote-v1.2.1)
+
+### Bug Fixes
+
+- Update per recent v6.0 changes ([092fdba](https://github.com/espressif/esp-wifi-remote/commit/092fdba))
+- Update per recent v6.1 changes ([f042ac5](https://github.com/espressif/esp-wifi-remote/commit/f042ac5))
+- Update per recent v5.5 changes ([7550857](https://github.com/espressif/esp-wifi-remote/commit/7550857))
+- Update per recent v5.4 changes ([e1b25af](https://github.com/espressif/esp-wifi-remote/commit/e1b25af))
+
 ## [1.2.0](https://github.com/espressif/esp-wifi-remote/commits/wifi_remote-v1.2.0)
 
 ### Features

components/esp_wifi_remote/idf_component.yml

@@ -1,4 +1,4 @@
-version: 1.2.0
+version: 1.2.1
 url: https://github.com/espressif/esp-wifi-remote
 description: Utility wrapper for esp_wifi functionality on remote targets
 dependencies:

components/esp_wifi_remote/idf_v5.4/Kconfig.wifi.in

@@ -522,6 +522,7 @@ config WIFI_RMT_WAPI_PSK
 config WIFI_RMT_SUITE_B_192
     bool "Enable NSA suite B support with 192 bit key"
     default n
+    depends on WIFI_RMT_ENTERPRISE_SUPPORT
     depends on SLAVE_SOC_WIFI_GCMP_SUPPORT
     select WIFI_RMT_GCMP_SUPPORT
     select WIFI_RMT_GMAC_SUPPORT
@@ -700,6 +701,14 @@ menu "WPS Configuration Options"
             be shared to other devices, making it in readable format increases
             that risk, also passphrase requires pbkdf2 to convert in psk.
 
+    config WIFI_RMT_WPS_RECONNECT_ON_FAIL
+        bool "Reconnect to previous SSID if WPS failed"
+        default n
+        help
+            Select this option to enable reconnection to previous SSID if WPS fails.
+            This option will only work if station was connected to a network
+            when WPS was started.
+
 endmenu # "WPS Configuration Options"
 
 
@@ -714,12 +723,6 @@ config WIFI_RMT_DEBUG_PRINT
         Enabling this could increase the build size ~60kb
         depending on the project logging level.
 
-config WIFI_RMT_TESTING_OPTIONS
-    bool "Add DPP testing code"
-    default n
-    help
-        Select this to enable unity test for DPP.
-
 config WIFI_RMT_ENTERPRISE_SUPPORT
     bool "Enable enterprise option"
     default y
@@ -1140,16 +1143,16 @@ if WIFI_RMT_WPS_PASSPHRASE
         default WIFI_RMT_WPS_PASSPHRASE
 endif
 
-if WIFI_RMT_DEBUG_PRINT
-    config ESP_WIFI_DEBUG_PRINT # ignore: multiple-definition
+if WIFI_RMT_WPS_RECONNECT_ON_FAIL
+    config ESP_WIFI_WPS_RECONNECT_ON_FAIL # ignore: multiple-definition
         bool
-        default WIFI_RMT_DEBUG_PRINT
+        default WIFI_RMT_WPS_RECONNECT_ON_FAIL
 endif
 
-if WIFI_RMT_TESTING_OPTIONS
-    config ESP_WIFI_TESTING_OPTIONS # ignore: multiple-definition
+if WIFI_RMT_DEBUG_PRINT
+    config ESP_WIFI_DEBUG_PRINT # ignore: multiple-definition
         bool
-        default WIFI_RMT_TESTING_OPTIONS
+        default WIFI_RMT_DEBUG_PRINT
 endif
 
 if WIFI_RMT_ENTERPRISE_SUPPORT

components/esp_wifi_remote/idf_v5.4/esp_wifi_remote_weak.c

@@ -435,3 +435,13 @@ WEAK esp_err_t esp_wifi_remote_get_bandwidths(wifi_interface_t ifx, wifi_bandwid
 {
     LOG_UNSUPPORTED_AND_RETURN(ESP_ERR_NOT_SUPPORTED);
 }
+
+WEAK esp_err_t esp_wifi_remote_action_tx_req(wifi_action_tx_req_t *req)
+{
+    LOG_UNSUPPORTED_AND_RETURN(ESP_ERR_NOT_SUPPORTED);
+}
+
+WEAK esp_err_t esp_wifi_remote_remain_on_channel(wifi_roc_req_t *req)
+{
+    LOG_UNSUPPORTED_AND_RETURN(ESP_ERR_NOT_SUPPORTED);
+}

components/esp_wifi_remote/idf_v5.4/esp_wifi_with_remote.c

@@ -431,3 +431,13 @@ esp_err_t esp_wifi_get_bandwidths(wifi_interface_t ifx, wifi_bandwidths_t *bw)
 {
     return esp_wifi_remote_get_bandwidths(ifx, bw);
 }
+
+esp_err_t esp_wifi_action_tx_req(wifi_action_tx_req_t *req)
+{
+    return esp_wifi_remote_action_tx_req(req);
+}
+
+esp_err_t esp_wifi_remain_on_channel(wifi_roc_req_t *req)
+{
+    return esp_wifi_remote_remain_on_channel(req);
+}

components/esp_wifi_remote/idf_v5.4/include/esp_wifi_remote_api.h

@@ -95,6 +95,8 @@ esp_err_t esp_wifi_remote_set_protocols(wifi_interface_t ifx, wifi_protocols_t *
 esp_err_t esp_wifi_remote_get_protocols(wifi_interface_t ifx, wifi_protocols_t *protocols);
 esp_err_t esp_wifi_remote_set_bandwidths(wifi_interface_t ifx, wifi_bandwidths_t *bw);
 esp_err_t esp_wifi_remote_get_bandwidths(wifi_interface_t ifx, wifi_bandwidths_t *bw);
+esp_err_t esp_wifi_remote_action_tx_req(wifi_action_tx_req_t *req);
+esp_err_t esp_wifi_remote_remain_on_channel(wifi_roc_req_t *req);
 
 #ifdef __cplusplus
 }