Skip to content

Commit 9cf1e38

Browse files
me-no-devme-no-dev
committed
IDF release/v4.4 7cd82420c2
1 parent 16b4c47 commit 9cf1e38

File tree

209 files changed

+7277
-169
lines changed

Some content is hidden

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

209 files changed

+7277
-169
lines changed

‎package/package_esp32_index.template.json

+30-30
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
{
7373
"packager": "esp32",
7474
"name": "openocd-esp32",
75-
"version": "v0.12.0-esp32-20230921"
75+
"version": "v0.12.0-esp32-20240318"
7676
},
7777
{
7878
"packager": "esp32",
@@ -472,56 +472,56 @@
472472
},
473473
{
474474
"name": "openocd-esp32",
475-
"version": "v0.12.0-esp32-20230921",
475+
"version": "v0.12.0-esp32-20240318",
476476
"systems": [
477477
{
478478
"host": "x86_64-pc-linux-gnu",
479-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230921/openocd-esp32-linux-amd64-0.12.0-esp32-20230921.tar.gz",
480-
"archiveFileName": "openocd-esp32-linux-amd64-0.12.0-esp32-20230921.tar.gz",
481-
"checksum": "SHA-256:61e38e0a13a5c1664624ec1c397d7f7d6868554b0d345d3fb1f7294cce38cc4b",
482-
"size": 2193783
479+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20240318/openocd-esp32-linux-amd64-0.12.0-esp32-20240318.tar.gz",
480+
"archiveFileName": "openocd-esp32-linux-amd64-0.12.0-esp32-20240318.tar.gz",
481+
"checksum": "SHA-256:cf26c5cef4f6b04aa23cd2778675604e5a74a4ce4d8d17b854d05fbcb782d52c",
482+
"size": 2252682
483483
},
484484
{
485485
"host": "aarch64-linux-gnu",
486-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230921/openocd-esp32-linux-arm64-0.12.0-esp32-20230921.tar.gz",
487-
"archiveFileName": "openocd-esp32-linux-arm64-0.12.0-esp32-20230921.tar.gz",
488-
"checksum": "SHA-256:6430315dc1b926541c93cef63d2b08982543ad3f9fe6e0d7107c8a518ef20432",
489-
"size": 2062058
486+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20240318/openocd-esp32-linux-arm64-0.12.0-esp32-20240318.tar.gz",
487+
"archiveFileName": "openocd-esp32-linux-arm64-0.12.0-esp32-20240318.tar.gz",
488+
"checksum": "SHA-256:9b97a37aa2cab94424a778c25c0b4aa0f90d6ef9cda764a1d9289d061305f4b7",
489+
"size": 2132904
490490
},
491491
{
492492
"host": "arm-linux-gnueabihf",
493-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230921/openocd-esp32-linux-armel-0.12.0-esp32-20230921.tar.gz",
494-
"archiveFileName": "openocd-esp32-linux-armel-0.12.0-esp32-20230921.tar.gz",
495-
"checksum": "SHA-256:5df16d8a91f013a547f6b3b914c655a9d267996a3b6503031b335ac04a4f8d15",
496-
"size": 2206666
493+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20240318/openocd-esp32-linux-armel-0.12.0-esp32-20240318.tar.gz",
494+
"archiveFileName": "openocd-esp32-linux-armel-0.12.0-esp32-20240318.tar.gz",
495+
"checksum": "SHA-256:b7e82776ec374983807d3389df09c632ad9bc8341f2075690b6b500319dfeaf4",
496+
"size": 2271761
497497
},
498498
{
499499
"host": "x86_64-apple-darwin",
500-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230921/openocd-esp32-macos-0.12.0-esp32-20230921.tar.gz",
501-
"archiveFileName": "openocd-esp32-macos-0.12.0-esp32-20230921.tar.gz",
502-
"checksum": "SHA-256:0a4f764934f488af18cdac2a0d152dd36b4870f3bec1a2d4e25b6b3b7a5258a0",
503-
"size": 2305832
500+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20240318/openocd-esp32-macos-0.12.0-esp32-20240318.tar.gz",
501+
"archiveFileName": "openocd-esp32-macos-0.12.0-esp32-20240318.tar.gz",
502+
"checksum": "SHA-256:b16c3082c94df1079367c44d99f7a8605534cd48aabc18898e46e94a2c8c57e7",
503+
"size": 2365588
504504
},
505505
{
506506
"host": "arm64-apple-darwin",
507-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230921/openocd-esp32-macos-arm64-0.12.0-esp32-20230921.tar.gz",
508-
"archiveFileName": "openocd-esp32-macos-arm64-0.12.0-esp32-20230921.tar.gz",
509-
"checksum": "SHA-256:6dce89048f642eb0559a915b6e514f90feb2a95afe21b84f0b0ebf2b27824816",
510-
"size": 2341406
507+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20240318/openocd-esp32-macos-arm64-0.12.0-esp32-20240318.tar.gz",
508+
"archiveFileName": "openocd-esp32-macos-arm64-0.12.0-esp32-20240318.tar.gz",
509+
"checksum": "SHA-256:534ec925ae6e35e869e4e4e6e4d2c4a1eb081f97ebcc2dd5efdc52d12f4c2f86",
510+
"size": 2406377
511511
},
512512
{
513513
"host": "i686-mingw32",
514-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230921/openocd-esp32-win32-0.12.0-esp32-20230921.zip",
515-
"archiveFileName": "openocd-esp32-win32-0.12.0-esp32-20230921.zip",
516-
"checksum": "SHA-256:ac9d522a63b0816f64d921547bd55c031788035ced85c067d8e7c2862cb1bd0d",
517-
"size": 2710475
514+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20240318/openocd-esp32-win32-0.12.0-esp32-20240318.zip",
515+
"archiveFileName": "openocd-esp32-win32-0.12.0-esp32-20240318.zip",
516+
"checksum": "SHA-256:d379329eba052435173ab0d69c9b15bc164a6ce489e2a67cd11169d2dabff633",
517+
"size": 2783915
518518
},
519519
{
520520
"host": "x86_64-mingw32",
521-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230921/openocd-esp32-win32-0.12.0-esp32-20230921.zip",
522-
"archiveFileName": "openocd-esp32-win32-0.12.0-esp32-20230921.zip",
523-
"checksum": "SHA-256:ac9d522a63b0816f64d921547bd55c031788035ced85c067d8e7c2862cb1bd0d",
524-
"size": 2710475
521+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20240318/openocd-esp32-win32-0.12.0-esp32-20240318.zip",
522+
"archiveFileName": "openocd-esp32-win32-0.12.0-esp32-20240318.zip",
523+
"checksum": "SHA-256:d379329eba052435173ab0d69c9b15bc164a6ce489e2a67cd11169d2dabff633",
524+
"size": 2783915
525525
}
526526
]
527527
},

