Skip to content

Commit 0566437

Browse files
committed
IDF release/v4.4 1b42fee4f0
1 parent 378fb5c commit 0566437

File tree

78 files changed

+1304
-535
lines changed

Some content is hidden

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

78 files changed

+1304
-535
lines changed

platform.txt

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

tools/platformio-build-esp32.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@
336336
"UNITY_INCLUDE_CONFIG_H",
337337
"WITH_POSIX",
338338
"_GNU_SOURCE",
339-
("IDF_VER", '\\"v4.4.7-191-gbe2fba6057-dirty\\"'),
339+
("IDF_VER", '\\"v4.4.7-197-g1b42fee4f0-dirty\\"'),
340340
"ESP_PLATFORM",
341341
"_POSIX_READER_WRITER_LOCKS",
342342
"ARDUINO_ARCH_ESP32",

tools/platformio-build-esp32c3.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@
333333
"UNITY_INCLUDE_CONFIG_H",
334334
"WITH_POSIX",
335335
"_GNU_SOURCE",
336-
("IDF_VER", '\\"v4.4.7-191-gbe2fba6057-dirty\\"'),
336+
("IDF_VER", '\\"v4.4.7-197-g1b42fee4f0-dirty\\"'),
337337
"ESP_PLATFORM",
338338
"_POSIX_READER_WRITER_LOCKS",
339339
"ARDUINO_ARCH_ESP32",

tools/platformio-build-esp32s2.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@
318318
"UNITY_INCLUDE_CONFIG_H",
319319
"WITH_POSIX",
320320
"_GNU_SOURCE",
321-
("IDF_VER", '\\"v4.4.7-191-gbe2fba6057-dirty\\"'),
321+
("IDF_VER", '\\"v4.4.7-197-g1b42fee4f0-dirty\\"'),
322322
"ESP_PLATFORM",
323323
"_POSIX_READER_WRITER_LOCKS",
324324
"ARDUINO_ARCH_ESP32",

tools/platformio-build-esp32s3.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@
335335
"UNITY_INCLUDE_CONFIG_H",
336336
"WITH_POSIX",
337337
"_GNU_SOURCE",
338-
("IDF_VER", '\\"v4.4.7-191-gbe2fba6057-dirty\\"'),
338+
("IDF_VER", '\\"v4.4.7-197-g1b42fee4f0-dirty\\"'),
339339
"ESP_PLATFORM",
340340
"_POSIX_READER_WRITER_LOCKS",
341341
"ARDUINO_ARCH_ESP32",

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@
177177
#define CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT 30
178178
#define CONFIG_BT_MAX_DEVICE_NAME_LEN 32
179179
#define CONFIG_BT_BLE_RPA_TIMEOUT 900
180+
#define CONFIG_BT_ALARM_MAX_NUM 50
180181
#define CONFIG_BLE_MESH 1
181182
#define CONFIG_BLE_MESH_HCI_5_0 1
182183
#define CONFIG_BLE_MESH_USE_DUPLICATE_SCAN 1
@@ -845,5 +846,5 @@
845846
#define CONFIG_ULP_COPROC_ENABLED CONFIG_ESP32_ULP_COPROC_ENABLED
846847
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
847848
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
848-
#define CONFIG_ARDUINO_IDF_COMMIT "be2fba6057"
849+
#define CONFIG_ARDUINO_IDF_COMMIT "1b42fee4f0"
849850
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@
177177
#define CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT 30
178178
#define CONFIG_BT_MAX_DEVICE_NAME_LEN 32
179179
#define CONFIG_BT_BLE_RPA_TIMEOUT 900
180+
#define CONFIG_BT_ALARM_MAX_NUM 50
180181
#define CONFIG_BLE_MESH 1
181182
#define CONFIG_BLE_MESH_HCI_5_0 1
182183
#define CONFIG_BLE_MESH_USE_DUPLICATE_SCAN 1
@@ -845,5 +846,5 @@
845846
#define CONFIG_ULP_COPROC_ENABLED CONFIG_ESP32_ULP_COPROC_ENABLED
846847
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
847848
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
848-
#define CONFIG_ARDUINO_IDF_COMMIT "be2fba6057"
849+
#define CONFIG_ARDUINO_IDF_COMMIT "1b42fee4f0"
849850
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

tools/sdk/esp32/include/bt/common/osi/include/osi/alarm.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
#include <stdint.h>
2323
#include "esp_timer.h"
24+
#include "bt_user_config.h"
2425

