Skip to content

Commit 3cf1a07

Browse files
me-no-devme-no-dev
committed
IDF release/v5.1 c361705ae7
1 parent 302a33c commit 3cf1a07

File tree

199 files changed

+3796
-1788
lines changed

Some content is hidden

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

199 files changed

+3796
-1788
lines changed

‎esp32/dependencies.lock

+9-9
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,17 @@ dependencies:
3737
type: service
3838
version: 1.2.0
3939
espressif/esp-zboss-lib:
40-
component_hash: a9e17babb2d43edc4bb6bc320f88560860122ac97e8fd72d7d5d9b3cd1578607
40+
component_hash: b7bf691a285ab2bf7ff877082f50de5fba1e903e53352a1fe03326e2c1c636d6
4141
source:
4242
service_url: https://api.components.espressif.com/
4343
type: service
44-
version: 1.1.1
44+
version: 1.1.2
4545
espressif/esp-zigbee-lib:
46-
component_hash: a1a23f47316d2d44b1573459c8cf547da7f2c8ea987154ad8d28235db69f1481
46+
component_hash: d667197fd224c4d32e16e26cd3a4f5c9b0aba6f11f635b38fb25512620ce539b
4747
source:
4848
service_url: https://api.components.espressif.com/
4949
type: service
50-
version: 1.1.1
50+
version: 1.1.2
5151
espressif/esp32-camera:
5252
component_hash: 0e06d18f0327b81be882be9756e8df7e70215678a57a149b2922b9c82dd24c81
5353
source:
@@ -62,17 +62,17 @@ dependencies:
6262
type: service
6363
version: 1.0.1
6464
espressif/esp_diagnostics:
65-
component_hash: fe19f5ee7f0145f406d36a4d5310e4ae0c6ee1afa47f2681ada8a2ea8582d390
65+
component_hash: 2350938db074002ef088c05cd32d80a528185e47afdb3642427156256c3e13c5
6666
source:
6767
service_url: https://api.components.espressif.com/
6868
type: service
69-
version: 1.0.2
69+
version: 1.1.0
7070
espressif/esp_insights:
71-
component_hash: 2472a19de98a8b991baeeac7209765b70ce14ec2b1435dbed3abd020dd0f7227
71+
component_hash: 72ece1dcf0146275e1df976c713a9b193af0907931f3810957ee68a0a84b077d
7272
source:
7373
service_url: https://api.components.espressif.com/
7474
type: service
75-
version: 1.0.1
75+
version: 1.1.0
7676
espressif/esp_rainmaker:
7777
component_hash: 232425d1c9b9dbdaa5c109b3e359fba0e6956e35fcf22725f07ed7e4389e1191
7878
source:
@@ -131,7 +131,7 @@ dependencies:
131131
component_hash: null
132132
source:
133133
type: idf
134-
version: 5.1.2
134+
version: 5.1.3
135135
joltwallet/littlefs:
136136
component_hash: 03a21848de65d85a1f914dd6fb9dea5e75e794989d70d185a007e27c3046bb92
137137
source:

‎esp32/dio_qspi/include/sdkconfig.h