‎platform.txt

+4-4
Large diffs are not rendered by default.

‎tools/platformio-build-esp32.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@
174174
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "mbedtls", "port", "include"),
175175
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "mbedtls", "mbedtls", "include"),
176176
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "mbedtls", "esp_crt_bundle", "include"),
177+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "mbedtls", "mbedtls", "3rdparty", "everest", "include"),
177178
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "app_update", "include"),
178179
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "spi_flash", "include"),
179180
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "bootloader_support", "include"),
@@ -196,6 +197,7 @@
196197
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "bt", "common", "api", "include", "api"),
197198
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "bt", "common", "btc", "profile", "esp", "blufi", "include"),
198199
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "bt", "common", "btc", "profile", "esp", "include"),
200+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "bt", "common", "hci_log", "include"),
199201
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "bt", "host", "bluedroid", "api", "include", "api"),
200202
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "bt", "esp_ble_mesh", "mesh_common", "include"),
201203
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "bt", "esp_ble_mesh", "mesh_common", "tinycrypt", "include"),
@@ -334,7 +336,7 @@
334336
"UNITY_INCLUDE_CONFIG_H",
335337
"WITH_POSIX",
336338
"_GNU_SOURCE",
337-
("IDF_VER", '\\"v4.4.7-143-g309ffa5565-dirty\\"'),
339+
("IDF_VER", '\\"v4.4.7-170-g7cd82420c2-dirty\\"'),
338340
"ESP_PLATFORM",
339341
"_POSIX_READER_WRITER_LOCKS",
340342
"ARDUINO_ARCH_ESP32",