2526
typedef struct alarm_t osi_alarm_t;
2627
typedef uint64_t period_ms_t;
@@ -33,7 +34,7 @@ typedef enum {
3334
OSI_ALARM_ERR_INVALID_STATE = -3,
3435
} osi_alarm_err_t;
3536

36-
#define ALARM_CBS_NUM 50
37+
#define ALARM_CBS_NUM UC_ALARM_MAX_NUM
3738
#define ALARM_ID_BASE 1000
3839

3940
int osi_alarm_create_mux(void);

tools/sdk/esp32/ld/sections.ld

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

tools/sdk/esp32/lib/libapp_update.a

0 Bytes
Binary file not shown.

tools/sdk/esp32/lib/libbt.a

0 Bytes
Binary file not shown.

tools/sdk/esp32/lib/libesp_system.a

0 Bytes
Binary file not shown.

tools/sdk/esp32/qio_qspi/include/sdkconfig.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@
178178
#define CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT 30
179179
#define CONFIG_BT_MAX_DEVICE_NAME_LEN 32
180180
#define CONFIG_BT_BLE_RPA_TIMEOUT 900
181+
#define CONFIG_BT_ALARM_MAX_NUM 50
181182
#define CONFIG_BLE_MESH 1
182183
#define CONFIG_BLE_MESH_HCI_5_0 1
183184
#define CONFIG_BLE_MESH_USE_DUPLICATE_SCAN 1
@@ -845,5 +846,5 @@
845846
#define CONFIG_ULP_COPROC_ENABLED CONFIG_ESP32_ULP_COPROC_ENABLED
846847
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
847848
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
848-
#define CONFIG_ARDUINO_IDF_COMMIT "be2fba6057"
849+
#define CONFIG_ARDUINO_IDF_COMMIT "1b42fee4f0"
849850
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

tools/sdk/esp32/qout_qspi/include/sdkconfig.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@
178178
#define CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT 30
179179
#define CONFIG_BT_MAX_DEVICE_NAME_LEN 32
180180
#define CONFIG_BT_BLE_RPA_TIMEOUT 900
181+
#define CONFIG_BT_ALARM_MAX_NUM 50
181182
#define CONFIG_BLE_MESH 1
182183
#define CONFIG_BLE_MESH_HCI_5_0 1
183184
#define CONFIG_BLE_MESH_USE_DUPLICATE_SCAN 1
@@ -845,5 +846,5 @@
845846
#define CONFIG_ULP_COPROC_ENABLED CONFIG_ESP32_ULP_COPROC_ENABLED
846847
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
847848
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
848-
#define CONFIG_ARDUINO_IDF_COMMIT "be2fba6057"
849+
#define CONFIG_ARDUINO_IDF_COMMIT "1b42fee4f0"
849850
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

tools/sdk/esp32/sdkconfig

+6
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,12 @@ CONFIG_BT_BLE_RPA_TIMEOUT=900
434434
# end of Bluedroid Options
435435

436436
# CONFIG_BT_HCI_LOG_DEBUG_EN is not set
437+
438+
#
439+
# Common Options
440+
#
441+
CONFIG_BT_ALARM_MAX_NUM=50
442+
# end of Common Options
437443
# end of Bluetooth
438444

439445
CONFIG_BLE_MESH=y

tools/sdk/esp32c3/dio_qspi/include/sdkconfig.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@
216216
#define CONFIG_BT_BLE_RPA_TIMEOUT 900
217217
#define CONFIG_BT_BLE_50_FEATURES_SUPPORTED 1
218218
#define CONFIG_BT_BLE_42_FEATURES_SUPPORTED 1
219+
#define CONFIG_BT_ALARM_MAX_NUM 50
219220
#define CONFIG_BLE_MESH 1
220221
#define CONFIG_BLE_MESH_HCI_5_0 1
221222
#define CONFIG_BLE_MESH_USE_DUPLICATE_SCAN 1
@@ -851,5 +852,5 @@
851852
#define CONFIG_TOOLPREFIX CONFIG_SDK_TOOLPREFIX
852853
#define CONFIG_UDP_RECVMBOX_SIZE CONFIG_LWIP_UDP_RECVMBOX_SIZE
853854
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
854-
#define CONFIG_ARDUINO_IDF_COMMIT "be2fba6057"
855+
#define CONFIG_ARDUINO_IDF_COMMIT "1b42fee4f0"
855856
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

