fix(wifi_remote): Update per breaking changes on v6.0

Author: david-cermak

components/esp_wifi_remote/idf_v6.0/Kconfig.wifi.in

@@ -792,6 +792,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"
 
 
@@ -1266,6 +1274,12 @@ if WIFI_RMT_WPS_PASSPHRASE
         default WIFI_RMT_WPS_PASSPHRASE
 endif
 
+if WIFI_RMT_WPS_RECONNECT_ON_FAIL
+    config ESP_WIFI_WPS_RECONNECT_ON_FAIL # ignore: multiple-definition
+        bool
+        default WIFI_RMT_WPS_RECONNECT_ON_FAIL
+endif
+
 if WIFI_RMT_DEBUG_PRINT
     config ESP_WIFI_DEBUG_PRINT # ignore: multiple-definition
         bool

components/esp_wifi_remote/idf_v6.0/include/injected/esp_now.h

@@ -102,6 +102,31 @@ typedef wifi_tx_info_t esp_now_send_info_t;
  */
 typedef wifi_tx_rate_config_t esp_now_rate_config_t;
 
+/**
+ * @brief ESPNOW switch channel information
+ */
+typedef struct {
+    wifi_action_tx_t type;          /**< ACTION TX operation type */
+    uint8_t channel;                /**< Channel on which to perform ESPNOW TX Operation */
+    wifi_second_chan_t sec_channel; /**< Secondary channel */
+    uint32_t wait_time_ms;          /**< Duration to wait for on target channel */
+    uint8_t op_id;                  /**< Unique Identifier for operation provided by wifi driver */
+    uint8_t dest_mac[6];            /**< Destination MAC address */
+    uint16_t data_len;              /**< Length of the appended Data */
+    uint8_t data[0];                /**< Appended Data payload */
+} esp_now_switch_channel_t;
+
+/**
+ * @brief ESPNOW remain on channel information
+ */
+typedef struct {
+    wifi_roc_t type;                 /**< ROC operation type */
+    uint8_t channel;                 /**< Channel on which to perform ESPNOW ROC Operation */
+    wifi_second_chan_t sec_channel;  /**< Secondary channel */
+    uint32_t wait_time_ms;           /**< Duration to wait for on target channel */
+    uint8_t op_id;                   /**< ID of this specific ROC operation provided by wifi driver */
+} esp_now_remain_on_channel_t;
+
 /**
   * @brief     Callback function of receiving ESPNOW data
   * @param     esp_now_info received ESPNOW packet information
@@ -258,25 +283,6 @@ esp_err_t esp_now_del_peer(const uint8_t *peer_addr);
   */
 esp_err_t esp_now_mod_peer(const esp_now_peer_info_t *peer);
 
-/**
-  * @brief      Config ESPNOW rate of specified interface
-  *
-  * @deprecated please use esp_now_set_peer_rate_config() instead.
-  *
-  * @attention  1. This API should be called after esp_wifi_start().
-  * @attention  2. This API only work when not use Wi-Fi 6 and esp_now_set_peer_rate_config() not called.
-  *
-  * @param      ifx  Interface to be configured.
-  * @param      rate Phy rate to be configured.
-  *
-  * @return
-  *    - ESP_OK: succeed
-  *    - others: failed
-  */
-esp_err_t esp_wifi_config_espnow_rate(wifi_interface_t ifx, wifi_phy_rate_t rate)
-__attribute__((deprecated("This API can be only used when rate is non-HE rate, \
-                                please use esp_now_set_peer_rate_config if you want full support of the rate.")));
-
 /**
   * @brief      Set ESPNOW rate config for each peer
   *
@@ -394,6 +400,32 @@ esp_err_t esp_now_set_user_oui(uint8_t *oui);
   */
 esp_err_t esp_now_get_user_oui(uint8_t *oui);
 
+/**
+  * @brief     ESPNOW switch to a specific channel for a required duration, and send one ESPNOW data.
+  *
+  * @param     config  ESPNOW switch channel relevant information
+  *
+  * @return
+  *          - ESP_OK : succeed
+  *          - ESP_ERR_NO_MEM: failed to allocate memory
+  *          - ESP_ERR_INVALID_ARG: the <channel, sec_channel> pair is invalid
+  *          - ESP_FAIL: failed to send frame
+  */
+esp_err_t esp_now_switch_channel_tx(esp_now_switch_channel_t *config);
+
+/**
+  * @brief     ESPNOW remain on the target channel for required duration.
+  *
+  * @param     config  ESPNOW remain on channel relevant information
+  *
+  * @return
+  *          - ESP_OK : succeed
+  *          - ESP_ERR_NO_MEM: failed to allocate memory
+  *          - ESP_ERR_INVALID_ARG: the <channel, sec_channel> pair is invalid
+  *          - ESP_FAIL: failed to perform roc operation
+  */
+esp_err_t esp_now_remain_on_channel(esp_now_remain_on_channel_t *config);
+
 /**
   * @}
   */

