Skip to content

Commit 7649dd7

Browse files
me-no-devme-no-dev
committed
IDF release/v5.1 3f9ab2d6a6
1 parent 2108e2f commit 7649dd7

File tree

189 files changed

+3692
-2275
lines changed

Some content is hidden

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

189 files changed

+3692
-2275
lines changed

‎esp32/bin/bootloader_dio_40m.elf

0 Bytes
Binary file not shown.

‎esp32/bin/bootloader_dio_80m.elf

0 Bytes
Binary file not shown.

‎esp32/bin/bootloader_qio_40m.elf

0 Bytes
Binary file not shown.

‎esp32/bin/bootloader_qio_80m.elf

0 Bytes
Binary file not shown.

‎esp32/dio_qspi/include/sdkconfig.h

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -870,65 +870,6 @@
870870
#define CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES 16
871871
#define CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT 30
872872
#define CONFIG_WIFI_PROV_STA_ALL_CHANNEL_SCAN 1
873-
#define CONFIG_ESP_INSIGHTS_ENABLED 1
874-
#define CONFIG_ESP_INSIGHTS_TRANSPORT_HTTPS 1
875-
#define CONFIG_ESP_INSIGHTS_TRANSPORT_HTTPS_HOST "https://client.insights.espressif.com"
876-
#define CONFIG_ESP_INSIGHTS_CLOUD_POST_MIN_INTERVAL_SEC 60
877-
#define CONFIG_ESP_INSIGHTS_CLOUD_POST_MAX_INTERVAL_SEC 240
878-
#define CONFIG_ESP_INSIGHTS_META_VERSION_10 1
879-
#define CONFIG_DSP_OPTIMIZATIONS_SUPPORTED 1
880-
#define CONFIG_DSP_OPTIMIZED 1
881-
#define CONFIG_DSP_OPTIMIZATION 1
882-
#define CONFIG_DSP_MAX_FFT_SIZE_4096 1
883-
#define CONFIG_DSP_MAX_FFT_SIZE 4096
884-
#define CONFIG_MDNS_MAX_INTERFACES 3
885-
#define CONFIG_MDNS_MAX_SERVICES 10
886-
#define CONFIG_MDNS_TASK_PRIORITY 1
887-
#define CONFIG_MDNS_ACTION_QUEUE_LEN 16
888-
#define CONFIG_MDNS_TASK_STACK_SIZE 4096
889-
#define CONFIG_MDNS_TASK_AFFINITY_CPU0 1
890-
#define CONFIG_MDNS_TASK_AFFINITY 0x0
891-
#define CONFIG_MDNS_SERVICE_ADD_TIMEOUT_MS 2000
892-
#define CONFIG_MDNS_TIMER_PERIOD_MS 100
893-
#define CONFIG_MDNS_ENABLE_CONSOLE_CLI 1
894-
#define CONFIG_MDNS_MULTIPLE_INSTANCE 1
895-
#define CONFIG_MDNS_PREDEF_NETIF_STA 1
896-
#define CONFIG_MDNS_PREDEF_NETIF_AP 1
897-
#define CONFIG_MDNS_PREDEF_NETIF_ETH 1
898-
#define CONFIG_DIAG_LOG_MSG_ARG_FORMAT_TLV 1
899-
#define CONFIG_DIAG_LOG_MSG_ARG_MAX_SIZE 64
900-
#define CONFIG_DIAG_LOG_DROP_WIFI_LOGS 1
901-
#define CONFIG_DIAG_ENABLE_METRICS 1
902-
#define CONFIG_DIAG_METRICS_MAX_COUNT 20
903-
#define CONFIG_DIAG_ENABLE_HEAP_METRICS 1
904-
#define CONFIG_DIAG_ENABLE_WIFI_METRICS 1
905-
#define CONFIG_DIAG_ENABLE_VARIABLES 1
906-
#define CONFIG_DIAG_VARIABLES_MAX_COUNT 20
907-
#define CONFIG_DIAG_ENABLE_NETWORK_VARIABLES 1
908-
#define CONFIG_ESP_MODEM_CMUX_DEFRAGMENT_PAYLOAD 1
909-
#define CONFIG_ESP_MODEM_CMUX_DELAY_AFTER_DLCI_SETUP 0
910-
#define CONFIG_DIAG_DATA_STORE_RTC 1
911-
#define CONFIG_DIAG_DATA_STORE_REPORTING_WATERMARK_PERCENT 80
912-
#define CONFIG_RTC_STORE_DATA_SIZE 3072
913-
#define CONFIG_RTC_STORE_CRITICAL_DATA_SIZE 2048
914-
#define CONFIG_OV7670_SUPPORT 1
915-
#define CONFIG_OV7725_SUPPORT 1
916-
#define CONFIG_NT99141_SUPPORT 1
917-
#define CONFIG_OV2640_SUPPORT 1
918-
#define CONFIG_OV3660_SUPPORT 1
919-
#define CONFIG_OV5640_SUPPORT 1
920-
#define CONFIG_GC2145_SUPPORT 1
921-
#define CONFIG_GC032A_SUPPORT 1
922-
#define CONFIG_GC0308_SUPPORT 1
923-
#define CONFIG_BF3005_SUPPORT 1
924-
#define CONFIG_BF20A6_SUPPORT 1
925-
#define CONFIG_SC030IOT_SUPPORT 1
926-
#define CONFIG_SCCB_HARDWARE_I2C_PORT1 1
927-
#define CONFIG_SCCB_CLK_FREQ 100000
928-
#define CONFIG_GC_SENSOR_SUBSAMPLE_MODE 1
929-
#define CONFIG_CAMERA_TASK_STACK_SIZE 2048
930-
#define CONFIG_CAMERA_CORE0 1
931-
#define CONFIG_CAMERA_DMA_BUFFER_SIZE_MAX 32768
932873
#define CONFIG_ESP_RMAKER_LIB_ESP_MQTT 1
933874
#define CONFIG_ESP_RMAKER_MQTT_GLUE_LIB 1
934875
#define CONFIG_ESP_RMAKER_MQTT_PORT_443 1
@@ -947,6 +888,8 @@
947888
#define CONFIG_ESP_RMAKER_DEF_TIMEZONE "Asia/Shanghai"
948889
#define CONFIG_ESP_RMAKER_SNTP_SERVER_NAME "pool.ntp.org"
949890
#define CONFIG_ESP_RMAKER_MAX_COMMANDS 10
891+
#define CONFIG_ESP_MODEM_CMUX_DEFRAGMENT_PAYLOAD 1
892+
#define CONFIG_ESP_MODEM_CMUX_DELAY_AFTER_DLCI_SETUP 0
950893
#define CONFIG_LITTLEFS_MAX_PARTITIONS 3
951894
#define CONFIG_LITTLEFS_PAGE_SIZE 256
952895
#define CONFIG_LITTLEFS_OBJ_NAME_LEN 64
@@ -959,6 +902,63 @@
959902
#define CONFIG_LITTLEFS_MTIME_USE_SECONDS 1
960903
#define CONFIG_LITTLEFS_MALLOC_STRATEGY_DEFAULT 1
961904
#define CONFIG_LITTLEFS_ASSERTS 1
905+
#define CONFIG_DIAG_LOG_MSG_ARG_FORMAT_TLV 1
906+
#define CONFIG_DIAG_LOG_MSG_ARG_MAX_SIZE 64
907+
#define CONFIG_DIAG_LOG_DROP_WIFI_LOGS 1
908+
#define CONFIG_DIAG_ENABLE_METRICS 1
909+
#define CONFIG_DIAG_METRICS_MAX_COUNT 20
910+
#define CONFIG_DIAG_ENABLE_HEAP_METRICS 1
911+
#define CONFIG_DIAG_ENABLE_WIFI_METRICS 1
912+
#define CONFIG_DIAG_ENABLE_VARIABLES 1
913+
#define CONFIG_DIAG_VARIABLES_MAX_COUNT 20
914+
#define CONFIG_DIAG_ENABLE_NETWORK_VARIABLES 1
915+
#define CONFIG_OV7670_SUPPORT 1
916+
#define CONFIG_OV7725_SUPPORT 1
917+
#define CONFIG_NT99141_SUPPORT 1
918+
#define CONFIG_OV2640_SUPPORT 1
919+
#define CONFIG_OV3660_SUPPORT 1
920+
#define CONFIG_OV5640_SUPPORT 1
921+
#define CONFIG_GC2145_SUPPORT 1
922+
#define CONFIG_GC032A_SUPPORT 1
923+
#define CONFIG_GC0308_SUPPORT 1
924+
#define CONFIG_BF3005_SUPPORT 1
925+
#define CONFIG_BF20A6_SUPPORT 1
926+
#define CONFIG_SC030IOT_SUPPORT 1
927+
#define CONFIG_SCCB_HARDWARE_I2C_PORT1 1
928+
#define CONFIG_SCCB_CLK_FREQ 100000
929+
#define CONFIG_GC_SENSOR_SUBSAMPLE_MODE 1
930+
#define CONFIG_CAMERA_TASK_STACK_SIZE 2048
931+
#define CONFIG_CAMERA_CORE0 1
932+
#define CONFIG_CAMERA_DMA_BUFFER_SIZE_MAX 32768
933+
#define CONFIG_MDNS_MAX_INTERFACES 3
934+
#define CONFIG_MDNS_MAX_SERVICES 10
935+
#define CONFIG_MDNS_TASK_PRIORITY 1
936+
#define CONFIG_MDNS_ACTION_QUEUE_LEN 16
937+
#define CONFIG_MDNS_TASK_STACK_SIZE 4096
938+
#define CONFIG_MDNS_TASK_AFFINITY_CPU0 1
939+
#define CONFIG_MDNS_TASK_AFFINITY 0x0
940+
#define CONFIG_MDNS_SERVICE_ADD_TIMEOUT_MS 2000
941+
#define CONFIG_MDNS_TIMER_PERIOD_MS 100
942+
#define CONFIG_MDNS_ENABLE_CONSOLE_CLI 1
943+
#define CONFIG_MDNS_MULTIPLE_INSTANCE 1
944+
#define CONFIG_MDNS_PREDEF_NETIF_STA 1
945+
#define CONFIG_MDNS_PREDEF_NETIF_AP 1
946+
#define CONFIG_MDNS_PREDEF_NETIF_ETH 1
947+
#define CONFIG_DIAG_DATA_STORE_RTC 1
948+
#define CONFIG_DIAG_DATA_STORE_REPORTING_WATERMARK_PERCENT 80
949+
#define CONFIG_RTC_STORE_DATA_SIZE 3072
950+
#define CONFIG_RTC_STORE_CRITICAL_DATA_SIZE 2048
951+
#define CONFIG_ESP_INSIGHTS_ENABLED 1
952+
#define CONFIG_ESP_INSIGHTS_TRANSPORT_HTTPS 1
953+
#define CONFIG_ESP_INSIGHTS_TRANSPORT_HTTPS_HOST "https://client.insights.espressif.com"
954+
#define CONFIG_ESP_INSIGHTS_CLOUD_POST_MIN_INTERVAL_SEC 60
955+
#define CONFIG_ESP_INSIGHTS_CLOUD_POST_MAX_INTERVAL_SEC 240
956+
#define CONFIG_ESP_INSIGHTS_META_VERSION_10 1
957+
#define CONFIG_DSP_OPTIMIZATIONS_SUPPORTED 1
958+
#define CONFIG_DSP_OPTIMIZED 1
959+
#define CONFIG_DSP_OPTIMIZATION 1
960+
#define CONFIG_DSP_MAX_FFT_SIZE_4096 1
961+
#define CONFIG_DSP_MAX_FFT_SIZE 4096
962962

