Skip to content

Commit 78bdc4a

Browse files
me-no-devme-no-dev
committed
IDF release/v5.1 3629f070b6
1 parent 75606b7 commit 78bdc4a

File tree

215 files changed

+1436
-689
lines changed

Some content is hidden

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

215 files changed

+1436
-689
lines changed

‎esp32/dependencies.lock

+6-6
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: d17cf80d4ea0afd360b9492bd2f4c93046768e80f385971fbf9b53fabf4236b3
40+
component_hash: 9dc1059b8a6695580ab0324d41f2f88e324c1486b196e20d087f3dcb78c1c654
4141
source:
4242
service_url: https://api.components.espressif.com/
4343
type: service
44-
version: 1.0.6
44+
version: 1.0.7
4545
espressif/esp-zigbee-lib:
46-
component_hash: e7301c1cb0131eea9bd05b956a217c30307035b7abf05cb07ec4b43fec02e8f4
46+
component_hash: 3171496afcbdf5c370a3f74f6bc6a7e3196227438b0405d8714796c9d6f68a36
4747
source:
4848
service_url: https://api.components.espressif.com/
4949
type: service
50-
version: 1.0.6
50+
version: 1.0.7
5151
espressif/esp32-camera:
5252
component_hash: eadbec1d37fc354741dae3005ef310b73637e731a9da766c6e2f5614a8c59d5b
5353
source:
@@ -133,11 +133,11 @@ dependencies:
133133
type: idf
134134
version: 5.1.2
135135
joltwallet/littlefs:
136-
component_hash: 1fe7281f5cd587fef17574becd1b553ce0df26ba38ebdc645792e1511b081e3e
136+
component_hash: 5aaf0f009fb225c229c79471795f35d88df35cf42113898802862fc2a84de321
137137
source:
138138
service_url: https://api.components.espressif.com/
139139
type: service
140-
version: 1.12.0
140+
version: 1.12.1
141141
manifest_hash: ae9ce1c1182850b8c1953cf105cc58933f213b8a5f4b31334fe69b1c14c3f2ac
142142
target: esp32
143143
version: 1.0.0

‎esp32/dio_qspi/include/sdkconfig.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -648,8 +648,6 @@
648648
#define CONFIG_HAL_DEFAULT_ASSERTION_LEVEL 2
649649
#define CONFIG_HEAP_POISONING_LIGHT 1
650650
#define CONFIG_HEAP_TRACING_OFF 1
651-
#define CONFIG_IEEE802154_CCA_THRESHOLD -60
652-
#define CONFIG_IEEE802154_PENDING_TABLE_SIZE 20
653651
#define CONFIG_LOG_DEFAULT_LEVEL_ERROR 1
654652
#define CONFIG_LOG_DEFAULT_LEVEL 1
655653
#define CONFIG_LOG_MAXIMUM_EQUALS_DEFAULT 1
@@ -1103,5 +1101,5 @@
11031101
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
11041102
#define CONFIG_WPA_MBEDTLS_CRYPTO CONFIG_ESP_WIFI_MBEDTLS_CRYPTO
11051103
#define CONFIG_WPA_MBEDTLS_TLS_CLIENT CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT
1106-
#define CONFIG_ARDUINO_IDF_COMMIT "b38ee33b6d"
1104+
#define CONFIG_ARDUINO_IDF_COMMIT "3629f070b6"
11071105
#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-472-gb38ee33b6d-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.2-496-g3629f070b6-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_hid/include/esp_hidh_nimble.h

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
/*
2+
* SPDX-FileCopyrightText: 2017-2023 Espressif Systems (Shanghai) CO LTD
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
#pragma once
8+
9+
#ifdef __cplusplus
10+
extern "C" {
11+
#endif
12+
#include "sdkconfig.h"
13+
14+
#if CONFIG_BT_NIMBLE_ENABLED
15+
/**
16+
* @brief Open BlueTooth HID Device using BlueDroid
17+
* @param bda : BT Device Address
18+
* @param transport : BT Device Protocol (Classic/HID)
19+
* @param remote_addr_type : BLE Remote address type
20+
*
21+
* @return: ESP_OK on success
22+
*/
23+
esp_hidh_dev_t *esp_hidh_dev_open(uint8_t *bda, esp_hid_transport_t transport, uint8_t remote_addr_type);
24+
#endif /* CONFIG_BT_NIMBLE_ENABLED */
25+
26+
#ifdef __cplusplus
27+
}
28+
#endif

‎esp32/include/esp_hid/include/esp_hidh_transport.h