components/esp_wifi_remote/idf_v6.0/include/injected/esp_wifi.h

@@ -1288,54 +1288,6 @@ esp_err_t esp_wifi_get_csi_config(wifi_csi_config_t *config);
   */
 esp_err_t esp_wifi_set_csi(bool en);
 
-/**
-  * @brief     Set antenna GPIO configuration
-  *
-  * @param     config  Antenna GPIO configuration.
-  *
-  * @return
-  *    - ESP_OK: succeed
-  *    - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init
-  *    - ESP_ERR_INVALID_ARG: Invalid argument, e.g. parameter is NULL, invalid GPIO number etc
-  */
-esp_err_t esp_wifi_set_ant_gpio(const wifi_ant_gpio_config_t *config) __attribute__((deprecated("Please use esp_phy_set_ant_gpio instead")));
-
-/**
-  * @brief     Get current antenna GPIO configuration
-  *
-  * @param     config  Antenna GPIO configuration.
-  *
-  * @return
-  *    - ESP_OK: succeed
-  *    - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init
-  *    - ESP_ERR_INVALID_ARG: invalid argument, e.g. parameter is NULL
-  */
-esp_err_t esp_wifi_get_ant_gpio(wifi_ant_gpio_config_t *config) __attribute__((deprecated("Please use esp_phy_get_ant_gpio instead")));
-
-/**
-  * @brief     Set antenna configuration
-  *
-  * @param     config  Antenna configuration.
-  *
-  * @return
-  *    - ESP_OK: succeed
-  *    - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init
-  *    - ESP_ERR_INVALID_ARG: Invalid argument, e.g. parameter is NULL, invalid antenna mode or invalid GPIO number
-  */
-esp_err_t esp_wifi_set_ant(const wifi_ant_config_t *config) __attribute__((deprecated("Please use esp_phy_set_ant instead")));
-
-/**
-  * @brief     Get current antenna configuration
-  *
-  * @param     config  Antenna configuration.
-  *
-  * @return
-  *    - ESP_OK: succeed
-  *    - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init
-  *    - ESP_ERR_INVALID_ARG: invalid argument, e.g. parameter is NULL
-  */
-esp_err_t esp_wifi_get_ant(wifi_ant_config_t *config) __attribute__((deprecated("Please use esp_phy_get_ant instead")));
-
 /**
  * @brief      Get the TSF time
  *             In Station mode or SoftAP+Station mode if station is not connected or station doesn't receive at least
@@ -1458,8 +1410,7 @@ esp_err_t esp_wifi_ftm_resp_set_offset(int16_t offset_cm);
   *                (sizeof(wifi_ftm_report_entry_t) * num_entries) where the API will fill up to num_entries
   *                valid FTM measurements in the buffer. Total number of entries can be found in the event
   *                WIFI_EVENT_FTM_REPORT as ftm_report_num_entries
-  * @attention  2. The internal FTM report is freed upon use of this API which means the API can only be used
-  *                once after every FTM session initiated
+  * @attention  2. The internal FTM report is freed upon use of this API OR after initiating a fresh FTM session
   * @attention  3. Passing the buffer as NULL merely frees the FTM report
   *
   * @param      report  Pointer to the buffer for receiving the FTM report
@@ -1829,6 +1780,7 @@ esp_err_t esp_wifi_get_bandwidths(wifi_interface_t ifx, wifi_bandwidths_t *bw);
   * @return
   *    - ESP_OK: succeed
   *    - ESP_ERR_NO_MEM: failed to allocate memory
+  *    - ESP_ERR_INVALID_ARG: the <channel, sec_channel> pair is invalid
   *    - ESP_FAIL: failed to send frame
   */
 esp_err_t esp_wifi_action_tx_req(wifi_action_tx_req_t *req);
@@ -1841,6 +1793,7 @@ esp_err_t esp_wifi_action_tx_req(wifi_action_tx_req_t *req);
   * @return
   *    - ESP_OK: succeed
   *    - ESP_ERR_NO_MEM: failed to allocate memory
+  *    - ESP_ERR_INVALID_ARG: the <channel, sec_channel> pair is invalid
   *    - ESP_FAIL: failed to perform roc operation
   */
 esp_err_t esp_wifi_remain_on_channel(wifi_roc_req_t * req);