tools/sdk/esp32c3/dout_qspi/include/sdkconfig.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@
216216
#define CONFIG_BT_BLE_RPA_TIMEOUT 900
217217
#define CONFIG_BT_BLE_50_FEATURES_SUPPORTED 1
218218
#define CONFIG_BT_BLE_42_FEATURES_SUPPORTED 1
219+
#define CONFIG_BT_ALARM_MAX_NUM 50
219220
#define CONFIG_BLE_MESH 1
220221
#define CONFIG_BLE_MESH_HCI_5_0 1
221222
#define CONFIG_BLE_MESH_USE_DUPLICATE_SCAN 1
@@ -851,5 +852,5 @@
851852
#define CONFIG_TOOLPREFIX CONFIG_SDK_TOOLPREFIX
852853
#define CONFIG_UDP_RECVMBOX_SIZE CONFIG_LWIP_UDP_RECVMBOX_SIZE
853854
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
854-
#define CONFIG_ARDUINO_IDF_COMMIT "be2fba6057"
855+
#define CONFIG_ARDUINO_IDF_COMMIT "1b42fee4f0"
855856
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

tools/sdk/esp32c3/include/bt/common/osi/include/osi/alarm.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
#include <stdint.h>
2323
#include "esp_timer.h"
24+
#include "bt_user_config.h"
2425

2526
typedef struct alarm_t osi_alarm_t;
2627
typedef uint64_t period_ms_t;
@@ -33,7 +34,7 @@ typedef enum {
3334
OSI_ALARM_ERR_INVALID_STATE = -3,
3435
} osi_alarm_err_t;
3536

36-
#define ALARM_CBS_NUM 50
37+
#define ALARM_CBS_NUM UC_ALARM_MAX_NUM
3738
#define ALARM_ID_BASE 1000
3839

3940
int osi_alarm_create_mux(void);

tools/sdk/esp32c3/ld/sections.ld

+1-1
Original file line numberDiff line numberDiff line change
@@ -349,8 +349,8 @@ SECTIONS
349349
_bss_start = ABSOLUTE(.);
350350

351351
*(EXCLUDE_FILE(*libbt.a *libbtdm_app.a *libnimble.a) .bss EXCLUDE_FILE(*libbt.a *libbtdm_app.a *libnimble.a) .bss.*)
352-
*(.ext_ram.bss .ext_ram.bss.*)
353352
*(.dynbss .dynsbss .gnu.linkonce.b .gnu.linkonce.b.* .gnu.linkonce.sb .gnu.linkonce.sb.* .gnu.linkonce.sb2 .gnu.linkonce.sb2.* .sbss .sbss.* .sbss2 .sbss2.* .scommon .share.mem)
353+
*(.ext_ram.bss .ext_ram.bss.*)
354354
*(EXCLUDE_FILE(*libbt.a *libbtdm_app.a *libnimble.a) COMMON)
355355
. = ALIGN(4);
356356
_bt_bss_start = ABSOLUTE(.);

tools/sdk/esp32c3/lib/libapp_update.a

0 Bytes
Binary file not shown.

tools/sdk/esp32c3/lib/libbt.a

0 Bytes
Binary file not shown.

tools/sdk/esp32c3/lib/libesp_system.a

0 Bytes
Binary file not shown.

tools/sdk/esp32c3/qio_qspi/include/sdkconfig.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@
216216
#define CONFIG_BT_BLE_RPA_TIMEOUT 900
217217
#define CONFIG_BT_BLE_50_FEATURES_SUPPORTED 1
218218
#define CONFIG_BT_BLE_42_FEATURES_SUPPORTED 1
219+
#define CONFIG_BT_ALARM_MAX_NUM 50
219220
#define CONFIG_BLE_MESH 1
220221
#define CONFIG_BLE_MESH_HCI_5_0 1
221222
#define CONFIG_BLE_MESH_USE_DUPLICATE_SCAN 1
@@ -851,5 +852,5 @@
851852
#define CONFIG_TOOLPREFIX CONFIG_SDK_TOOLPREFIX
852853
#define CONFIG_UDP_RECVMBOX_SIZE CONFIG_LWIP_UDP_RECVMBOX_SIZE
853854
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
854-
#define CONFIG_ARDUINO_IDF_COMMIT "be2fba6057"
855+
#define CONFIG_ARDUINO_IDF_COMMIT "1b42fee4f0"
855856
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