+9-13
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
1-
// Copyright 2017-2019 Espressif Systems (Shanghai) PTE LTD
2-
//
3-
// Licensed under the Apache License, Version 2.0 (the "License");
4-
// you may not use this file except in compliance with the License.
5-
// You may obtain a copy of the License at
6-
7-
// http://www.apache.org/licenses/LICENSE-2.0
8-
//
9-
// Unless required by applicable law or agreed to in writing, software
10-
// distributed under the License is distributed on an "AS IS" BASIS,
11-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
// See the License for the specific language governing permissions and
13-
// limitations under the License.
1+
/*
2+
* SPDX-FileCopyrightText: 2017-2023 Espressif Systems (Shanghai) CO LTD
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
146

157
#pragma once
168

@@ -28,6 +20,10 @@ extern "C" {
2820
#include "esp_hidh_bluedroid.h"
2921
#endif
3022

23+
#if CONFIG_BT_NIMBLE_ENABLED
24+
#include "esp_hidh_nimble.h"
25+
#endif
26+
3127
#ifdef __cplusplus
3228
}
3329
#endif

‎esp32/include/esp_hw_support/include/esp_private/esp_pau.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ void pau_regdma_trigger_modem_link_backup(void);
4343
void pau_regdma_trigger_modem_link_restore(void);
4444
#endif
4545

46-
#if SOC_PM_RETENTION_HAS_REGDMA_POWER_BUG
46+
#if SOC_PM_RETENTION_SW_TRIGGER_REGDMA
4747
/**
4848
* @brief Set the address of system REGDMA Link in active state
4949
* @param link_addr linked lists address

‎esp32/include/esp_hw_support/include/esp_private/sleep_retention.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ void sleep_retention_do_extra_retention(bool backup_or_restore);
122122
*/
123123
uint32_t sleep_retention_get_modules(void);
124124

125-
#if SOC_PM_RETENTION_HAS_REGDMA_POWER_BUG
125+
#if SOC_PM_RETENTION_SW_TRIGGER_REGDMA
126126
/**
127127
* @brief Software trigger REGDMA to do system linked list retention
128128
*

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1075,7 +1075,7 @@ ZB_ED_RX_OFF_WHEN_IDLE
10751075
#ifdef SNCP_MODE
10761076
#define ZB_DEFAULT_SCAN_DURATION 3U
10771077
#else
1078-
#define ZB_DEFAULT_SCAN_DURATION 5U
1078+
#define ZB_DEFAULT_SCAN_DURATION 3U
10791079
#endif /* SNCP_MODE */
10801080
#else
10811081
/* Increase scan duration for NSNG: usually it runs with high trace level, so we can miss beacons if scan too fast */

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -682,7 +682,7 @@ At the worst case our NWK can skip long address at tx: 8 bytes of reserve.
682682
* Broadcast transaction record table size
683683
* See Zigbee Specification subclause 3.6.5
684684
*/
685-
#define ZB_NWK_BTR_TABLE_SIZE 16U
685+
#define ZB_NWK_BTR_TABLE_SIZE 90U
686686
#endif
687687

688688
#ifndef ZB_NWK_BRR_TABLE_SIZE
@@ -1041,7 +1041,7 @@ Workaround for secure rejoin
10411041
*
10421042
* Table 2-154 of Zigbee Specification revision 22 : Config_NWK_Scan_Attempts default value is 5.
10431043
*/
1044-
#define ZB_ZDO_NWK_SCAN_ATTEMPTS 5U
1044+
#define ZB_ZDO_NWK_SCAN_ATTEMPTS 1U
10451045
/** @cond internals_doc */
10461046
/*! Delay for sending the end device request command. */
10471047
#define ZB_ZDO_SEND_ED_TIMEOUT_REQ_DELAY ZB_MILLISECONDS_TO_BEACON_INTERVAL(100U)

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
*/
5959

6060
/** Controls number of device info record stored in Touchlink transaction context. */
61-
#define ZB_ZLL_TRANS_CTX_DEV_INFO_MAX_NUMBER 4U
61+
#define ZB_ZLL_TRANS_CTX_DEV_INFO_MAX_NUMBER 8U
6262

6363
/** Controls number of endpoint descriptions stored in Touchlink transaction context. */
6464
#define ZB_ZLL_TRANS_CTX_EP_INFO_MAX_NUMBER 6U
@@ -237,7 +237,7 @@ typedef struct zb_zll_transaction_ctx_s
237237
/** Number of filled endpoint info records. */
238238
zb_uint8_t n_ep_infos;
239239
/** Sub-device (endpoint) info table. */
240-
zb_zll_sub_device_info_t ep_infos[ZB_ZLL_TRANS_CTX_EP_INFO_MAX_NUMBER];
240+
zb_zll_sub_device_info_t ep_infos[ZB_ZLL_TRANS_CTX_DEV_INFO_MAX_NUMBER * ZB_ZLL_TRANS_CTX_EP_INFO_MAX_NUMBER];
241241

242242
/** @brief User-provided "check action allowed" callback. */
243243
zb_zll_is_action_allowed_cb_t check_action_allowed;

‎esp32/include/espressif__esp-zboss-lib/include/zcl/zb_zcl_cvc_commands.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
/** @brief CVC Invalid Alarm Id */
6666
#define ZB_ZCL_CVC_INVALID_ALARM_ID (zb_uint8_t)-1
6767
/** @brief CVC Transition Timer Quant (in msec) */
68-
#define ZB_ZCL_CVC_TRANSITION_TIMER_QUANT_MS 15
68+
#define ZB_ZCL_CVC_TRANSITION_TIMER_QUANT_MS 100
6969
/** @brief CVC Transition Timer Quant */
7070
#define ZB_ZCL_CVC_TRANSITION_TIMER_QUANT_BE \
7171
ZB_MILLISECONDS_TO_BEACON_INTERVAL(ZB_ZCL_CVC_TRANSITION_TIMER_QUANT_MS)

