Skip to content

Commit 839d943

Browse files
author
me-no-dev
committed
IDF release/v3.3 d3cc7c0da
1 parent b50a175 commit 839d943

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+255
-152
lines changed

tools/sdk/include/bt/esp_bt.h

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
extern "C" {
2626
#endif
2727

28-
#define ESP_BT_CONTROLLER_CONFIG_MAGIC_VAL 0x20190506
28+
#define ESP_BT_CONTROLLER_CONFIG_MAGIC_VAL 0x20200106
2929

3030
/**
3131
* @brief Bluetooth mode for controller enable/disable
@@ -96,6 +96,12 @@ the adv packet will be discarded until the memory is restored. */
9696
#define BTDM_CONTROLLER_MODE_EFF ESP_BT_MODE_BTDM
9797
#endif
9898

99+
#ifdef CONFIG_BTDM_CTRL_AUTO_LATENCY_EFF
100+
#define BTDM_CTRL_AUTO_LATENCY_EFF CONFIG_BTDM_CTRL_AUTO_LATENCY_EFF
101+
#else
102+
#define BTDM_CTRL_AUTO_LATENCY_EFF false
103+
#endif
104+
99105
#define BTDM_CONTROLLER_BLE_MAX_CONN_LIMIT 9 //Maximum BLE connection limitation
100106
#define BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_LIMIT 7 //Maximum ACL connection limitation
101107
#define BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_LIMIT 3 //Maximum SCO/eSCO connection limitation
@@ -119,6 +125,7 @@ the adv packet will be discarded until the memory is restored. */
119125
.bt_max_acl_conn = CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF, \
120126
.bt_sco_datapath = CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF, \
121127
.bt_max_sync_conn = CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF, \
128+
.auto_latency = BTDM_CTRL_AUTO_LATENCY_EFF, \
122129
.magic = ESP_BT_CONTROLLER_CONFIG_MAGIC_VAL, \
123130
};
124131

@@ -149,6 +156,7 @@ typedef struct {
149156
uint8_t ble_max_conn; /*!< BLE maximum connection numbers */
150157
uint8_t bt_max_acl_conn; /*!< BR/EDR maximum ACL connection numbers */
151158
uint8_t bt_sco_datapath; /*!< SCO data path, i.e. HCI or PCM module */
159+
bool auto_latency; /*!< BLE auto latency, used to enhance classic BT performance */
152160
/*
153161
* Following parameters can not be configured runtime when call esp_bt_controller_init()
154162
* It will be overwrite with a constant value which in menuconfig or from a macro.

tools/sdk/include/config/sdkconfig.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@
238238
#define CONFIG_SPIFFS_GC_MAX_RUNS 10
239239
#define CONFIG_ARDUINO_RUN_CORE1 1
240240
#define CONFIG_ESP32_APPTRACE_DEST_NONE 1
241+
#define CONFIG_ESP32_WIFI_RX_IRAM_OPT 1
241242
#define CONFIG_MBEDTLS_INTERNAL_MEM_ALLOC 1
242243
#define CONFIG_MBEDTLS_SSL_PROTO_TLS1_2 1
243244
#define CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_RSA 1
@@ -379,5 +380,5 @@
379380
#define CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_ERROR 1
380381
#define CONFIG_ESP32_WIFI_IRAM_OPT 1
381382
#define CONFIG_FATFS_API_ENCODING_ANSI_OEM 1
382-
#define CONFIG_ARDUINO_IDF_COMMIT "367c3c09c"
383+
#define CONFIG_ARDUINO_IDF_COMMIT "d3cc7c0da"
383384
#define CONFIG_ARDUINO_IDF_BRANCH "release/v3.3"

tools/sdk/include/esp32-camera/esp_camera.h

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,19 @@ void esp_camera_fb_return(camera_fb_t * fb);
171171
*/
172172
sensor_t * esp_camera_sensor_get();
173173

174+
/**
175+
* @brief Save camera settings to non-volatile-storage (NVS)
176+
*
177+
* @param key A unique nvs key name for the camera settings
178+
*/
179+
esp_err_t esp_camera_save_to_nvs(const char *key);
180+
181+
/**
182+
* @brief Load camera settings from non-volatile-storage (NVS)
183+
*
184+
* @param key A unique nvs key name for the camera settings
185+
*/
186+
esp_err_t esp_camera_load_from_nvs(const char *key);
174187

175188
#ifdef __cplusplus
176189
}

tools/sdk/include/esp32/esp_phy_init.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,18 @@ esp_err_t esp_phy_rf_deinit(phy_rf_module_t module);
202202
*/
203203
void esp_phy_load_cal_and_init(phy_rf_module_t module);
204204

205+
/**
206+
* @brief Enable WiFi/BT common clock
207+
*
208+
*/
209+
void esp_phy_common_clock_enable(void);
210+
211+
/**
212+
* @brief Disable WiFi/BT common clock
213+
*
214+
*/
215+
void esp_phy_common_clock_disable(void);
216+
205217
/**
206218
* @brief Module requires to enter modem sleep
207219
*/

