Skip to content

Commit 236cb0e

Browse files
committed
IDF release/v4.4 55b1756d5f
1 parent bbc989c commit 236cb0e

File tree

23 files changed

+64
-38
lines changed

23 files changed

+64
-38
lines changed

platform.txt

Lines changed: 3 additions & 3 deletions
Large diffs are not rendered by default.

tools/platformio-build-esp32.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@
303303
"UNITY_INCLUDE_CONFIG_H",
304304
"WITH_POSIX",
305305
"_GNU_SOURCE",
306-
("IDF_VER", '\\"v4.4-27-gea62bcfaf0\\"'),
306+
("IDF_VER", '\\"v4.4-41-g55b1756d5f\\"'),
307307
"ESP_PLATFORM",
308308
"_POSIX_READER_WRITER_LOCKS",
309309
"ARDUINO_ARCH_ESP32",

tools/platformio-build-esp32c3.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@
293293
"UNITY_INCLUDE_CONFIG_H",
294294
"WITH_POSIX",
295295
"_GNU_SOURCE",
296-
("IDF_VER", '\\"v4.4-27-gea62bcfaf0\\"'),
296+
("IDF_VER", '\\"v4.4-41-g55b1756d5f\\"'),
297297
"ESP_PLATFORM",
298298
"_POSIX_READER_WRITER_LOCKS",
299299
"ARDUINO_ARCH_ESP32",

tools/platformio-build-esp32s2.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@
290290
"UNITY_INCLUDE_CONFIG_H",
291291
"WITH_POSIX",
292292
"_GNU_SOURCE",
293-
("IDF_VER", '\\"v4.4-27-gea62bcfaf0\\"'),
293+
("IDF_VER", '\\"v4.4-41-g55b1756d5f\\"'),
294294
"ESP_PLATFORM",
295295
"_POSIX_READER_WRITER_LOCKS",
296296
"ARDUINO_ARCH_ESP32",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -681,5 +681,5 @@
681681
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
682682
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
683683
#define CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP
684-
#define CONFIG_ARDUINO_IDF_COMMIT "ea62bcfaf0"
684+
#define CONFIG_ARDUINO_IDF_COMMIT "55b1756d5f"
685685
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

tools/sdk/esp32/include/driver/include/driver/ledc.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -443,9 +443,6 @@ esp_err_t ledc_set_fade_time_and_start(ledc_mode_t speed_mode, ledc_channel_t ch
443443
* - ESP_FAIL Fade function init error
444444
*/
445445
esp_err_t ledc_set_fade_step_and_start(ledc_mode_t speed_mode, ledc_channel_t channel, uint32_t target_duty, uint32_t scale, uint32_t cycle_num, ledc_fade_mode_t fade_mode);
446-
#ifdef __cplusplus
447-
}
448-
#endif
449446

450447
/**
451448
* @brief LEDC callback registration function
@@ -461,3 +458,6 @@ esp_err_t ledc_set_fade_step_and_start(ledc_mode_t speed_mode, ledc_channel_t ch
461458
* - ESP_FAIL Fade function init error
462459
*/
463460
esp_err_t ledc_cb_register(ledc_mode_t speed_mode, ledc_channel_t channel, ledc_cbs_t *cbs, void *user_arg);
461+
#ifdef __cplusplus
462+
}
463+
#endif
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
/*
2+
* SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
6+
#pragma once
7+
8+
#ifdef __cplusplus
9+
extern "C" {
10+
#endif
11+
12+
#define TRACEMEM_BLK0_ADDR 0x3FFFC000UL
13+
#define TRACEMEM_BLK1_ADDR 0x3FFF8000UL
14+
15+
#ifdef __cplusplus
16+
}
17+
#endif

tools/sdk/esp32/ld/sections.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -601,8 +601,8 @@ SECTIONS
601601
_bss_start = ABSOLUTE(.);
602602

603603
*(.bss .bss.*)
604-
*(.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)
605604
*(.ext_ram.bss .ext_ram.bss.*)
605+
*(.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)
606606
*(COMMON)
607607
_bt_bss_start = ABSOLUTE(.);
608608
*libbt.a:(.bss .bss.* COMMON)

tools/sdk/esp32/lib/libapp_update.a

0 Bytes
Binary file not shown.

tools/sdk/esp32/lib/libesp_system.a

0 Bytes
Binary file not shown.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -632,5 +632,5 @@
632632
#define CONFIG_TIMER_TASK_STACK_SIZE CONFIG_ESP_TIMER_TASK_STACK_SIZE
633633
#define CONFIG_TOOLPREFIX CONFIG_SDK_TOOLPREFIX
634634
#define CONFIG_UDP_RECVMBOX_SIZE CONFIG_LWIP_UDP_RECVMBOX_SIZE
635-
#define CONFIG_ARDUINO_IDF_COMMIT "ea62bcfaf0"
635+
#define CONFIG_ARDUINO_IDF_COMMIT "55b1756d5f"
636636
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

tools/sdk/esp32c3/include/driver/include/driver/ledc.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -443,9 +443,6 @@ esp_err_t ledc_set_fade_time_and_start(ledc_mode_t speed_mode, ledc_channel_t ch
443443
* - ESP_FAIL Fade function init error
444444
*/
445445
esp_err_t ledc_set_fade_step_and_start(ledc_mode_t speed_mode, ledc_channel_t channel, uint32_t target_duty, uint32_t scale, uint32_t cycle_num, ledc_fade_mode_t fade_mode);
446-
#ifdef __cplusplus
447-
}
448-
#endif
449446

