IDF release/v4.0 48ea44f3d

Author: me-no-dev

platform.txt

@@ -35,7 +35,7 @@ compiler.S.flags=-c -g3 -x assembler-with-cpp -MMD -mlongcalls
 
 compiler.c.elf.cmd=xtensa-esp32-elf-gcc
 compiler.c.elf.flags=-nostdlib "-L{compiler.sdk.path}/lib" "-L{compiler.sdk.path}/ld" -T esp32_out.ld -T esp32.project.ld -T esp32.peripherals.ld -T esp32.rom.ld -T esp32.rom.libgcc.ld -T esp32.rom.syscalls.ld -T esp32.rom.newlib-data.ld -Wl,--gc-sections -Wl,-static -Wl,--undefined=uxTopUsedPriority -u call_user_start_cpu0 -u __cxa_guard_dummy -u ld_include_panic_highint_hdl -u newlib_include_locks_impl -u newlib_include_heap_impl -u newlib_include_syscalls_impl -u pthread_include_pthread_impl -u pthread_include_pthread_cond_impl -u pthread_include_pthread_local_storage_impl -fno-rtti -mfix-esp32-psram-cache-issue
-compiler.c.elf.libs=-lgcc -lesp_ringbuf -lfatfs -lcore -lesp_websocket_client -lspiffs -lconsole -lbtdm_app -lnet80211 -lfd -lasio -lheap -lvfs -ljson -lesp_http_client -lesp_event -lnewlib -lesp_gdbstub -lapp_update -llog -lesp32 -lesp_rom -lesp_eth -lfb_gfx -lod -lcoap -lsdmmc -lface_detection -limage_util -lphy -lopenssl -lesp_adc_cal -lface_recognition -lprotocomm -llwip -lspi_flash -lxtensa -ltcp_transport -ldl -lesp_wifi -lwear_levelling -lpp -lfr -lpthread -lrtc -lcoexist -lsmartconfig -lbootloader_support -lwpa_supplicant -lsoc -lefuse -lmqtt -lwifi_provisioning -lfreemodbus -lunity -lesp_https_ota -lcxx -lmdns -lbt -lhal -lespcoredump -ltcpip_adapter -lesp_common -lfreertos -lesp_local_ctrl -llibsodium -lexpat -lmesh -lespnow -lnvs_flash -lesp32-camera -lprotobuf-c -lnghttp -lapp_trace -ljsmn -ldriver -lm -lulp -lmbedtls -lesp-tls -lesp_http_server  -lc -lstdc++
+compiler.c.elf.libs=-lgcc -lcoexist -lheap -lpthread -lnvs_flash -lapp_update -lbtdm_app -lwifi_provisioning -lmesh -lm -lesp_websocket_client -lspiffs -lnghttp -lespnow -lsoc -lmbedtls -lface_detection -lface_recognition -lprotocomm -lmdns -lconsole -lbt -lesp_rom -lfreemodbus -lfb_gfx -lsdmmc -lfr -lcoap -lfd -lnet80211 -lcore -lexpat -lbootloader_support -lesp_gdbstub -lrtc -lesp_ringbuf -lasio -lxtensa -lspi_flash -lesp_adc_cal -ldl -lesp_common -lphy -lesp_eth -ljson -lesp_http_server -lwear_levelling -lesp32 -ljsmn -llibsodium -lcxx -lvfs -lpp -llog -lulp -lod -lunity -ldriver -lfreertos -lesp_http_client -lespcoredump -lopenssl -limage_util -lesp_https_ota -lwpa_supplicant -lmqtt -lhal -ltcpip_adapter -lesp_event -ltcp_transport -llwip -lesp-tls -lesp_wifi -lesp32-camera -lapp_trace -lesp_local_ctrl -lefuse -lnewlib -lsmartconfig -lfatfs -lprotobuf-c  -lc -lstdc++
 
 compiler.as.cmd=xtensa-esp32-elf-as
 

tools/platformio-build.py