tools/sdk/include/esp32/esp_wifi.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -542,8 +542,10 @@ esp_err_t esp_wifi_get_bandwidth(wifi_interface_t ifx, wifi_bandwidth_t *bw);
542542
/**
543543
* @brief Set primary/secondary channel of ESP32
544544
*
545-
* @attention 1. This is a special API for sniffer
546-
* @attention 2. This API should be called after esp_wifi_start() and esp_wifi_set_promiscuous()
545+
* @attention 1. This API should be called after esp_wifi_start()
546+
* @attention 2. When ESP32 is in STA mode, this API should not be called when STA is scanning or connecting to an external AP
547+
* @attention 3. When ESP32 is in softAP mode, this API should not be called when softAP has connected to external STAs
548+
* @attention 4. When ESP32 is in STA+softAP mode, this API should not be called when in the scenarios described above
547549
*
548550
* @param primary for HT20, primary is the channel number, for HT40, primary is the primary channel
549551
* @param second for HT20, second is ignored, for HT40, second is the second channel

tools/sdk/include/esp32/esp_wifi_internal.h

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,43 @@ esp_err_t esp_wifi_internal_set_log_mod(wifi_log_module_t module, uint32_t submo
318318
*/
319319
esp_err_t esp_wifi_internal_get_log(wifi_log_level_t *log_level, uint32_t *log_mod);
320320

321+
/**
322+
* @brief Get the user-configured channel info
323+
*
324+
* @param ifx : WiFi interface
325+
* @param primary : store the configured primary channel
326+
* @param second : store the configured second channel
327+
*
328+
* @return
329+
* - ESP_OK: succeed
330+
*/
331+
esp_err_t esp_wifi_internal_get_config_channel(wifi_interface_t ifx, uint8_t *primary, uint8_t *second);
332+
333+
/**
334+
* @brief Get the negotiated channel info after WiFi connection established
335+
*
336+
* @param ifx : WiFi interface
337+
* @param aid : the connection number when a STA connects to the softAP
338+
* @param primary : store the negotiated primary channel
339+
* @param second : store the negotiated second channel
340+
* @attention the aid param is only works when the ESP32 in softAP/softAP+STA mode
341+
*
342+
* @return
343+
* - ESP_OK: succeed
344+
*/
345+
esp_err_t esp_wifi_internal_get_negotiated_channel(wifi_interface_t ifx, uint8_t aid, uint8_t *primary, uint8_t *second);
346+
347+
/**
348+
* @brief Get the negotiated bandwidth info after WiFi connection established
349+
*
350+
* @param ifx : WiFi interface
351+
* @param bw : store the negotiated bandwidth
352+
*
353+
* @return
354+
* - ESP_OK: succeed
355+
*/
356+
esp_err_t esp_wifi_internal_get_negotiated_bandwidth(wifi_interface_t ifx, uint8_t aid, uint8_t *bw);
357+
321358
#ifdef __cplusplus
322359
}
323360
#endif

tools/sdk/include/esp32/esp_wifi_os_adapter.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ typedef struct {
7878
void (* _dport_access_stall_other_cpu_end_wrap)(void);
7979
int32_t (* _phy_rf_deinit)(uint32_t module);
8080
void (* _phy_load_cal_and_init)(uint32_t module);
81+
void (* _phy_common_clock_enable)(void);
82+
void (* _phy_common_clock_disable)(void);
8183
int32_t (* _read_mac)(uint8_t* mac, uint32_t type);
8284
void (* _timer_arm)(void *timer, uint32_t tmout, bool repeat);
8385
void (* _timer_disarm)(void *timer);

tools/sdk/include/esp_http_client/esp_http_client.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -470,6 +470,17 @@ esp_err_t esp_http_client_set_redirection(esp_http_client_handle_t client);
470470
*/
471471
void esp_http_client_add_auth(esp_http_client_handle_t client);
472472

473+
/**
474+
* @brief Checks if entire data in the response has been read without any error.
475+
*
476+
* @param[in] client The esp_http_client handle
477+
*
478+
* @return
479+
* - true
480+
* - false
481+
*/
482+
bool esp_http_client_is_complete_data_received(esp_http_client_handle_t client);
483+
473484
#ifdef __cplusplus
474485
}
475486
#endif

tools/sdk/include/esp_https_ota/esp_https_ota.h

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#pragma once
1616

1717
#include <esp_http_client.h>
18-
#include <esp_ota_ops.h>
18+
#include <bootloader_common.h>
1919

2020
#ifdef __cplusplus
2121
extern "C" {
@@ -110,6 +110,19 @@ esp_err_t esp_https_ota_begin(esp_https_ota_config_t *ota_config, esp_https_ota_
110110
*/
111111
esp_err_t esp_https_ota_perform(esp_https_ota_handle_t https_ota_handle);
112112

113+
/**
114+
* @brief Checks if complete data was received or not
115+
*
116+
* @note This API can be called just before esp_https_ota_finish() to validate if the complete image was indeed received.
117+
*
118+
* @param[in] https_ota_handle pointer to esp_https_ota_handle_t structure
119+
*
120+
* @return
121+
* - false
122+
* - true
123+
*/
124+
bool esp_https_ota_is_complete_data_received(esp_https_ota_handle_t https_ota_handle);
125+
113126
/**
114127
* @brief Clean-up HTTPS OTA Firmware upgrade and close HTTPS connection
115128
*

0 commit comments

Comments
 (0)