963963
/* List of deprecated options */
964964
#define CONFIG_A2DP_ENABLE CONFIG_BT_A2DP_ENABLE
@@ -1120,5 +1120,5 @@
11201120
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
11211121
#define CONFIG_WPA_MBEDTLS_CRYPTO CONFIG_ESP_WIFI_MBEDTLS_CRYPTO
11221122
#define CONFIG_WPA_MBEDTLS_TLS_CLIENT CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT
1123-
#define CONFIG_ARDUINO_IDF_COMMIT "cfe861582c"
1123+
#define CONFIG_ARDUINO_IDF_COMMIT "3f9ab2d6a6"
11241124
#define CONFIG_ARDUINO_IDF_BRANCH "release/v5.1"

‎esp32/flags/defines

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
-DESP_PLATFORM -DIDF_VER=\"v5.1.4-243-gcfe861582c-dirty\" -DMBEDTLS_CONFIG_FILE=\"mbedtls/esp_config.h\" -DSOC_MMU_PAGE_SIZE=CONFIG_MMU_PAGE_SIZE -DUNITY_INCLUDE_CONFIG_H -D_GNU_SOURCE -D_POSIX_READER_WRITER_LOCKS -DconfigENABLE_FREERTOS_DEBUG_OCDAWARE=1 -DTF_LITE_STATIC_MEMORY
1+
-DESP_PLATFORM -DIDF_VER=\"v5.1.4-257-g3f9ab2d6a6-dirty\" -DMBEDTLS_CONFIG_FILE=\"mbedtls/esp_config.h\" -DSOC_MMU_PAGE_SIZE=CONFIG_MMU_PAGE_SIZE -DUNITY_INCLUDE_CONFIG_H -D_GNU_SOURCE -D_POSIX_READER_WRITER_LOCKS -DconfigENABLE_FREERTOS_DEBUG_OCDAWARE=1 -DTF_LITE_STATIC_MEMORY