@@ -186,7 +186,7 @@
     ],
 
     LIBS=[
-        "-lgcc", "-lesp_ringbuf", "-lfatfs", "-lcore", "-lesp_websocket_client", "-lspiffs", "-lconsole", "-lbtdm_app", "-lnet80211", "-lfd", "-lasio", "-lheap", "-lvfs", "-ljson", "-lesp_http_client", "-lesp_event", "-lnewlib", "-lesp_gdbstub", "-lapp_update", "-llog", "-lesp32", "-lesp_rom", "-lesp_eth", "-lfb_gfx", "-lod", "-lcoap", "-lsdmmc", "-lface_detection", "-limage_util", "-lphy", "-lopenssl", "-lesp_adc_cal", "-lface_recognition", "-lprotocomm", "-llwip", "-lspi_flash", "-lxtensa", "-ltcp_transport", "-ldl", "-lesp_wifi", "-lwear_levelling", "-lpp", "-lfr", "-lpthread", "-lrtc", "-lcoexist", "-lsmartconfig", "-lbootloader_support", "-lwpa_supplicant", "-lsoc", "-lefuse", "-lmqtt", "-lwifi_provisioning", "-lfreemodbus", "-lunity", "-lesp_https_ota", "-lcxx", "-lmdns", "-lbt", "-lhal", "-lespcoredump", "-ltcpip_adapter", "-lesp_common", "-lfreertos", "-lesp_local_ctrl", "-llibsodium", "-lexpat", "-lmesh", "-lespnow", "-lnvs_flash", "-lesp32-camera", "-lprotobuf-c", "-lnghttp", "-lapp_trace", "-ljsmn", "-ldriver", "-lm", "-lulp", "-lmbedtls", "-lesp-tls", "-lesp_http_server", "-lc", "-lstdc++"
+        "-lgcc", "-lcoexist", "-lheap", "-lpthread", "-lnvs_flash", "-lapp_update", "-lbtdm_app", "-lwifi_provisioning", "-lmesh", "-lm", "-lesp_websocket_client", "-lspiffs", "-lnghttp", "-lespnow", "-lsoc", "-lmbedtls", "-lface_detection", "-lface_recognition", "-lprotocomm", "-lmdns", "-lconsole", "-lbt", "-lesp_rom", "-lfreemodbus", "-lfb_gfx", "-lsdmmc", "-lfr", "-lcoap", "-lfd", "-lnet80211", "-lcore", "-lexpat", "-lbootloader_support", "-lesp_gdbstub", "-lrtc", "-lesp_ringbuf", "-lasio", "-lxtensa", "-lspi_flash", "-lesp_adc_cal", "-ldl", "-lesp_common", "-lphy", "-lesp_eth", "-ljson", "-lesp_http_server", "-lwear_levelling", "-lesp32", "-ljsmn", "-llibsodium", "-lcxx", "-lvfs", "-lpp", "-llog", "-lulp", "-lod", "-lunity", "-ldriver", "-lfreertos", "-lesp_http_client", "-lespcoredump", "-lopenssl", "-limage_util", "-lesp_https_ota", "-lwpa_supplicant", "-lmqtt", "-lhal", "-ltcpip_adapter", "-lesp_event", "-ltcp_transport", "-llwip", "-lesp-tls", "-lesp_wifi", "-lesp32-camera", "-lapp_trace", "-lesp_local_ctrl", "-lefuse", "-lnewlib", "-lsmartconfig", "-lfatfs", "-lprotobuf-c", "-lc", "-lstdc++"
     ],
 
     LIBSOURCE_DIRS=[

tools/sdk/include/bt/esp_blufi_api.h

@@ -83,6 +83,7 @@ typedef enum {
     ESP_BLUFI_DH_PARAM_ERROR,
     ESP_BLUFI_READ_PARAM_ERROR,
     ESP_BLUFI_MAKE_PUBLIC_ERROR,
+    ESP_BLUFI_DATA_FORMAT_ERROR,
 } esp_blufi_error_state_t;
 
 /**

tools/sdk/include/bt/esp_bt.h

@@ -25,7 +25,7 @@
 extern "C" {
 #endif
 
-#define ESP_BT_CONTROLLER_CONFIG_MAGIC_VAL  0x20200106
+#define ESP_BT_CONTROLLER_CONFIG_MAGIC_VAL  0x20200611
 
 /**
  * @brief Bluetooth mode for controller enable/disable
@@ -117,6 +117,12 @@ the adv packet will be discarded until the memory is restored. */
 #define BTDM_CTRL_AUTO_LATENCY_EFF false
 #endif
 
+#ifdef CONFIG_BTDM_CTRL_LEGACY_AUTH_VENDOR_EVT_EFF
+#define BTDM_CTRL_LEGACY_AUTH_VENDOR_EVT_EFF CONFIG_BTDM_CTRL_LEGACY_AUTH_VENDOR_EVT_EFF
+#else
+#define BTDM_CTRL_LEGACY_AUTH_VENDOR_EVT_EFF false
+#endif
+
 #define BTDM_CONTROLLER_BLE_MAX_CONN_LIMIT          9   //Maximum BLE connection limitation
 #define BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_LIMIT   7   //Maximum ACL connection limitation
 #define BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_LIMIT  3   //Maximum SCO/eSCO connection limitation
@@ -140,6 +146,7 @@ the adv packet will be discarded until the memory is restored. */
     .bt_max_acl_conn = CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN_EFF,           \
     .bt_sco_datapath = CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF,          \
     .auto_latency = BTDM_CTRL_AUTO_LATENCY_EFF,                            \
+    .bt_legacy_auth_vs_evt = BTDM_CTRL_LEGACY_AUTH_VENDOR_EVT_EFF,         \
     .bt_max_sync_conn = CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN_EFF,         \
     .ble_sca = CONFIG_BTDM_BLE_SLEEP_CLOCK_ACCURACY_INDEX_EFF,             \
     .magic = ESP_BT_CONTROLLER_CONFIG_MAGIC_VAL,                           \
@@ -173,6 +180,7 @@ typedef struct {
     uint8_t bt_max_acl_conn;                /*!< BR/EDR maximum ACL connection numbers */
     uint8_t bt_sco_datapath;                /*!< SCO data path, i.e. HCI or PCM module */
     bool auto_latency;                      /*!< BLE auto latency, used to enhance classic BT performance */
+    bool bt_legacy_auth_vs_evt;             /*!< BR/EDR Legacy auth complete event required to  protect from BIAS attack */
     /*
      * Following parameters can not be configured runtime when call esp_bt_controller_init()
      * It will be overwrite with a constant value which in menuconfig or from a macro.

tools/sdk/include/bt/esp_gap_bt_api.h

@@ -405,13 +405,15 @@ esp_err_t esp_bt_gap_register_callback(esp_bt_gap_cb_t callback);
 esp_err_t esp_bt_gap_set_scan_mode(esp_bt_connection_mode_t c_mode, esp_bt_discovery_mode_t d_mode);
 
 /**
- * @brief           Start device discovery. This function should be called after esp_bluedroid_enable() completes successfully.
- *                  esp_bt_gap_cb_t will be called with ESP_BT_GAP_DISC_STATE_CHANGED_EVT if discovery is started or halted.
- *                  esp_bt_gap_cb_t will be called with ESP_BT_GAP_DISC_RES_EVT if discovery result is got.
+ * @brief           This function starts Inquiry and Name Discovery. It should be called after esp_bluedroid_enable() completes successfully.
+ *                  When Inquiry is halted and cached results do not contain device name, then Name Discovery will connect to the peer target to get the device name.
+ *                  esp_bt_gap_cb_t will be called with ESP_BT_GAP_DISC_STATE_CHANGED_EVT when Inquriry is started or Name Discovery is completed.
+ *                  esp_bt_gap_cb_t will be called with ESP_BT_GAP_DISC_RES_EVT each time the two types of discovery results are got.
  *
- * @param[in]       mode - inquiry mode
- * @param[in]       inq_len - inquiry duration in 1.28 sec units, ranging from 0x01 to 0x30
- * @param[in]       num_rsps - number of inquiry responses that can be received, value 0 indicates an unlimited number of responses
+ * @param[in]       mode - Inquiry mode
+ * @param[in]       inq_len - Inquiry duration in 1.28 sec units, ranging from 0x01 to 0x30. This parameter only specifies the total duration of the Inquiry process,
+ *                          - when this time expires, Inquiry will be halted.
+ * @param[in]       num_rsps - Number of responses that can be received before the Inquiry is halted, value 0 indicates an unlimited number of responses.
  *
  * @return
  *                  - ESP_OK : Succeed
@@ -422,8 +424,9 @@ esp_err_t esp_bt_gap_set_scan_mode(esp_bt_connection_mode_t c_mode, esp_bt_disco
 esp_err_t esp_bt_gap_start_discovery(esp_bt_inq_mode_t mode, uint8_t inq_len, uint8_t num_rsps);
 
 /**
- * @brief           Cancel device discovery. This function should be called after esp_bluedroid_enable() completes successfully
- *                  esp_bt_gap_cb_t will be called with ESP_BT_GAP_DISC_STATE_CHANGED_EVT if discovery is stopped.
+ * @brief           Cancel Inquiry and Name Discovery. This function should be called after esp_bluedroid_enable() completes successfully.
+ *                  esp_bt_gap_cb_t will be called with ESP_BT_GAP_DISC_STATE_CHANGED_EVT if Inquiry or Name Discovery is cancelled by
+ *                  calling this function.
  *
  * @return
  *                  - ESP_OK : Succeed

tools/sdk/include/bt/esp_gatt_common_api.h

@@ -46,6 +46,7 @@ extern esp_err_t esp_ble_gatt_set_local_mtu (uint16_t mtu);
 
 #if (BLE_INCLUDED == TRUE)
 extern uint16_t esp_ble_get_sendable_packets_num (void);
+extern uint16_t esp_ble_get_cur_sendable_packets_num (uint16_t connid);
 #endif
 
 #ifdef __cplusplus

tools/sdk/include/bt/esp_gatts_api.h

@@ -326,7 +326,7 @@ esp_err_t esp_ble_gatts_app_unregister(esp_gatt_if_t gatts_if);
 
 /**
  * @brief           Create a service. When service creation is done, a callback
- *                  event BTA_GATTS_CREATE_SRVC_EVT is called to report status
+ *                  event ESP_GATTS_CREATE_EVT is called to report status
  *                  and service ID to the profile. The service ID obtained in
  *                  the callback function needs to be used when adding included
  *                  service and characteristics/descriptors into the service.
@@ -363,7 +363,7 @@ esp_err_t esp_ble_gatts_create_attr_tab(const esp_gatts_attr_db_t *gatts_attr_db
 /**
  * @brief           This function is called to add an included service. This function have to be called between 
  *                  'esp_ble_gatts_create_service' and 'esp_ble_gatts_add_char'.  After included
- *                  service is included, a callback event BTA_GATTS_ADD_INCL_SRVC_EVT
+ *                  service is included, a callback event ESP_GATTS_ADD_INCL_SRVC_EVT
  *                  is reported the included service ID.
  *
  * @param[in]       service_handle: service handle to which this included service is to
@@ -402,7 +402,7 @@ esp_err_t esp_ble_gatts_add_char(uint16_t service_handle,  esp_bt_uuid_t  *char_
 
 /**
  * @brief           This function is called to add characteristic descriptor. When
- *                  it's done, a callback event BTA_GATTS_ADD_DESCR_EVT is called
+ *                  it's done, a callback event ESP_GATTS_ADD_DESCR_EVT is called
  *                  to report the status and an ID number for this descriptor.
  *
  * @param[in]       service_handle: service handle to which this characteristic descriptor is to
@@ -425,7 +425,7 @@ esp_err_t esp_ble_gatts_add_char_descr (uint16_t service_handle,
 
 /**
  * @brief           This function is called to delete a service. When this is done,
- *                  a callback event BTA_GATTS_DELETE_EVT is report with the status.
+ *                  a callback event ESP_GATTS_DELETE_EVT is report with the status.
  *
  * @param[in]       service_handle: service_handle to be deleted.
  *

tools/sdk/include/config/sdkconfig.h

@@ -69,6 +69,8 @@
 #define CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN 0
 #define CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_PCM 1
 #define CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF 1
+#define CONFIG_BTDM_CTRL_LEGACY_AUTH_VENDOR_EVT 1
+#define CONFIG_BTDM_CTRL_LEGACY_AUTH_VENDOR_EVT_EFF 1
 #define CONFIG_BTDM_CTRL_BLE_MAX_CONN_EFF 3
 #define CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN_EFF 2
 #define CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN_EFF 0
@@ -122,6 +124,7 @@
 #define CONFIG_MTMN_LITE_QUANT 1
 #define CONFIG_MFN56_1X 1
 #define CONFIG_LSSH_SPARSE_MN_5 1
+#define CONFIG_ESP32_ECO3_CACHE_LOCK_FIX 1
 #define CONFIG_ESP32_REV_MIN_0 1
 #define CONFIG_ESP32_REV_MIN 0
 #define CONFIG_ESP32_DPORT_WORKAROUND 1
@@ -293,6 +296,7 @@
 #define CONFIG_LWIP_TCP_RECVMBOX_SIZE 6
 #define CONFIG_LWIP_TCP_QUEUE_OOSEQ 1
 #define CONFIG_LWIP_TCP_OVERSIZE_MSS 1
+#define CONFIG_LWIP_TCP_RTO_TIME 3000
 #define CONFIG_LWIP_MAX_UDP_PCBS 16
 #define CONFIG_LWIP_UDP_RECVMBOX_SIZE 6
 #define CONFIG_LWIP_TCPIP_TASK_STACK_SIZE 2560
@@ -613,6 +617,10 @@
 #define CONFIG_BLE_HOST_QUEUE_CONGESTION_CHECK CONFIG_BT_BLE_HOST_QUEUE_CONG_CHECK
 #endif
 
+#ifdef CONFIG_BLE_MESH_MEM_ALLOC_MODE_EXTERNAL
+#define CONFIG_BLE_MESH_ALLOC_FROM_PSRAM_FIRST CONFIG_BLE_MESH_MEM_ALLOC_MODE_EXTERNAL
+#endif
+
 #ifdef CONFIG_BLE_MESH_GATT_PROXY_SERVER
 #define CONFIG_BLE_MESH_GATT_PROXY CONFIG_BLE_MESH_GATT_PROXY_SERVER
 #endif
@@ -2189,5 +2197,5 @@
 #define CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP
 #endif
 
-#define CONFIG_ARDUINO_IDF_COMMIT "94d97499a"
+#define CONFIG_ARDUINO_IDF_COMMIT "48ea44f3d"
 #define CONFIG_ARDUINO_IDF_BRANCH "release/v4.0"

tools/sdk/include/efuse/esp_efuse.h

@@ -355,6 +355,11 @@ esp_err_t esp_efuse_update_secure_version(uint32_t secure_version);
  */
 void esp_efuse_init(uint32_t offset, uint32_t size);
 
+inline static bool soc_has_cache_lock_bug(void)
+{
+    return (esp_efuse_get_chip_ver() == 3);
+}
+
 #ifdef __cplusplus
 }
 #endif

tools/sdk/include/esp32/esp_sleep.h

@@ -89,10 +89,8 @@ esp_err_t esp_sleep_disable_wakeup_source(esp_sleep_source_t source);
 
 /**
  * @brief Enable wakeup by ULP coprocessor
- * @note In revisions 0 and 1 of the ESP32, ULP wakeup source
- *       can not be used when RTC_PERIPH power domain is forced
- *       to be powered on (ESP_PD_OPTION_ON) or when ext0 wakeup
- *       source is used.
+ * @note ULP wakeup source cannot be used when RTC_PERIPH power domain is forced
+ *       to be powered on (ESP_PD_OPTION_ON) or when ext0 wakeup source is used.
  * @return
  *      - ESP_OK on success
  *      - ESP_ERR_NOT_SUPPORTED if additional current by touch (CONFIG_ESP32_RTC_EXT_CRYST_ADDIT_CURRENT) is enabled.
@@ -112,8 +110,7 @@ esp_err_t esp_sleep_enable_timer_wakeup(uint64_t time_in_us);
 /**
  * @brief Enable wakeup by touch sensor
  *
- * @note In revisions 0 and 1 of the ESP32, touch wakeup source
- *       can not be used when RTC_PERIPH power domain is forced
+ * @note Touch wakeup source cannot be used when RTC_PERIPH power domain is forced
  *       to be powered on (ESP_PD_OPTION_ON) or when ext0 wakeup
  *       source is used.
  *
@@ -148,8 +145,7 @@ touch_pad_t esp_sleep_get_touchpad_wakeup_status();
  * @note This function does not modify pin configuration. The pin is
  *       configured in esp_sleep_start, immediately before entering sleep mode.
  *
- * @note In revisions 0 and 1 of the ESP32, ext0 wakeup source
- *       can not be used together with touch or ULP wakeup sources.
+ * @note ext0 wakeup source cannot be used together with touch or ULP wakeup sources.
  *
  * @param gpio_num  GPIO number used as wakeup source. Only GPIOs which are have RTC
  *             functionality can be used: 0,2,4,12-15,25-27,32-39.
@@ -206,8 +202,7 @@ esp_err_t esp_sleep_enable_ext1_wakeup(uint64_t mask, esp_sleep_ext1_wakeup_mode
  * wakeup level, for each GPIO which is used for wakeup.
  * Then call this function to enable wakeup feature.
  *
- * @note In revisions 0 and 1 of the ESP32, GPIO wakeup source
- *       can not be used together with touch or ULP wakeup sources.
+ * @note GPIO wakeup source cannot be used together with touch or ULP wakeup sources.
  *
  * @return
  *      - ESP_OK on success

tools/sdk/include/esp_common/esp_system.h

@@ -113,6 +113,16 @@ esp_reset_reason_t esp_reset_reason(void);
   */
 uint32_t esp_get_free_heap_size(void);
 
+/**
+  * @brief  Get the size of available internal heap.
+  *
+  * Note that the returned value may be larger than the maximum contiguous block
+  * which can be allocated.
+  *
+  * @return Available internal heap size, in bytes.
+  */
+uint32_t esp_get_free_internal_heap_size(void);
+
 /**
   * @brief Get the minimum heap that has ever been available
   *

tools/sdk/include/esp_wifi/esp_wifi_types.h

@@ -94,7 +94,7 @@ typedef enum {
     WIFI_REASON_ASSOC_FAIL               = 203,
     WIFI_REASON_HANDSHAKE_TIMEOUT        = 204,
     WIFI_REASON_CONNECTION_FAIL          = 205,
-    WIFI_REASON_AUTH_CHANGED             = 206,
+    WIFI_REASON_AP_TSF_RESET             = 206,
 } wifi_err_reason_t;
 
 typedef enum {

tools/sdk/include/lwip/lwip/opt.h

@@ -1534,6 +1534,11 @@
 #define LWIP_ALTCP_TLS                  0
 #endif
 
+#if ESP_LWIP
+#if !defined LWIP_TCP_RTO_TIME || defined __DOXYGEN__
+#define LWIP_TCP_RTO_TIME             3000
+#endif
+#endif
 /**
  * @}
  */

tools/sdk/include/lwip/lwipopts.h

@@ -376,6 +376,12 @@
 #define TCP_RCV_SCALE                   CONFIG_LWIP_TCP_RCV_SCALE
 #endif
 
+/**
+ * LWIP_TCP_RTO_TIME: TCP rto time.
+ * Default is 3 second.
+ */
+#define LWIP_TCP_RTO_TIME             CONFIG_LWIP_TCP_RTO_TIME
+
 /*
    ----------------------------------
    ---------- Pbuf options ----------