IDF release/v3.3 cd59d107b (#4708)

Co-authored-by: me-no-dev <[email protected]>
espressif · Jan 12, 2021 · b0e896e · b0e896e
1 parent 08f4665
commit b0e896e
Show file tree

Hide file tree

Showing 78 changed files with 11 additions and 27 deletions.
diff --git a/tools/sdk/include/config/sdkconfig.h b/tools/sdk/include/config/sdkconfig.h
@@ -373,6 +373,7 @@
 #define CONFIG_SPIFFS_PAGE_SIZE 256
 #define CONFIG_MBEDTLS_ECP_DP_SECP192K1_ENABLED 1
 #define CONFIG_ESP32_DPORT_WORKAROUND 1
+#define CONFIG_GATTS_BLUFI_ENABLE 1
 #define CONFIG_PPP_MSCHAP_SUPPORT 1
 #define CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0 1
 #define CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT 2048
@@ -395,5 +396,5 @@
 #define CONFIG_BTDM_MODEM_SLEEP_MODE_ORIG 1
 #define CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_ERROR 1
 #define CONFIG_FATFS_API_ENCODING_ANSI_OEM 1
-#define CONFIG_ARDUINO_IDF_COMMIT "71df1f742"
+#define CONFIG_ARDUINO_IDF_COMMIT "cd59d107b"
 #define CONFIG_ARDUINO_IDF_BRANCH "release/v3.3"
diff --git a/tools/sdk/include/esp32/esp_event_legacy.h b/tools/sdk/include/esp32/esp_event_legacy.h
@@ -106,9 +106,6 @@ typedef struct {
     tcpip_adapter_ip6_info_t ip6_info;
 } system_event_got_ip6_t;
 
-/** Argument structure of SYSTEM_EVENT_STA_WPS_ER_SUCCESS event */
-typedef wifi_event_sta_wps_er_success_t system_event_sta_wps_er_success_t;
-
 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  */
@@ -136,7 +133,6 @@ typedef union {
     system_event_sta_got_ip_t                  got_ip;             /**< ESP32 station got IP, first time got IP or when IP is changed */
     system_event_sta_wps_er_pin_t              sta_er_pin;         /**< ESP32 station WPS enrollee mode PIN code received */
     system_event_sta_wps_fail_reason_t         sta_er_fail_reason;/**< ESP32 station WPS enrollee mode failed reason code received */
-    system_event_sta_wps_er_success_t          sta_er_success;     /*!< ESP32 station WPS enrollee success */
     system_event_ap_staconnected_t             sta_connected;      /**< a station connected to ESP32 soft-AP */
     system_event_ap_stadisconnected_t          sta_disconnected;   /**< a station disconnected to ESP32 soft-AP */
     system_event_ap_probe_req_rx_t             ap_probereqrecved;  /**< ESP32 soft-AP receive probe request packet */

diff --git a/tools/sdk/include/esp32/esp_wifi_types.h b/tools/sdk/include/esp32/esp_wifi_types.h
@@ -502,19 +502,6 @@ typedef enum {
     WIFI_IOCTL_MAX,
 } wifi_ioctl_cmd_t;
 
-#define MAX_SSID_LEN        32
-#define MAX_PASSPHRASE_LEN  64
-#define MAX_WPS_AP_CRED     3
-
-/** Argument structure for WIFI_EVENT_STA_WPS_ER_SUCCESS event */
-typedef struct {
-    uint8_t ap_cred_cnt;                        /**< Number of AP credentials received */
-    struct {
-        uint8_t ssid[MAX_SSID_LEN];             /**< SSID of AP */
-        uint8_t passphrase[MAX_PASSPHRASE_LEN]; /**< Passphrase for the AP */
-    } ap_cred[MAX_WPS_AP_CRED];                 /**< All AP credentials received from WPS handshake */
-} wifi_event_sta_wps_er_success_t;
-
 /** 
  * @brief Configuration for STA's HT2040 coexist management
  *

diff --git a/tools/sdk/include/wpa_supplicant/wps/wps.h b/tools/sdk/include/wpa_supplicant/wps/wps.h
@@ -1024,14 +1024,13 @@ struct wps_sm {
     u8 identity_len;
     u8 ownaddr[ETH_ALEN];
     u8 bssid[ETH_ALEN];
-    u8 ssid[MAX_WPS_AP_CRED][MAX_SSID_LEN];
-    u8 ssid_len[MAX_WPS_AP_CRED];
-    char key[MAX_WPS_AP_CRED][MAX_PASSPHRASE_LEN];
-    u8 key_len[MAX_WPS_AP_CRED];
-    u8 ap_cred_cnt;
+    u8 ssid[32];
+    u8 ssid_len;
     struct wps_device_data *dev;
     u8 uuid[16];
     u8 eapol_version;
+    char key[64];
+    u8 key_len;
     ETSTimer wps_timeout_timer;
     ETSTimer wps_msg_timeout_timer;
     ETSTimer wps_scan_timer;
@@ -1055,8 +1054,8 @@ struct wps_sm {
 #define    IEEE80211_CAPINFO_PRIVACY        0x0010
 
 struct wps_sm *wps_sm_get(void);
-int wps_ssid_save(u8 *ssid, u8 ssid_len, u8 idx);
-int wps_key_save(char *key, u8 key_len, u8 idx);
+int wps_ssid_save(u8 *ssid, u8 ssid_len);
+int wps_key_save(char *key, u8 key_len);
 int wps_station_wps_register_cb(wps_st_cb_t cb);
 int wps_station_wps_unregister_cb(void); 
 int wps_start_pending(void);

diff --git a/tools/sdk/ld/esp32.project.ld b/tools/sdk/ld/esp32.project.ld
diff --git a/tools/sdk/lib/libapp_trace.a b/tools/sdk/lib/libapp_trace.a
diff --git a/tools/sdk/lib/libapp_update.a b/tools/sdk/lib/libapp_update.a
diff --git a/tools/sdk/lib/libasio.a b/tools/sdk/lib/libasio.a
diff --git a/tools/sdk/lib/libbootloader_support.a b/tools/sdk/lib/libbootloader_support.a
diff --git a/tools/sdk/lib/libbt.a b/tools/sdk/lib/libbt.a
diff --git a/tools/sdk/lib/libcoap.a b/tools/sdk/lib/libcoap.a
diff --git a/tools/sdk/lib/libcoexist.a b/tools/sdk/lib/libcoexist.a
diff --git a/tools/sdk/lib/libconsole.a b/tools/sdk/lib/libconsole.a
diff --git a/tools/sdk/lib/libcore.a b/tools/sdk/lib/libcore.a
diff --git a/tools/sdk/lib/libcxx.a b/tools/sdk/lib/libcxx.a
diff --git a/tools/sdk/lib/libdriver.a b/tools/sdk/lib/libdriver.a
diff --git a/tools/sdk/lib/libefuse.a b/tools/sdk/lib/libefuse.a
diff --git a/tools/sdk/lib/libesp-tls.a b/tools/sdk/lib/libesp-tls.a
diff --git a/tools/sdk/lib/libesp32-camera.a b/tools/sdk/lib/libesp32-camera.a
diff --git a/tools/sdk/lib/libesp32.a b/tools/sdk/lib/libesp32.a
diff --git a/tools/sdk/lib/libesp_adc_cal.a b/tools/sdk/lib/libesp_adc_cal.a
diff --git a/tools/sdk/lib/libesp_event.a b/tools/sdk/lib/libesp_event.a
diff --git a/tools/sdk/lib/libesp_http_client.a b/tools/sdk/lib/libesp_http_client.a
diff --git a/tools/sdk/lib/libesp_http_server.a b/tools/sdk/lib/libesp_http_server.a
diff --git a/tools/sdk/lib/libesp_https_ota.a b/tools/sdk/lib/libesp_https_ota.a
diff --git a/tools/sdk/lib/libesp_https_server.a b/tools/sdk/lib/libesp_https_server.a
diff --git a/tools/sdk/lib/libesp_ringbuf.a b/tools/sdk/lib/libesp_ringbuf.a
diff --git a/tools/sdk/lib/libesp_websocket_client.a b/tools/sdk/lib/libesp_websocket_client.a
diff --git a/tools/sdk/lib/libespcoredump.a b/tools/sdk/lib/libespcoredump.a
diff --git a/tools/sdk/lib/libespnow.a b/tools/sdk/lib/libespnow.a
diff --git a/tools/sdk/lib/libethernet.a b/tools/sdk/lib/libethernet.a
diff --git a/tools/sdk/lib/libexpat.a b/tools/sdk/lib/libexpat.a
diff --git a/tools/sdk/lib/libface_detection.a b/tools/sdk/lib/libface_detection.a
diff --git a/tools/sdk/lib/libface_recognition.a b/tools/sdk/lib/libface_recognition.a
diff --git a/tools/sdk/lib/libfatfs.a b/tools/sdk/lib/libfatfs.a
diff --git a/tools/sdk/lib/libfb_gfx.a b/tools/sdk/lib/libfb_gfx.a
diff --git a/tools/sdk/lib/libfreemodbus.a b/tools/sdk/lib/libfreemodbus.a
diff --git a/tools/sdk/lib/libfreertos.a b/tools/sdk/lib/libfreertos.a
diff --git a/tools/sdk/lib/libheap.a b/tools/sdk/lib/libheap.a
diff --git a/tools/sdk/lib/libimage_util.a b/tools/sdk/lib/libimage_util.a
diff --git a/tools/sdk/lib/libjsmn.a b/tools/sdk/lib/libjsmn.a
diff --git a/tools/sdk/lib/libjson.a b/tools/sdk/lib/libjson.a
diff --git a/tools/sdk/lib/liblibsodium.a b/tools/sdk/lib/liblibsodium.a
diff --git a/tools/sdk/lib/liblog.a b/tools/sdk/lib/liblog.a
diff --git a/tools/sdk/lib/liblwip.a b/tools/sdk/lib/liblwip.a
diff --git a/tools/sdk/lib/libmbedtls.a b/tools/sdk/lib/libmbedtls.a
diff --git a/tools/sdk/lib/libmdns.a b/tools/sdk/lib/libmdns.a
diff --git a/tools/sdk/lib/libmesh.a b/tools/sdk/lib/libmesh.a
diff --git a/tools/sdk/lib/libmicro-ecc.a b/tools/sdk/lib/libmicro-ecc.a
diff --git a/tools/sdk/lib/libmqtt.a b/tools/sdk/lib/libmqtt.a
diff --git a/tools/sdk/lib/libnet80211.a b/tools/sdk/lib/libnet80211.a
diff --git a/tools/sdk/lib/libnewlib.a b/tools/sdk/lib/libnewlib.a
diff --git a/tools/sdk/lib/libnghttp.a b/tools/sdk/lib/libnghttp.a
diff --git a/tools/sdk/lib/libnvs_flash.a b/tools/sdk/lib/libnvs_flash.a
diff --git a/tools/sdk/lib/libopenssl.a b/tools/sdk/lib/libopenssl.a
diff --git a/tools/sdk/lib/libpp.a b/tools/sdk/lib/libpp.a
diff --git a/tools/sdk/lib/libprotobuf-c.a b/tools/sdk/lib/libprotobuf-c.a
diff --git a/tools/sdk/lib/libprotocomm.a b/tools/sdk/lib/libprotocomm.a
diff --git a/tools/sdk/lib/libpthread.a b/tools/sdk/lib/libpthread.a
diff --git a/tools/sdk/lib/libsdmmc.a b/tools/sdk/lib/libsdmmc.a
diff --git a/tools/sdk/lib/libsmartconfig.a b/tools/sdk/lib/libsmartconfig.a
diff --git a/tools/sdk/lib/libsmartconfig_ack.a b/tools/sdk/lib/libsmartconfig_ack.a
diff --git a/tools/sdk/lib/libsoc.a b/tools/sdk/lib/libsoc.a
diff --git a/tools/sdk/lib/libspi_flash.a b/tools/sdk/lib/libspi_flash.a
diff --git a/tools/sdk/lib/libspiffs.a b/tools/sdk/lib/libspiffs.a
diff --git a/tools/sdk/lib/libtcp_transport.a b/tools/sdk/lib/libtcp_transport.a
diff --git a/tools/sdk/lib/libtcpip_adapter.a b/tools/sdk/lib/libtcpip_adapter.a
diff --git a/tools/sdk/lib/libulp.a b/tools/sdk/lib/libulp.a
diff --git a/tools/sdk/lib/libunity.a b/tools/sdk/lib/libunity.a
diff --git a/tools/sdk/lib/libvfs.a b/tools/sdk/lib/libvfs.a
diff --git a/tools/sdk/lib/libwear_levelling.a b/tools/sdk/lib/libwear_levelling.a
diff --git a/tools/sdk/lib/libwifi_provisioning.a b/tools/sdk/lib/libwifi_provisioning.a
diff --git a/tools/sdk/lib/libwpa.a b/tools/sdk/lib/libwpa.a
diff --git a/tools/sdk/lib/libwpa2.a b/tools/sdk/lib/libwpa2.a
diff --git a/tools/sdk/lib/libwpa_supplicant.a b/tools/sdk/lib/libwpa_supplicant.a
diff --git a/tools/sdk/lib/libwps.a b/tools/sdk/lib/libwps.a
diff --git a/tools/sdk/lib/libxtensa-debug-module.a b/tools/sdk/lib/libxtensa-debug-module.a
diff --git a/tools/sdk/sdkconfig b/tools/sdk/sdkconfig
@@ -240,6 +240,7 @@ CONFIG_HFP_AUDIO_DATA_PATH_PCM=y
 CONFIG_HFP_AUDIO_DATA_PATH_HCI=
 CONFIG_BT_SSP_ENABLED=y
 CONFIG_GATTS_ENABLE=y
+CONFIG_GATTS_BLUFI_ENABLE=y
 CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL=
 CONFIG_GATTS_SEND_SERVICE_CHANGE_AUTO=y
 CONFIG_GATTS_SEND_SERVICE_CHANGE_MODE=0