IDF master 3e370c4296

* Fix build compilation due to changes in the HW_TIMER's structs

* Fix compilation warnings and errors with USB

* Update USBCDC.cpp

* Update CMakeLists.txt

* Update HWCDC.cpp

tools/sdk/esp32c3/include/esp_wifi/include/esp_mesh.h

@@ -505,8 +505,13 @@ typedef struct {
  * @brief Mesh softAP configuration
  */
 typedef struct {
-    uint8_t password[64];      /**< mesh softAP password */
-    uint8_t max_connection;    /**< max number of stations allowed to connect in, max 10 */
+    uint8_t password[64];              /**< mesh softAP password */
+    /**
+     * max number of stations allowed to connect in, default 6, max 10
+     * = max_connection + nonmesh_max_connection
+     */
+    uint8_t max_connection;            /**< max mesh connections */
+    uint8_t nonmesh_max_connection;    /**< max non-mesh connections */
 } mesh_ap_cfg_t;
 
 /**
@@ -947,7 +952,8 @@ esp_err_t esp_mesh_set_ap_authmode(wifi_auth_mode_t authmode);
 wifi_auth_mode_t esp_mesh_get_ap_authmode(void);
 
 /**
- * @brief      Set mesh softAP max connection value
+ * @brief      Set mesh max connection value
+ *             - Set mesh softAP max connection = mesh max connection + non-mesh max connection
  *
  * @attention  This API shall be called before mesh is started.
  *
@@ -960,12 +966,19 @@ wifi_auth_mode_t esp_mesh_get_ap_authmode(void);
 esp_err_t esp_mesh_set_ap_connections(int connections);
 
 /**
- * @brief      Get mesh softAP max connection configuration
+ * @brief      Get mesh max connection configuration
  *
- * @return     the number of max connections
+ * @return     the number of mesh max connections
  */
 int esp_mesh_get_ap_connections(void);
 
+/**
+ * @brief      Get non-mesh max connection configuration
+ *
+ * @return     the number of non-mesh max connections
+ */
+int esp_mesh_get_non_mesh_connections(void);
+
 /**
  * @brief      Get current layer value over the mesh network
  *

tools/sdk/esp32c3/include/esp_wifi/include/esp_wifi.h

@@ -1224,7 +1224,7 @@ esp_err_t esp_wifi_config_11b_rate(wifi_interface_t ifx, bool disable);
   * @attention  1. This API should be called after esp_wifi_init() and before esp_wifi_start().
   *
   * @param      ifx  Interface to be configured.
-  * @param      rate Only support 1M, 6M and MCS0_LGI
+  * @param      rate Phy rate to be configured.
   *
   * @return
   *    - ESP_OK: succeed
@@ -1289,6 +1289,20 @@ esp_err_t esp_wifi_set_country_code(const char *country, bool ieee80211d_enabled
   */
 esp_err_t esp_wifi_get_country_code(char *country);
 
+/**
+  * @brief      Config 80211 tx rate of specified interface
+  *
+  * @attention  1. This API should be called after esp_wifi_init() and before esp_wifi_start().
+  *
+  * @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_80211_tx_rate(wifi_interface_t ifx, wifi_phy_rate_t rate);
+
 #ifdef __cplusplus
 }
 #endif

tools/sdk/esp32c3/include/esp_wifi/include/esp_wifi_default.h

@@ -50,7 +50,7 @@ esp_err_t esp_netif_attach_wifi_ap(esp_netif_t *esp_netif);
 esp_err_t esp_wifi_set_default_wifi_sta_handlers(void);
 
 /**
- * @brief Sets default wifi event handlers for STA interface
+ * @brief Sets default wifi event handlers for AP interface
  *
  * @return
  *  - ESP_OK on success, error returned from esp_event_handler_register if failed

tools/sdk/esp32c3/include/esp_wifi/include/esp_wifi_types.h

@@ -272,7 +272,8 @@ typedef struct {
     uint32_t phy_11g:1;      /**< bit: 1 flag to identify if 11g mode is enabled or not */
     uint32_t phy_11n:1;      /**< bit: 2 flag to identify if 11n mode is enabled or not */
     uint32_t phy_lr:1;       /**< bit: 3 flag to identify if low rate is enabled or not */
-    uint32_t reserved:28;    /**< bit: 4..31 reserved */
+    uint32_t is_mesh_child:1;/**< bit: 4 flag to identify mesh child */
+    uint32_t reserved:27;    /**< bit: 5..31 reserved */
 } wifi_sta_info_t;
 
 #define ESP_WIFI_MAX_CONN_NUM  (10)       /**< max number of stations which can connect to ESP32 soft-AP */
@@ -669,12 +670,14 @@ typedef struct {
 typedef struct {
     uint8_t mac[6];           /**< MAC address of the station connected to ESP32 soft-AP */
     uint8_t aid;              /**< the aid that ESP32 soft-AP gives to the station connected to  */
+    bool is_mesh_child;       /**< flag to identify mesh child */
 } wifi_event_ap_staconnected_t;
 
 /** Argument structure for WIFI_EVENT_AP_STADISCONNECTED event */
 typedef struct {
     uint8_t mac[6];           /**< MAC address of the station disconnects to ESP32 soft-AP */
     uint8_t aid;              /**< the aid that ESP32 soft-AP gave to the station disconnects to  */
+    bool is_mesh_child;       /**< flag to identify mesh child */
 } wifi_event_ap_stadisconnected_t;
 
 /** Argument structure for WIFI_EVENT_AP_PROBEREQRECVED event */