‎tools/platformio-build-esp32c3.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@
173173
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "mbedtls", "port", "include"),
174174
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "mbedtls", "mbedtls", "include"),
175175
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "mbedtls", "esp_crt_bundle", "include"),
176+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "mbedtls", "mbedtls", "3rdparty", "everest", "include"),
176177
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "app_update", "include"),
177178
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "spi_flash", "include"),
178179
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "bootloader_support", "include"),
@@ -195,6 +196,7 @@
195196
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "bt", "common", "api", "include", "api"),
196197
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "bt", "common", "btc", "profile", "esp", "blufi", "include"),
197198
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "bt", "common", "btc", "profile", "esp", "include"),
199+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "bt", "common", "hci_log", "include"),
198200
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "bt", "host", "bluedroid", "api", "include", "api"),
199201
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "bt", "esp_ble_mesh", "mesh_common", "include"),
200202
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "bt", "esp_ble_mesh", "mesh_common", "tinycrypt", "include"),
@@ -331,7 +333,7 @@
331333
"UNITY_INCLUDE_CONFIG_H",
332334
"WITH_POSIX",
333335
"_GNU_SOURCE",
334-
("IDF_VER", '\\"v4.4.7-143-g309ffa5565-dirty\\"'),
336+
("IDF_VER", '\\"v4.4.7-170-g7cd82420c2-dirty\\"'),
335337
"ESP_PLATFORM",
336338
"_POSIX_READER_WRITER_LOCKS",
337339
"ARDUINO_ARCH_ESP32",

‎tools/platformio-build-esp32s2.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@
170170
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "mbedtls", "port", "include"),
171171
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "mbedtls", "mbedtls", "include"),
172172
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "mbedtls", "esp_crt_bundle", "include"),
173+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "mbedtls", "mbedtls", "3rdparty", "everest", "include"),
173174
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "app_update", "include"),
174175
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "spi_flash", "include"),
175176
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "bootloader_support", "include"),
@@ -317,7 +318,7 @@
317318
"UNITY_INCLUDE_CONFIG_H",
318319
"WITH_POSIX",
319320
"_GNU_SOURCE",
320-
("IDF_VER", '\\"v4.4.7-143-g309ffa5565-dirty\\"'),
321+
("IDF_VER", '\\"v4.4.7-170-g7cd82420c2-dirty\\"'),
321322
"ESP_PLATFORM",
322323
"_POSIX_READER_WRITER_LOCKS",
323324
"ARDUINO_ARCH_ESP32",

‎tools/platformio-build-esp32s3.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@
169169
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s3", "include", "mbedtls", "port", "include"),
170170
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s3", "include", "mbedtls", "mbedtls", "include"),
171171
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s3", "include", "mbedtls", "esp_crt_bundle", "include"),
172+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s3", "include", "mbedtls", "mbedtls", "3rdparty", "everest", "include"),
172173
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s3", "include", "app_update", "include"),
173174
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s3", "include", "spi_flash", "include"),
174175
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s3", "include", "bootloader_support", "include"),
@@ -191,6 +192,7 @@
191192
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s3", "include", "bt", "common", "api", "include", "api"),
192193
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s3", "include", "bt", "common", "btc", "profile", "esp", "blufi", "include"),
193194
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s3", "include", "bt", "common", "btc", "profile", "esp", "include"),
195+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s3", "include", "bt", "common", "hci_log", "include"),
194196
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s3", "include", "bt", "host", "bluedroid", "api", "include", "api"),
195197
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s3", "include", "bt", "esp_ble_mesh", "mesh_common", "include"),
196198
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s3", "include", "bt", "esp_ble_mesh", "mesh_common", "tinycrypt", "include"),
@@ -333,7 +335,7 @@
333335
"UNITY_INCLUDE_CONFIG_H",
334336
"WITH_POSIX",
335337
"_GNU_SOURCE",
336-
("IDF_VER", '\\"v4.4.7-143-g309ffa5565-dirty\\"'),
338+
("IDF_VER", '\\"v4.4.7-170-g7cd82420c2-dirty\\"'),
337339
"ESP_PLATFORM",
338340
"_POSIX_READER_WRITER_LOCKS",
339341
"ARDUINO_ARCH_ESP32",

