Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit b0e896e

Browse filesBrowse files
me-no-devme-no-dev
me-no-dev
and
me-no-dev
authored
IDF release/v3.3 cd59d107b (espressif#4708)
Co-authored-by: me-no-dev <me-no-dev@github.com>
1 parent 08f4665 commit b0e896e
Copy full SHA for b0e896e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

78 files changed

+11
-27
lines changed

‎tools/sdk/include/config/sdkconfig.h

Copy file name to clipboardExpand all lines: tools/sdk/include/config/sdkconfig.h
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,7 @@
373373
#define CONFIG_SPIFFS_PAGE_SIZE 256
374374
#define CONFIG_MBEDTLS_ECP_DP_SECP192K1_ENABLED 1
375375
#define CONFIG_ESP32_DPORT_WORKAROUND 1
376+
#define CONFIG_GATTS_BLUFI_ENABLE 1
376377
#define CONFIG_PPP_MSCHAP_SUPPORT 1
377378
#define CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0 1
378379
#define CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT 2048
@@ -395,5 +396,5 @@
395396
#define CONFIG_BTDM_MODEM_SLEEP_MODE_ORIG 1
396397
#define CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_ERROR 1
397398
#define CONFIG_FATFS_API_ENCODING_ANSI_OEM 1
398-
#define CONFIG_ARDUINO_IDF_COMMIT "71df1f742"
399+
#define CONFIG_ARDUINO_IDF_COMMIT "cd59d107b"
399400
#define CONFIG_ARDUINO_IDF_BRANCH "release/v3.3"

‎tools/sdk/include/esp32/esp_event_legacy.h

Copy file name to clipboardExpand all lines: tools/sdk/include/esp32/esp_event_legacy.h
-4Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,6 @@ typedef struct {
106106
tcpip_adapter_ip6_info_t ip6_info;
107107
} system_event_got_ip6_t;
108108

109-
/** Argument structure of SYSTEM_EVENT_STA_WPS_ER_SUCCESS event */
110-
typedef wifi_event_sta_wps_er_success_t system_event_sta_wps_er_success_t;
111-
112109
typedef struct {
113110
uint8_t mac[6]; /**< MAC address of the station connected to ESP32 soft-AP */
114111
uint8_t aid; /**< the aid that ESP32 soft-AP gives to the station connected to */
@@ -136,7 +133,6 @@ typedef union {
136133
system_event_sta_got_ip_t got_ip; /**< ESP32 station got IP, first time got IP or when IP is changed */
137134
system_event_sta_wps_er_pin_t sta_er_pin; /**< ESP32 station WPS enrollee mode PIN code received */
138135
system_event_sta_wps_fail_reason_t sta_er_fail_reason;/**< ESP32 station WPS enrollee mode failed reason code received */
139-
system_event_sta_wps_er_success_t sta_er_success; /*!< ESP32 station WPS enrollee success */
140136
system_event_ap_staconnected_t sta_connected; /**< a station connected to ESP32 soft-AP */
141137
system_event_ap_stadisconnected_t sta_disconnected; /**< a station disconnected to ESP32 soft-AP */
142138
system_event_ap_probe_req_rx_t ap_probereqrecved; /**< ESP32 soft-AP receive probe request packet */

‎tools/sdk/include/esp32/esp_wifi_types.h

Copy file name to clipboardExpand all lines: tools/sdk/include/esp32/esp_wifi_types.h
-13Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -502,19 +502,6 @@ typedef enum {
502502
WIFI_IOCTL_MAX,
503503
} wifi_ioctl_cmd_t;
504504

505-
#define MAX_SSID_LEN 32
506-
#define MAX_PASSPHRASE_LEN 64
507-
#define MAX_WPS_AP_CRED 3
508-
509-
/** Argument structure for WIFI_EVENT_STA_WPS_ER_SUCCESS event */
510-
typedef struct {
511-
uint8_t ap_cred_cnt; /**< Number of AP credentials received */
512-
struct {
513-
uint8_t ssid[MAX_SSID_LEN]; /**< SSID of AP */
514-
uint8_t passphrase[MAX_PASSPHRASE_LEN]; /**< Passphrase for the AP */
515-
} ap_cred[MAX_WPS_AP_CRED]; /**< All AP credentials received from WPS handshake */
516-
} wifi_event_sta_wps_er_success_t;
517-
518505
/**
519506
* @brief Configuration for STA's HT2040 coexist management
520507
*

‎tools/sdk/include/wpa_supplicant/wps/wps.h

Copy file name to clipboardExpand all lines: tools/sdk/include/wpa_supplicant/wps/wps.h
+6-7Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1024,14 +1024,13 @@ struct wps_sm {
10241024
u8 identity_len;
10251025
u8 ownaddr[ETH_ALEN];
10261026
u8 bssid[ETH_ALEN];
1027-
u8 ssid[MAX_WPS_AP_CRED][MAX_SSID_LEN];
1028-
u8 ssid_len[MAX_WPS_AP_CRED];
1029-
char key[MAX_WPS_AP_CRED][MAX_PASSPHRASE_LEN];
1030-
u8 key_len[MAX_WPS_AP_CRED];
1031-
u8 ap_cred_cnt;
1027+
u8 ssid[32];
1028+
u8 ssid_len;
10321029
struct wps_device_data *dev;
10331030
u8 uuid[16];
10341031
u8 eapol_version;
1032+
char key[64];
1033+
u8 key_len;
10351034
ETSTimer wps_timeout_timer;
10361035
ETSTimer wps_msg_timeout_timer;
10371036
ETSTimer wps_scan_timer;
@@ -1055,8 +1054,8 @@ struct wps_sm {
10551054
#define IEEE80211_CAPINFO_PRIVACY 0x0010
10561055

10571056
struct wps_sm *wps_sm_get(void);
1058-
int wps_ssid_save(u8 *ssid, u8 ssid_len, u8 idx);
1059-
int wps_key_save(char *key, u8 key_len, u8 idx);
1057+
int wps_ssid_save(u8 *ssid, u8 ssid_len);
1058+
int wps_key_save(char *key, u8 key_len);
10601059
int wps_station_wps_register_cb(wps_st_cb_t cb);
10611060
int wps_station_wps_unregister_cb(void);
10621061
int wps_start_pending(void);

‎tools/sdk/ld/esp32.project.ld

Copy file name to clipboardExpand all lines: tools/sdk/ld/esp32.project.ld
+2-2Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

‎tools/sdk/lib/libapp_trace.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libapp_update.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libasio.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libbootloader_support.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libbt.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libcoap.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libcoexist.a

Copy file name to clipboard
20 Bytes
Binary file not shown.

‎tools/sdk/lib/libconsole.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libcore.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libcxx.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libdriver.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libefuse.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libesp-tls.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libesp32-camera.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libesp32.a

Copy file name to clipboard
-1.26 KB
Binary file not shown.

‎tools/sdk/lib/libesp_adc_cal.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libesp_event.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libesp_http_client.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libesp_http_server.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libesp_https_ota.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libesp_https_server.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libesp_ringbuf.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libesp_websocket_client.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libespcoredump.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libespnow.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libethernet.a

Copy file name to clipboard
-428 Bytes
Binary file not shown.

‎tools/sdk/lib/libexpat.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libface_detection.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libface_recognition.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libfatfs.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libfb_gfx.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libfreemodbus.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libfreertos.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libheap.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libimage_util.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libjsmn.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libjson.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/liblibsodium.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/liblog.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/liblwip.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libmbedtls.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libmdns.a

Copy file name to clipboard
-364 Bytes
Binary file not shown.

‎tools/sdk/lib/libmesh.a

Copy file name to clipboard
-1.48 KB
Binary file not shown.

‎tools/sdk/lib/libmicro-ecc.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libmqtt.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libnet80211.a

Copy file name to clipboard
736 Bytes
Binary file not shown.

‎tools/sdk/lib/libnewlib.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libnghttp.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libnvs_flash.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libopenssl.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libpp.a

Copy file name to clipboard
40 Bytes
Binary file not shown.

‎tools/sdk/lib/libprotobuf-c.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libprotocomm.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libpthread.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libsdmmc.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libsmartconfig.a

Copy file name to clipboard
8 Bytes
Binary file not shown.

‎tools/sdk/lib/libsmartconfig_ack.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libsoc.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libspi_flash.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libspiffs.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libtcp_transport.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libtcpip_adapter.a

Copy file name to clipboard
-672 Bytes
Binary file not shown.

‎tools/sdk/lib/libulp.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libunity.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libvfs.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libwear_levelling.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/lib/libwifi_provisioning.a

Copy file name to clipboard
-404 Bytes
Binary file not shown.

‎tools/sdk/lib/libwpa.a

Copy file name to clipboard
-20 Bytes
Binary file not shown.

‎tools/sdk/lib/libwpa2.a

Copy file name to clipboard
-4 Bytes
Binary file not shown.

‎tools/sdk/lib/libwpa_supplicant.a

Copy file name to clipboard
-1.05 KB
Binary file not shown.

‎tools/sdk/lib/libwps.a

Copy file name to clipboard
-388 Bytes
Binary file not shown.

‎tools/sdk/lib/libxtensa-debug-module.a

Copy file name to clipboard
0 Bytes
Binary file not shown.

‎tools/sdk/sdkconfig

Copy file name to clipboardExpand all lines: tools/sdk/sdkconfig
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,7 @@ CONFIG_HFP_AUDIO_DATA_PATH_PCM=y
240240
CONFIG_HFP_AUDIO_DATA_PATH_HCI=
241241
CONFIG_BT_SSP_ENABLED=y
242242
CONFIG_GATTS_ENABLE=y
243+
CONFIG_GATTS_BLUFI_ENABLE=y
243244
CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL=
244245
CONFIG_GATTS_SEND_SERVICE_CHANGE_AUTO=y
245246
CONFIG_GATTS_SEND_SERVICE_CHANGE_MODE=0

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.