‎esp32/include/bt/esp_ble_mesh/api/core/include/esp_ble_mesh_common_api.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2017-2024 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -33,7 +33,10 @@ esp_err_t esp_ble_mesh_init(esp_ble_mesh_prov_t *prov, esp_ble_mesh_comp_t *comp
3333
/**
3434
* @brief De-initialize BLE Mesh module.
3535
*
36-
* @note This function shall be invoked after esp_ble_mesh_client_model_deinit().
36+
* @note
37+
* 1. This function shall be invoked after esp_ble_mesh_client_model_deinit().
38+
* 2. This function is strictly forbidden to run in any BTC Task Context
39+
* (e.g. registered Mesh Event Callback).
3740
*
3841
* @param[in] param: Pointer to the structure of BLE Mesh deinit parameters.
3942
*

‎esp32/include/hal/include/hal/usb_fsls_phy_hal.h

Lines changed: 0 additions & 82 deletions
This file was deleted.

‎esp32/include/hal/include/hal/usb_serial_jtag_hal.h

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
/*
2+
* SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
#pragma once
8+
9+
#include "soc/soc_caps.h"
10+
#if SOC_USB_SERIAL_JTAG_SUPPORTED
11+
#include "hal/usb_serial_jtag_ll.h"
12+
#endif
13+
#include "hal/usb_serial_jtag_types.h"
14+
15+
#ifdef __cplusplus
16+
extern "C" {
17+
#endif
18+
19+
#if SOC_USB_SERIAL_JTAG_SUPPORTED
20+
21+
/**
22+
* @brief HAL context type of USJ driver
23+
*/
24+
typedef struct {
25+
usb_serial_jtag_dev_t *dev;
26+
} usb_serial_jtag_hal_context_t;
27+
28+
/**
29+
* @brief Initialize the USJ HAL driver
30+
*
31+
* @param hal USJ HAL context
32+
*/
33+
void usb_serial_jtag_hal_init(usb_serial_jtag_hal_context_t *hal);
34+
35+
/* ---------------------------- USB PHY Control ---------------------------- */
36+
37+
#if USB_SERIAL_JTAG_LL_EXT_PHY_SUPPORTED
38+
/**
39+
* @brief Configure whether USJ is routed to internal/external FSLS PHY
40+
*
41+
* @param hal USJ HAL context
42+
* @param external True if external, False if internal
43+
*/
44+
void usb_serial_jtag_hal_phy_set_external(usb_serial_jtag_hal_context_t *hal, bool external);
45+
#endif // USB_SERIAL_JTAG_LL_EXT_PHY_SUPPORTED
46+
47+
#endif // SOC_USB_SERIAL_JTAG_SUPPORTED
48+
49+
#ifdef __cplusplus
50+
}
51+
#endif

‎esp32/include/hal/include/hal/usb_serial_jtag_types.h

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
/*
2+
* SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
#pragma once
8+
9+
#include <stdbool.h>
10+
#include "soc/soc_caps.h"
11+
12+
#ifdef __cplusplus
13+
extern "C" {
14+
#endif
15+
16+
#if SOC_USB_SERIAL_JTAG_SUPPORTED
17+
18+
/**
19+
* @brief USJ test mode values
20+
*
21+
* Specifies the logic values of each of the USB FSLS Serial PHY interface
22+
* signals when in test mode.
23+
*/
24+
typedef struct {
25+
bool dp_pu; /**< D+ pull-up resistor enable/disable */
26+
bool dm_pu; /**< D- pull-up resistor enable/disable */
27+
bool dp_pd; /**< D+ pull-down resistor enable/disable */
28+
bool dm_pd; /**< D- pull-down resistor enable/disable */
29+
} usb_serial_jtag_pull_override_vals_t;
30+
31+
#endif // SOC_USB_SERIAL_JTAG_SUPPORTED
32+
33+
#ifdef __cplusplus
34+
}
35+
#endif

0 commit comments

Comments
 (0)