‎tools/sdk/esp32/dio_qspi/include/sdkconfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -845,5 +845,5 @@
845845
#define CONFIG_ULP_COPROC_ENABLED CONFIG_ESP32_ULP_COPROC_ENABLED
846846
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
847847
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
848-
#define CONFIG_ARDUINO_IDF_COMMIT "309ffa5565"
848+
#define CONFIG_ARDUINO_IDF_COMMIT "7cd82420c2"
849849
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

‎tools/sdk/esp32/dout_qspi/include/sdkconfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -845,5 +845,5 @@
845845
#define CONFIG_ULP_COPROC_ENABLED CONFIG_ESP32_ULP_COPROC_ENABLED
846846
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
847847
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
848-
#define CONFIG_ARDUINO_IDF_COMMIT "309ffa5565"
848+
#define CONFIG_ARDUINO_IDF_COMMIT "7cd82420c2"
849849
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

‎tools/sdk/esp32/include/bt/common/hci_log/include/hci_log/bt_hci_log.h

+108
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
/*
2+
* SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
#ifndef __ESP_BT_HCI_LOG_H__
8+
#define __ESP_BT_HCI_LOG_H__
9+
10+
#include "esp_err.h"
11+
12+
#ifdef __cplusplus
13+
extern "C" {
14+
#endif
15+
16+
17+
#define HCI_LOG_DATA_TYPE_COMMAND (1)
18+
#define HCI_LOG_DATA_TYPE_H2C_ACL (2)
19+
#define HCI_LOG_DATA_TYPE_SCO (3)
20+
#define HCI_LOG_DATA_TYPE_EVENT (4)
21+
#define HCI_LOG_DATA_TYPE_ADV (5)
22+
#define HCI_LOG_DATA_TYPE_SELF_DEFINE (6)
23+
#define HCI_LOG_DATA_TYPE_C2H_ACL (7)
24+
25+
/**
26+
*
27+
* @brief This function is called to record self-defining data
28+
* @param string : data identification
29+
* @param data : data
30+
* @param data_len : the length of data
31+
*
32+
* @return ESP_OK - success, other - failed
33+
*
34+
*/
35+
esp_err_t bt_hci_log_record_custom_data(char *string, uint8_t *data, uint8_t data_len);
36+
/**
37+
*
38+
* @brief This function is called to print all hci data record
39+
*
40+
*
41+
* @return None
42+
*
43+
*/
44+
void bt_hci_log_hci_data_show(void);
45+
46+
/**
47+
*
48+
* @brief This function is called to print all adv report
49+
*
50+
*
51+
* @return None
52+
*
53+
*/
54+
void bt_hci_log_hci_adv_show(void);
55+
56+
/**
57+
*
58+
* @brief This function is called to init hci log env
59+
*
60+
*
61+
* @return ESP_OK - success, other - failed
62+
*
63+
*/
64+
esp_err_t bt_hci_log_init(void);
65+
66+
/**
67+
*
68+
* @brief This function is called to deinit hci debug mode,
69+
* and can only be called internally by Bluetooth
70+
*
71+
*
72+
* @return ESP_OK - success, other - failed
73+
*
74+
*/
75+
esp_err_t bt_hci_log_deinit(void);
76+
77+
/**
78+
*
79+
* @brief This function is called to record hci data without adv report event,
80+
* and can only be called internally by Bluetooth
81+
*
82+
* @param str : data type, define in bt_data_type_to_str()
83+
* @param data : data
84+
* @param data_len : the length of data
85+
*
86+
* @return ESP_OK - success, other - failed
87+
*
88+
*/
89+
esp_err_t bt_hci_log_record_hci_data(uint8_t data_type, uint8_t *data, uint8_t data_len);
90+
91+
/**
92+
*
93+
* @brief This function is called to record hci adv report event only
94+
* and can only be called internally by Bluetooth
95+
*
96+
* @param str : data type, define in bt_data_type_to_str()
97+
* @param data : data
98+
* @param data_len : the length of data
99+
* @return ESP_OK - success, other - failed
100+
*
101+
*/
102+
esp_err_t bt_hci_log_record_hci_adv(uint8_t data_type, uint8_t *data, uint8_t data_len);
103+
104+
#ifdef __cplusplus
105+
}
106+
#endif
107+
108+
#endif /* _ESP_BT_HCI_LOG_H__ */

0 commit comments

Comments
 (0)