450447
/**
451448
* @brief LEDC callback registration function
@@ -461,3 +458,6 @@ esp_err_t ledc_set_fade_step_and_start(ledc_mode_t speed_mode, ledc_channel_t ch
461458
* - ESP_FAIL Fade function init error
462459
*/
463460
esp_err_t ledc_cb_register(ledc_mode_t speed_mode, ledc_channel_t channel, ledc_cbs_t *cbs, void *user_arg);
461+
#ifdef __cplusplus
462+
}
463+
#endif

tools/sdk/esp32c3/ld/sections.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,8 +307,8 @@ SECTIONS
307307
_bss_start = ABSOLUTE(.);
308308

309309
*(.bss .bss.*)
310-
*(.ext_ram.bss .ext_ram.bss.*)
311310
*(.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)
311+
*(.ext_ram.bss .ext_ram.bss.*)
312312
*(COMMON)
313313
_bt_bss_start = ABSOLUTE(.);
314314
*libbt.a:(.bss .bss.* COMMON)

tools/sdk/esp32c3/lib/libapp_update.a

0 Bytes
Binary file not shown.

tools/sdk/esp32c3/lib/libesp_system.a

0 Bytes
Binary file not shown.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,5 +581,5 @@
581581
#define CONFIG_USB_MSC_BUFSIZE CONFIG_TINYUSB_MSC_BUFSIZE
582582
#define CONFIG_USB_MSC_ENABLED CONFIG_TINYUSB_MSC_ENABLED
583583
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
584-
#define CONFIG_ARDUINO_IDF_COMMIT "ea62bcfaf0"
584+
#define CONFIG_ARDUINO_IDF_COMMIT "55b1756d5f"
585585
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

tools/sdk/esp32s2/include/driver/include/driver/ledc.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -443,9 +443,6 @@ esp_err_t ledc_set_fade_time_and_start(ledc_mode_t speed_mode, ledc_channel_t ch
443443
* - ESP_FAIL Fade function init error
444444
*/
445445
esp_err_t ledc_set_fade_step_and_start(ledc_mode_t speed_mode, ledc_channel_t channel, uint32_t target_duty, uint32_t scale, uint32_t cycle_num, ledc_fade_mode_t fade_mode);
446-
#ifdef __cplusplus
447-
}
448-
#endif
449446

450447
/**
451448
* @brief LEDC callback registration function
@@ -461,3 +458,6 @@ esp_err_t ledc_set_fade_step_and_start(ledc_mode_t speed_mode, ledc_channel_t ch
461458
* - ESP_FAIL Fade function init error
462459
*/
463460
esp_err_t ledc_cb_register(ledc_mode_t speed_mode, ledc_channel_t channel, ledc_cbs_t *cbs, void *user_arg);
461+
#ifdef __cplusplus
462+
}
463+
#endif

tools/sdk/esp32s2/include/soc/esp32s2/include/soc/dport_reg.h

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
1-
// Copyright 2015-2016 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: 2015-2021 Espressif Systems (Shanghai) CO LTD
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
146
#ifndef _SOC_DPORT_REG_H_
157
#define _SOC_DPORT_REG_H_
168

@@ -25,10 +17,6 @@ extern "C" {
2517

2618
#define DPORT_DATE_REG SYSTEM_DATE_REG
2719

28-
#define TRACEMEM_MUX_BLK0_NUM 19
29-
#define TRACEMEM_MUX_BLK1_NUM 20
30-
#define TRACEMEM_BLK_NUM2ADDR(_n_) (0x3FFB8000UL + 0x4000UL*((_n_)-4))
31-
3220
#ifndef __ASSEMBLER__
3321
#include "dport_access.h"
3422
#endif
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/*
2+
* SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
6+
#pragma once
7+
8+
#ifdef __cplusplus
9+
extern "C" {
10+
#endif
11+
12+
#define TRACEMEM_MUX_BLK0_NUM 19
13+
#define TRACEMEM_MUX_BLK1_NUM 20
14+
#define TRACEMEM_BLK_NUM2ADDR(_n_) (0x3FFB8000UL + 0x4000UL*((_n_)-4))
15+
16+
#define TRACEMEM_BLK0_ADDR TRACEMEM_BLK_NUM2ADDR(TRACEMEM_MUX_BLK0_NUM)
17+
#define TRACEMEM_BLK1_ADDR TRACEMEM_BLK_NUM2ADDR(TRACEMEM_MUX_BLK1_NUM)
18+
19+
#ifdef __cplusplus
20+
}
21+
#endif

tools/sdk/esp32s2/ld/sections.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,8 +371,8 @@ SECTIONS
371371
*(.ext_ram.bss*)
372372

373373
*(.bss .bss.*)
374-
*(.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)
375374
*(.ext_ram.bss .ext_ram.bss.*)
375+
*(.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)
376376
*(COMMON)
377377
_bt_bss_start = ABSOLUTE(.);
378378
*libbt.a:(.bss .bss.* COMMON)

tools/sdk/esp32s2/lib/libapp_update.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libesp_system.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s2/lib/libheap.a

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)