tools/sdk/esp32c3/qout_qspi/include/sdkconfig.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@
216216
#define CONFIG_BT_BLE_RPA_TIMEOUT 900
217217
#define CONFIG_BT_BLE_50_FEATURES_SUPPORTED 1
218218
#define CONFIG_BT_BLE_42_FEATURES_SUPPORTED 1
219+
#define CONFIG_BT_ALARM_MAX_NUM 50
219220
#define CONFIG_BLE_MESH 1
220221
#define CONFIG_BLE_MESH_HCI_5_0 1
221222
#define CONFIG_BLE_MESH_USE_DUPLICATE_SCAN 1
@@ -851,5 +852,5 @@
851852
#define CONFIG_TOOLPREFIX CONFIG_SDK_TOOLPREFIX
852853
#define CONFIG_UDP_RECVMBOX_SIZE CONFIG_LWIP_UDP_RECVMBOX_SIZE
853854
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
854-
#define CONFIG_ARDUINO_IDF_COMMIT "be2fba6057"
855+
#define CONFIG_ARDUINO_IDF_COMMIT "1b42fee4f0"
855856
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

tools/sdk/esp32c3/sdkconfig

+6
Original file line numberDiff line numberDiff line change
@@ -619,6 +619,12 @@ CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
619619
# end of Bluedroid Options
620620

621621
# CONFIG_BT_HCI_LOG_DEBUG_EN is not set
622+
623+
#
624+
# Common Options
625+
#
626+
CONFIG_BT_ALARM_MAX_NUM=50
627+
# end of Common Options
622628
# end of Bluetooth
623629

624630
CONFIG_BLE_MESH=y

tools/sdk/esp32s2/dio_qspi/include/sdkconfig.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@
139139
#define CONFIG_COMPILER_WARN_WRITE_STRINGS 1
140140
#define CONFIG_APPTRACE_DEST_NONE 1
141141
#define CONFIG_APPTRACE_LOCK_ENABLE 1
142+
#define CONFIG_BT_ALARM_MAX_NUM 50
142143
#define CONFIG_COAP_MBEDTLS_PSK 1
143144
#define CONFIG_COAP_LOG_DEFAULT_LEVEL 0
144145
#define CONFIG_ADC_DISABLE_DAC 1
@@ -717,5 +718,5 @@
717718
#define CONFIG_USB_MSC_BUFSIZE CONFIG_TINYUSB_MSC_BUFSIZE
718719
#define CONFIG_USB_MSC_ENABLED CONFIG_TINYUSB_MSC_ENABLED
719720
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
720-
#define CONFIG_ARDUINO_IDF_COMMIT "be2fba6057"
721+
#define CONFIG_ARDUINO_IDF_COMMIT "1b42fee4f0"
721722
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

tools/sdk/esp32s2/dout_qspi/include/sdkconfig.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@
139139
#define CONFIG_COMPILER_WARN_WRITE_STRINGS 1
140140
#define CONFIG_APPTRACE_DEST_NONE 1
141141
#define CONFIG_APPTRACE_LOCK_ENABLE 1
142+
#define CONFIG_BT_ALARM_MAX_NUM 50
142143
#define CONFIG_COAP_MBEDTLS_PSK 1
143144
#define CONFIG_COAP_LOG_DEFAULT_LEVEL 0
144145
#define CONFIG_ADC_DISABLE_DAC 1
@@ -717,5 +718,5 @@
717718
#define CONFIG_USB_MSC_BUFSIZE CONFIG_TINYUSB_MSC_BUFSIZE
718719
#define CONFIG_USB_MSC_ENABLED CONFIG_TINYUSB_MSC_ENABLED
719720
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
720-
#define CONFIG_ARDUINO_IDF_COMMIT "be2fba6057"
721+
#define CONFIG_ARDUINO_IDF_COMMIT "1b42fee4f0"
721722
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

tools/sdk/esp32s2/include/arduino_tinyusb/tinyusb/src/class/cdc/cdc_device.h

+6
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,12 @@
4141
#define CFG_TUD_CDC_EP_BUFSIZE (TUD_OPT_HIGH_SPEED ? 512 : 64)
4242
#endif
4343

44+
// By default the TX fifo buffer is cleared on connect / bus reset.
45+
// Enable this to persist any data in the fifo instead.
46+
#ifndef CFG_TUD_CDC_PERSISTENT_TX_BUFF
47+
#define CFG_TUD_CDC_PERSISTENT_TX_BUFF (0)
48+
#endif
49+
4450
#ifdef __cplusplus
4551
extern "C" {
4652
#endif

0 commit comments

Comments
 (0)