+41-40
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Automatically generated file. DO NOT EDIT.
3-
* Espressif IoT Development Framework (ESP-IDF) 5.1.2 Configuration Header
3+
* Espressif IoT Development Framework (ESP-IDF) 5.1.3 Configuration Header
44
*/
55
#pragma once
66
#define CONFIG_SOC_BROWNOUT_RESET_SUPPORTED "Not determined"
@@ -866,6 +866,39 @@
866866
#define CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES 16
867867
#define CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT 30
868868
#define CONFIG_WIFI_PROV_STA_ALL_CHANNEL_SCAN 1
869+
#define CONFIG_DIAG_LOG_MSG_ARG_FORMAT_TLV 1
870+
#define CONFIG_DIAG_LOG_MSG_ARG_MAX_SIZE 64
871+
#define CONFIG_DIAG_LOG_DROP_WIFI_LOGS 1
872+
#define CONFIG_DIAG_ENABLE_METRICS 1
873+
#define CONFIG_DIAG_METRICS_MAX_COUNT 20
874+
#define CONFIG_DIAG_ENABLE_HEAP_METRICS 1
875+
#define CONFIG_DIAG_ENABLE_WIFI_METRICS 1
876+
#define CONFIG_DIAG_ENABLE_VARIABLES 1
877+
#define CONFIG_DIAG_VARIABLES_MAX_COUNT 20
878+
#define CONFIG_DIAG_ENABLE_NETWORK_VARIABLES 1
879+
#define CONFIG_OV7670_SUPPORT 1
880+
#define CONFIG_OV7725_SUPPORT 1
881+
#define CONFIG_NT99141_SUPPORT 1
882+
#define CONFIG_OV2640_SUPPORT 1
883+
#define CONFIG_OV3660_SUPPORT 1
884+
#define CONFIG_OV5640_SUPPORT 1
885+
#define CONFIG_GC2145_SUPPORT 1
886+
#define CONFIG_GC032A_SUPPORT 1
887+
#define CONFIG_GC0308_SUPPORT 1
888+
#define CONFIG_BF3005_SUPPORT 1
889+
#define CONFIG_BF20A6_SUPPORT 1
890+
#define CONFIG_SC030IOT_SUPPORT 1
891+
#define CONFIG_SCCB_HARDWARE_I2C_PORT1 1
892+
#define CONFIG_SCCB_CLK_FREQ 100000
893+
#define CONFIG_GC_SENSOR_SUBSAMPLE_MODE 1
894+
#define CONFIG_CAMERA_TASK_STACK_SIZE 2048
895+
#define CONFIG_CAMERA_CORE0 1
896+
#define CONFIG_CAMERA_DMA_BUFFER_SIZE_MAX 32768
897+
#define CONFIG_DSP_OPTIMIZATIONS_SUPPORTED 1
898+
#define CONFIG_DSP_OPTIMIZED 1
899+
#define CONFIG_DSP_OPTIMIZATION 1
900+
#define CONFIG_DSP_MAX_FFT_SIZE_4096 1
901+
#define CONFIG_DSP_MAX_FFT_SIZE 4096
869902
#define CONFIG_ESP_RMAKER_LIB_ESP_MQTT 1
870903
#define CONFIG_ESP_RMAKER_MQTT_GLUE_LIB 1
871904
#define CONFIG_ESP_RMAKER_MQTT_PORT_443 1
@@ -888,21 +921,6 @@
888921
#define CONFIG_DIAG_DATA_STORE_REPORTING_WATERMARK_PERCENT 80
889922
#define CONFIG_RTC_STORE_DATA_SIZE 3072
890923
#define CONFIG_RTC_STORE_CRITICAL_DATA_SIZE 2048
891-
#define CONFIG_ESP_INSIGHTS_ENABLED 1
892-
#define CONFIG_ESP_INSIGHTS_TRANSPORT_HTTPS 1
893-
#define CONFIG_ESP_INSIGHTS_TRANSPORT_HTTPS_HOST "https://client.insights.espressif.com"
894-
#define CONFIG_ESP_INSIGHTS_CLOUD_POST_MIN_INTERVAL_SEC 60
895-
#define CONFIG_ESP_INSIGHTS_CLOUD_POST_MAX_INTERVAL_SEC 240
896-
#define CONFIG_DIAG_LOG_MSG_ARG_FORMAT_TLV 1
897-
#define CONFIG_DIAG_LOG_MSG_ARG_MAX_SIZE 64
898-
#define CONFIG_DIAG_LOG_DROP_WIFI_LOGS 1
899-
#define CONFIG_DIAG_ENABLE_METRICS 1
900-
#define CONFIG_DIAG_METRICS_MAX_COUNT 20
901-
#define CONFIG_DIAG_ENABLE_HEAP_METRICS 1
902-
#define CONFIG_DIAG_ENABLE_WIFI_METRICS 1
903-
#define CONFIG_DIAG_ENABLE_VARIABLES 1
904-
#define CONFIG_DIAG_VARIABLES_MAX_COUNT 20
905-
#define CONFIG_DIAG_ENABLE_NETWORK_VARIABLES 1
906924
#define CONFIG_MDNS_MAX_INTERFACES 3
907925
#define CONFIG_MDNS_MAX_SERVICES 10
908926
#define CONFIG_MDNS_TASK_PRIORITY 1
@@ -916,29 +934,12 @@
916934
#define CONFIG_MDNS_PREDEF_NETIF_STA 1
917935
#define CONFIG_MDNS_PREDEF_NETIF_AP 1
918936
#define CONFIG_MDNS_PREDEF_NETIF_ETH 1
919-
#define CONFIG_DSP_OPTIMIZATIONS_SUPPORTED 1
920-
#define CONFIG_DSP_OPTIMIZED 1
921-
#define CONFIG_DSP_OPTIMIZATION 1
922-
#define CONFIG_DSP_MAX_FFT_SIZE_4096 1
923-
#define CONFIG_DSP_MAX_FFT_SIZE 4096
924-
#define CONFIG_OV7670_SUPPORT 1
925-
#define CONFIG_OV7725_SUPPORT 1
926-
#define CONFIG_NT99141_SUPPORT 1
927-
#define CONFIG_OV2640_SUPPORT 1
928-
#define CONFIG_OV3660_SUPPORT 1
929-
#define CONFIG_OV5640_SUPPORT 1
930-
#define CONFIG_GC2145_SUPPORT 1
931-
#define CONFIG_GC032A_SUPPORT 1
932-
#define CONFIG_GC0308_SUPPORT 1
933-
#define CONFIG_BF3005_SUPPORT 1
934-
#define CONFIG_BF20A6_SUPPORT 1
935-
#define CONFIG_SC030IOT_SUPPORT 1
936-
#define CONFIG_SCCB_HARDWARE_I2C_PORT1 1
937-
#define CONFIG_SCCB_CLK_FREQ 100000
938-
#define CONFIG_GC_SENSOR_SUBSAMPLE_MODE 1
939-
#define CONFIG_CAMERA_TASK_STACK_SIZE 2048
940-
#define CONFIG_CAMERA_CORE0 1
941-
#define CONFIG_CAMERA_DMA_BUFFER_SIZE_MAX 32768
937+
#define CONFIG_ESP_INSIGHTS_ENABLED 1
938+
#define CONFIG_ESP_INSIGHTS_TRANSPORT_HTTPS 1
939+
#define CONFIG_ESP_INSIGHTS_TRANSPORT_HTTPS_HOST "https://client.insights.espressif.com"
940+
#define CONFIG_ESP_INSIGHTS_CLOUD_POST_MIN_INTERVAL_SEC 60
941+
#define CONFIG_ESP_INSIGHTS_CLOUD_POST_MAX_INTERVAL_SEC 240
942+
#define CONFIG_ESP_INSIGHTS_META_VERSION_10 1
942943
#define CONFIG_LITTLEFS_MAX_PARTITIONS 3
943944
#define CONFIG_LITTLEFS_PAGE_SIZE 256
944945
#define CONFIG_LITTLEFS_OBJ_NAME_LEN 64
@@ -1113,5 +1114,5 @@
11131114
#define CONFIG_WPA_MBEDTLS_TLS_CLIENT CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT
11141115
#define CONFIG_WPA_MBO_SUPPORT CONFIG_ESP_WIFI_MBO_SUPPORT
11151116
#define CONFIG_WPA_SCAN_CACHE CONFIG_ESP_WIFI_SCAN_CACHE
1116-
#define CONFIG_ARDUINO_IDF_COMMIT "d922d4178f"
1117+
#define CONFIG_ARDUINO_IDF_COMMIT "c361705ae7"
11171118
#define CONFIG_ARDUINO_IDF_BRANCH "release/v5.1"