‎esp32/include/espressif__esp-zboss-lib/include/zcl/zb_zcl_touchlink_commissioning.h

+4-3
Original file line numberDiff line numberDiff line change
@@ -498,9 +498,10 @@ typedef ZB_PACKED_PRE struct zb_zll_commissioning_device_information_req_s
498498
{ \
499499
zb_zll_commissioning_device_information_req_t *req; \
500500
zb_uint8_t* data_ptr = ZB_ZCL_START_PACKET((buffer)); \
501-
ZB_ZCL_CONSTRUCT_GENERAL_COMMAND_RESP_FRAME_CONTROL_A(data_ptr, \
501+
ZB_ZCL_CONSTRUCT_SPECIFIC_COMMAND_REQ_FRAME_CONTROL_A(data_ptr, \
502502
ZB_ZCL_FRAME_DIRECTION_TO_SRV, \
503-
ZB_ZCL_NOT_MANUFACTURER_SPECIFIC); \
503+
ZB_ZCL_NOT_MANUFACTURER_SPECIFIC, \
504+
ZB_ZCL_DISABLE_DEFAULT_RESPONSE); \
504505
ZB_ZCL_CONSTRUCT_COMMAND_HEADER( \
505506
data_ptr, \
506507
ZB_ZCL_GET_SEQ_NUM(), \
@@ -684,7 +685,7 @@ typedef ZB_PACKED_PRE struct zb_zll_commissioning_device_information_ep_info_res
684685
zb_zll_commissioning_device_information_ep_info_res_t* src_ptr = \
685686
(zb_zll_commissioning_device_information_ep_info_res_t*)zb_buf_begin((buffer)); \
686687
(status) = ZB_ZCL_PARSE_STATUS_SUCCESS; \
687-
ZB_ZCL_PACKET_GET_DATA_IEEE((data_ptr)->ieee_addr, (src_ptr)); \
688+
ZB_IEEE_ADDR_COPY((data_ptr)->ieee_addr, (src_ptr->ieee_addr)); \
688689
(data_ptr)->ep_id = src_ptr->ep_id; \
689690
ZB_LETOH16(&((data_ptr)->profile_id), &(src_ptr->profile_id)); \
690691
ZB_LETOH16(&((data_ptr)->device_id), &(src_ptr->device_id)); \

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

+8
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ typedef enum esp_zb_core_action_callback_id_s {
9393
ESP_ZB_CORE_CMD_REPORT_CONFIG_RESP_CB_ID = 0x1002, /*!< Configure reprot response, refer to esp_zb_zcl_cmd_config_report_resp_message_t */
9494
ESP_ZB_CORE_CMD_READ_REPORT_CFG_RESP_CB_ID = 0x1003, /*!< Read report configuration response, refer to esp_zb_zcl_cmd_read_report_config_resp_message_t */
9595
ESP_ZB_CORE_CMD_DISC_ATTR_RESP_CB_ID = 0x1004, /*!< Discover attributes response, refer to esp_zb_zcl_cmd_discover_attributes_resp_message_t */
96+
ESP_ZB_CORE_CMD_DEFAULT_RESP_CB_ID = 0x1005, /*!< Default response, refer to esp_zb_zcl_cmd_default_resp_message_t */
9697
ESP_ZB_CORE_CMD_OPERATE_GROUP_RESP_CB_ID = 0x1010, /*!< Group add group response, refer to esp_zb_zcl_groups_operate_group_resp_message_t */
9798
ESP_ZB_CORE_CMD_VIEW_GROUP_RESP_CB_ID = 0x1011, /*!< Group view response, refer to esp_zb_zcl_groups_view_group_resp_message_t */
9899
ESP_ZB_CORE_CMD_GET_GROUP_MEMBERSHIP_RESP_CB_ID = 0x1012, /*!< Group get membership response, refer to esp_zb_zcl_groups_get_group_membership_resp_message_t */
@@ -225,6 +226,13 @@ void esp_zb_raw_command_handler_register(esp_zb_zcl_raw_command_callback_t cb);
225226
*/
226227
void esp_zb_cli_resp_handler_register(esp_zb_cli_resp_callback_t cb);
227228

229+
/**
230+
* @brief Register the callback for the ZCL command send status
231+
*
232+
* @param[in] cb The ZCL command send status callback, refer to esp_zb_zcl_command_send_status_callback_t
233+
*/
234+
void esp_zb_zcl_command_send_status_handler_register(esp_zb_zcl_command_send_status_callback_t cb);
235+
228236
/**
229237
* @brief Set the ZCL identify notify callback for specific endpoint.
230238
*

0 commit comments

Comments
 (0)