‎esp32/flags/defines

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
-DESP_PLATFORM -DIDF_VER=\"v5.1.2-695-gd922d4178f-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.3-1-gc361705ae7-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/esp_common/include/esp_idf_version.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ extern "C" {
1515
/** Minor version number (x.X.x) */
1616
#define ESP_IDF_VERSION_MINOR 1
1717
/** Patch version number (x.x.X) */
18-
#define ESP_IDF_VERSION_PATCH 2
18+
#define ESP_IDF_VERSION_PATCH 3
1919

2020
/**
2121
* Macro to convert IDF version number into an integer

‎esp32/include/espressif__esp-zboss-lib/include/zb_config.h

+9-4
Original file line numberDiff line numberDiff line change
@@ -1053,11 +1053,13 @@ ZB_ED_RX_OFF_WHEN_IDLE
10531053
/** @endcond */ /* DOXYGEN_INTERNAL_DOC */
10541054
/* Some defaults for ZDO startup */
10551055

1056+
uint8_t bdb_get_scan_duration(void);
10561057
#ifndef ZB_TRACE_LEVEL
10571058
/**
10581059
NWK: default energy/active scan duration
10591060
*/
1060-
#define ZB_DEFAULT_SCAN_DURATION 4U
1061+
#define ZB_DEFAULT_SCAN_DURATION_VALUE 4U
1062+
#define ZB_DEFAULT_SCAN_DURATION bdb_get_scan_duration()
10611063

10621064
#ifdef ZB_SUBGHZ_BAND_ENABLED
10631065
/** @cond DOXYGEN_SUBGHZ_FEATURE */
@@ -1073,13 +1075,16 @@ ZB_ED_RX_OFF_WHEN_IDLE
10731075
#ifndef ZB_NSNG
10741076
/* SNCP release build has enabled trace and in the same time requires to have scan duration value set to 3 */
10751077
#ifdef SNCP_MODE
1076-
#define ZB_DEFAULT_SCAN_DURATION 3U
1078+
#define ZB_DEFAULT_SCAN_DURATION_VALUE 3U
1079+
#define ZB_DEFAULT_SCAN_DURATION bdb_get_scan_duration()
10771080
#else
1078-
#define ZB_DEFAULT_SCAN_DURATION 3U
1081+
#define ZB_DEFAULT_SCAN_DURATION_VALUE 3U
1082+
#define ZB_DEFAULT_SCAN_DURATION bdb_get_scan_duration()
10791083
#endif /* SNCP_MODE */
10801084
#else
10811085
/* Increase scan duration for NSNG: usually it runs with high trace level, so we can miss beacons if scan too fast */
1082-
#define ZB_DEFAULT_SCAN_DURATION 6U
1086+
#define ZB_DEFAULT_SCAN_DURATION_VALUE 6U
1087+
#define ZB_DEFAULT_SCAN_DURATION bdb_get_scan_duration()
10831088
#endif
10841089

10851090
#if defined ZB_SUBGHZ_BAND_ENABLED

‎esp32/include/espressif__esp-zboss-lib/include/zb_vendor_default.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
#define ZGP_CLUSTER_TEST
6666
#define ZB_ZGP_SKIP_GPDF_ON_NWK_LAYER
6767
#define ZB_ZGP_RUNTIME_WORK_MODE_WITH_PROXIES
68-
#define ZB_ZGP_PROXY_TBL_SIZE 4
68+
#define ZB_ZGP_PROXY_TBL_SIZE 8
6969
#endif /* CONFIG_ZB_GP_ENABLED */
7070

7171
/* Device support */

‎esp32/include/espressif__esp-zboss-lib/include/zgp/zgp_internal.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ typedef ZB_PACKED_PRE struct zb_zgp_cluster_s
108108
zb_uint8_t gps_commissioning_exit_mode; /**< @see zgp_commissioning_exit_mode_t */
109109
zb_uint8_t gps_security_level;
110110
zb_uint16_t gps_commissioning_window;
111-
/* let's align it to 4 bytes (38 + 2) */
112-
zb_uint16_t align_dummy;
111+
/* let's align it to 16 bytes (38 + 10) */
112+
zb_uint16_t align_dummy[5];
113113
} ZB_PACKED_STRUCT zb_zgp_cluster_t;
114114

115115
typedef struct zb_zgp_tbl_array_s

‎esp32/include/espressif__esp-zigbee-lib/include/esp_zigbee_core.h

+16-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ extern "C" {
3131
#endif /** CONFIG_ZB_ZED */
3232

3333
#ifdef CONFIG_ZB_GP_ENABLED
34-
#define ESP_ZGP_GPBB_DEFAULT_FUNCTIONALITY 0x9ac3f /*!< GPP functionality, refer to esp_zgp_gpp_functionality_t */
34+
#define ESP_ZGP_GPPB_DEFAULT_FUNCTIONALITY 0x9ac2f /*!< GPP functionality, refer to esp_zgp_gpp_functionality_t */
35+
#define ESP_ZGP_GPS_DEFAULT_FUNCTIONALITY 0x9ac2f /*!< GPS functionality, refer to esp_zgp_gps_functionality_t */
3536
#endif /* CONFIG_ZB_GP_ENABLED */
3637

3738
/** Enum of the Zigbee network device type
@@ -383,6 +384,20 @@ void esp_zb_set_rx_on_when_idle(bool rx_on);
383384
*/
384385
bool esp_zb_bdb_is_factory_new(void);
385386

387+
/**
388+
* @brief Get the scan duration of beacon
389+
*
390+
* @return Scan duration
391+
*/
392+
uint8_t esp_zb_bdb_get_scan_duration(void);
393+
394+
/**
395+
* @brief Set the scan duration of beacon
396+
*
397+
* @param[in] duration Scan time is ((1 << duration) + 1) * 15.36 ms
398+
*/
399+
void esp_zb_bdb_set_scan_duration(uint8_t duration);
400+
386401
/**
387402
* @brief Open Zigbee network
388403
*

‎esp32/include/espressif__esp-zigbee-lib/include/esp_zigbee_secur.h

+14
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,20 @@ esp_err_t esp_zb_secur_primary_network_key_get(uint8_t *key);
155155
*/
156156
esp_err_t esp_zb_secur_network_key_set(uint8_t *key);
157157

158+
/**
159+
* @brief Get the minimum LQI values for device joining the network
160+
*
161+
* @return The minimum LQI values
162+
*/
163+
uint8_t esp_zb_secur_network_min_join_lqi_get(void);
164+
165+
/**
166+
* @brief Set the minimum LQI value for device joining the network
167+
*
168+
* @param[in] lqi The LQI values
169+
*/
170+
void esp_zb_secur_network_min_join_lqi_set(uint8_t lqi);
171+
158172
#ifdef __cplusplus
159173
}
160174
#endif

0 commit comments

Comments
 (0)