Skip to content

IDF release/v4.4 #6174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 36 commits into from
Closed
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
533c51c
IDF release/v4.4 ab118fe8be
me-no-dev Jan 21, 2022
cbe8a7e
IDF release/v4.4 0b46ac1732
me-no-dev Jan 22, 2022
54bf263
IDF release/v4.4 f546d5e493
me-no-dev Jan 26, 2022
bbc989c
IDF release/v4.4 ea62bcfaf0
me-no-dev Jan 26, 2022
236cb0e
IDF release/v4.4 55b1756d5f
me-no-dev Jan 27, 2022
d2788a0
IDF release/v4.4 7d9b93e2e0
me-no-dev Jan 27, 2022
773a623
IDF release/v4.4 d16aaae498
me-no-dev Jan 28, 2022
9a98cb9
IDF release/v4.4 257d95fc22
me-no-dev Jan 29, 2022
da09a46
IDF release/v4.4 bfd3e9c54c
me-no-dev Jan 29, 2022
e19106a
IDF release/v4.4 eb3797dc3f
me-no-dev Jan 30, 2022
a675e64
IDF release/v4.4 0a1e309ee4
me-no-dev Feb 5, 2022
b69b44a
IDF release/v4.4 7c986a64c7
me-no-dev Feb 6, 2022
93b973e
Merge branch 'master' into idf-release/v4.4
me-no-dev Feb 7, 2022
e2a6652
Merge branch 'master' into idf-release/v4.4
me-no-dev Feb 7, 2022
ce15422
IDF release/v4.4 0a0b652815
me-no-dev Feb 7, 2022
92ef033
IDF release/v4.4 f98ec313f2
me-no-dev Feb 8, 2022
df0205f
IDF release/v4.4 afe82b4e1b
me-no-dev Feb 9, 2022
9b89cfe
IDF release/v4.4 c7b9f94733
me-no-dev Feb 10, 2022
2903dd3
IDF release/v4.4 14b52e9d83
me-no-dev Feb 10, 2022
24186b1
IDF release/v4.4 730ca0ea43
me-no-dev Feb 11, 2022
4acddee
IDF release/v4.4 83daa6dabb
me-no-dev Feb 16, 2022
8c10e96
IDF release/v4.4 d483bd9518
me-no-dev Feb 17, 2022
b0e9fbe
IDF release/v4.4 bf7266312c
me-no-dev Feb 17, 2022
10635b1
IDF release/v4.4 5ff09f0a06
me-no-dev Feb 17, 2022
16216ae
IDF release/v4.4 000d3823bb
me-no-dev Feb 21, 2022
382dcb0
Merge branch 'master' into idf-release/v4.4
me-no-dev Feb 24, 2022
b499cd4
IDF release/v4.4 6ee5e622e8
me-no-dev Mar 3, 2022
b632f90
IDF release/v4.4 eff03cbbd9
me-no-dev Mar 3, 2022
42ae27a
IDF release/v4.4 169008616b
me-no-dev Mar 4, 2022
404590c
IDF release/v4.4 89f57f3402
me-no-dev Mar 4, 2022
8dc341a
IDF release/v4.4 3c9657fa4e
me-no-dev Mar 7, 2022
44eb78f
IDF release/v4.4 92a67e0fff
me-no-dev Mar 7, 2022
3aa2a1a
IDF release/v4.4 1b06c55ab1
me-no-dev Mar 8, 2022
20dd670
IDF release/v4.4 c45dee0a7a
me-no-dev Mar 8, 2022
154c035
IDF release/v4.4 121ddb87e5
me-no-dev Mar 9, 2022
8452579
IDF release/v4.4 c29343eb94
me-no-dev Mar 13, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions platform.txt

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tools/platformio-build-esp32.py
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@
"UNITY_INCLUDE_CONFIG_H",
"WITH_POSIX",
"_GNU_SOURCE",
("IDF_VER", '\\"v4.4-beta1-308-gf3e0c8bc41\\"'),
("IDF_VER", '\\"v4.4-rc1-8-g0b46ac1732\\"'),
"ESP_PLATFORM",
"_POSIX_READER_WRITER_LOCKS",
"ARDUINO_ARCH_ESP32",
Expand Down
2 changes: 1 addition & 1 deletion tools/platformio-build-esp32c3.py
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@
"UNITY_INCLUDE_CONFIG_H",
"WITH_POSIX",
"_GNU_SOURCE",
("IDF_VER", '\\"v4.4-beta1-308-gf3e0c8bc41\\"'),
("IDF_VER", '\\"v4.4-rc1-8-g0b46ac1732\\"'),
"ESP_PLATFORM",
"_POSIX_READER_WRITER_LOCKS",
"ARDUINO_ARCH_ESP32",
Expand Down
2 changes: 1 addition & 1 deletion tools/platformio-build-esp32s2.py
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@
"UNITY_INCLUDE_CONFIG_H",
"WITH_POSIX",
"_GNU_SOURCE",
("IDF_VER", '\\"v4.4-beta1-308-gf3e0c8bc41\\"'),
("IDF_VER", '\\"v4.4-rc1-8-g0b46ac1732\\"'),
"ESP_PLATFORM",
"_POSIX_READER_WRITER_LOCKS",
"ARDUINO_ARCH_ESP32",
Expand Down
6 changes: 4 additions & 2 deletions tools/sdk/esp32/include/config/sdkconfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@
#define CONFIG_ESP_EVENT_POST_FROM_IRAM_ISR 1
#define CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS 1
#define CONFIG_ESP_HTTP_CLIENT_ENABLE_DIGEST_AUTH 1
#define CONFIG_HTTPD_MAX_REQ_HDR_LEN 512
#define CONFIG_HTTPD_MAX_REQ_HDR_LEN 1024
#define CONFIG_HTTPD_MAX_URI_LEN 512
#define CONFIG_HTTPD_ERR_RESP_NO_DELAY 1
#define CONFIG_HTTPD_PURGE_BUF_LEN 32
Expand Down Expand Up @@ -551,7 +551,9 @@
#define CONFIG_GC2145_SUPPORT 1
#define CONFIG_GC032A_SUPPORT 1
#define CONFIG_GC0308_SUPPORT 1
#define CONFIG_BF3005_SUPPORT 1
#define CONFIG_SCCB_HARDWARE_I2C_PORT1 1
#define CONFIG_SCCB_CLK_FREQ 100000
#define CONFIG_GC_SENSOR_SUBSAMPLE_MODE 1
#define CONFIG_CAMERA_CORE0 1
#define CONFIG_CAMERA_DMA_BUFFER_SIZE_MAX 32768
Expand Down Expand Up @@ -679,5 +681,5 @@
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
#define CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP
#define CONFIG_ARDUINO_IDF_COMMIT "f3e0c8bc41"
#define CONFIG_ARDUINO_IDF_COMMIT "0b46ac1732"
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"
3 changes: 3 additions & 0 deletions tools/sdk/esp32/include/esp32-camera/driver/include/sensor.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ typedef enum {
GC2145_PID = 0x2145,
GC032A_PID = 0x232a,
GC0308_PID = 0x9b,
BF3005_PID = 0x30,
} camera_pid_t;

typedef enum {
Expand All @@ -38,6 +39,7 @@ typedef enum {
CAMERA_GC2145,
CAMERA_GC032A,
CAMERA_GC0308,
CAMERA_BF3005,
CAMERA_MODEL_MAX,
CAMERA_NONE,
} camera_model_t;
Expand All @@ -52,6 +54,7 @@ typedef enum {
GC2145_SCCB_ADDR = 0x3C,// 0x78 >> 1
GC032A_SCCB_ADDR = 0x21,// 0x42 >> 1
GC0308_SCCB_ADDR = 0x21,// 0x42 >> 1
BF3005_SCCB_ADDR = 0x6E,
} camera_sccb_addr_t;

typedef enum {
Expand Down
18 changes: 5 additions & 13 deletions tools/sdk/esp32/include/hal/include/hal/i2s_types.h
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
// Copyright 2020 Espressif Systems (Shanghai) PTE LTD
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
/*
* SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/

#pragma once

Expand Down
17 changes: 11 additions & 6 deletions tools/sdk/esp32/include/soc/esp32/include/soc/soc_caps.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down Expand Up @@ -140,18 +140,23 @@

#define SOC_I2C_SUPPORT_APB (1)

/*-------------------------- APLL CAPS ----------------------------------------*/
#define SOC_CLK_APLL_SUPPORTED (1)
// apll_multiplier_out = xtal_freq * (4 + sdm2 + sdm1/256 + sdm0/65536)
#define SOC_APLL_MULTIPLIER_OUT_MIN_HZ (350000000) // 350 MHz
#define SOC_APLL_MULTIPLIER_OUT_MAX_HZ (500000000) // 500 MHz
#define SOC_APLL_MIN_HZ (5303031) // 5.303031 MHz
#define SOC_APLL_MAX_HZ (125000000) // 125MHz

/*-------------------------- I2S CAPS ----------------------------------------*/
// ESP32 have 2 I2S
#define SOC_I2S_NUM (2)
#define SOC_I2S_NUM (2U)
#define SOC_I2S_SUPPORTS_APLL (1) // ESP32 support APLL
#define SOC_I2S_SUPPORTS_PDM_TX (1)
#define SOC_I2S_SUPPORTS_PDM_RX (1)
#define SOC_I2S_SUPPORTS_ADC (1) // ESP32 support ADC and DAC
#define SOC_I2S_SUPPORTS_DAC (1)

#define SOC_I2S_SUPPORTS_APLL (1)// ESP32 support APLL
#define SOC_I2S_APLL_MIN_FREQ (250000000)
#define SOC_I2S_APLL_MAX_FREQ (500000000)
#define SOC_I2S_APLL_MIN_RATE (10675) //in Hz, I2S Clock rate limited by hardware
#define SOC_I2S_TRANS_SIZE_ALIGN_WORD (1) // I2S DMA transfer size must be aligned to word
#define SOC_I2S_LCD_I80_VARIANT (1) // I2S has a special LCD mode that can generate Intel 8080 TX timing

Expand Down
Binary file modified tools/sdk/esp32/lib/libapp_update.a
Binary file not shown.
Binary file modified tools/sdk/esp32/lib/libdriver.a
Binary file not shown.
Binary file modified tools/sdk/esp32/lib/libesp32-camera.a
Binary file not shown.
Binary file modified tools/sdk/esp32/lib/libesp_http_server.a
Binary file not shown.
Binary file modified tools/sdk/esp32/lib/libesp_lcd.a
Binary file not shown.
Binary file modified tools/sdk/esp32/lib/libesp_system.a
Binary file not shown.
Binary file modified tools/sdk/esp32/lib/libhal.a
Binary file not shown.
Binary file modified tools/sdk/esp32/lib/libtcp_transport.a
Binary file not shown.
4 changes: 3 additions & 1 deletion tools/sdk/esp32/sdkconfig
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@ CONFIG_ESP_HTTP_CLIENT_ENABLE_DIGEST_AUTH=y
#
# HTTP Server
#
CONFIG_HTTPD_MAX_REQ_HDR_LEN=512
CONFIG_HTTPD_MAX_REQ_HDR_LEN=1024
CONFIG_HTTPD_MAX_URI_LEN=512
CONFIG_HTTPD_ERR_RESP_NO_DELAY=y
CONFIG_HTTPD_PURGE_BUF_LEN=32
Expand Down Expand Up @@ -1522,8 +1522,10 @@ CONFIG_OV5640_SUPPORT=y
CONFIG_GC2145_SUPPORT=y
CONFIG_GC032A_SUPPORT=y
CONFIG_GC0308_SUPPORT=y
CONFIG_BF3005_SUPPORT=y
# CONFIG_SCCB_HARDWARE_I2C_PORT0 is not set
CONFIG_SCCB_HARDWARE_I2C_PORT1=y
CONFIG_SCCB_CLK_FREQ=100000
# CONFIG_GC_SENSOR_WINDOWING_MODE is not set
CONFIG_GC_SENSOR_SUBSAMPLE_MODE=y
CONFIG_CAMERA_CORE0=y
Expand Down
4 changes: 2 additions & 2 deletions tools/sdk/esp32c3/include/config/sdkconfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
#define CONFIG_ESP_EVENT_POST_FROM_IRAM_ISR 1
#define CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS 1
#define CONFIG_ESP_HTTP_CLIENT_ENABLE_DIGEST_AUTH 1
#define CONFIG_HTTPD_MAX_REQ_HDR_LEN 512
#define CONFIG_HTTPD_MAX_REQ_HDR_LEN 1024
#define CONFIG_HTTPD_MAX_URI_LEN 512
#define CONFIG_HTTPD_ERR_RESP_NO_DELAY 1
#define CONFIG_HTTPD_PURGE_BUF_LEN 32
Expand Down Expand Up @@ -632,5 +632,5 @@
#define CONFIG_TIMER_TASK_STACK_SIZE CONFIG_ESP_TIMER_TASK_STACK_SIZE
#define CONFIG_TOOLPREFIX CONFIG_SDK_TOOLPREFIX
#define CONFIG_UDP_RECVMBOX_SIZE CONFIG_LWIP_UDP_RECVMBOX_SIZE
#define CONFIG_ARDUINO_IDF_COMMIT "f3e0c8bc41"
#define CONFIG_ARDUINO_IDF_COMMIT "0b46ac1732"
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"
18 changes: 5 additions & 13 deletions tools/sdk/esp32c3/include/hal/include/hal/i2s_types.h
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
// Copyright 2020 Espressif Systems (Shanghai) PTE LTD
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
/*
* SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/

#pragma once

Expand Down
2 changes: 1 addition & 1 deletion tools/sdk/esp32c3/ld/sections.ld
Original file line number Diff line number Diff line change
Expand Up @@ -307,8 +307,8 @@ SECTIONS
_bss_start = ABSOLUTE(.);

*(.bss .bss.*)
*(.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)
*(.ext_ram.bss .ext_ram.bss.*)
*(.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)
*(COMMON)
_bt_bss_start = ABSOLUTE(.);
*libbt.a:(.bss .bss.* COMMON)
Expand Down
Binary file modified tools/sdk/esp32c3/lib/libapp_update.a
Binary file not shown.
Binary file modified tools/sdk/esp32c3/lib/libdriver.a
Binary file not shown.
Binary file modified tools/sdk/esp32c3/lib/libesp_http_server.a
Binary file not shown.
Binary file modified tools/sdk/esp32c3/lib/libesp_system.a
Binary file not shown.
Binary file modified tools/sdk/esp32c3/lib/libhal.a
Binary file not shown.
Binary file modified tools/sdk/esp32c3/lib/libtcp_transport.a
Binary file not shown.
2 changes: 1 addition & 1 deletion tools/sdk/esp32c3/sdkconfig
Original file line number Diff line number Diff line change
Expand Up @@ -672,7 +672,7 @@ CONFIG_ESP_HTTP_CLIENT_ENABLE_DIGEST_AUTH=y
#
# HTTP Server
#
CONFIG_HTTPD_MAX_REQ_HDR_LEN=512
CONFIG_HTTPD_MAX_REQ_HDR_LEN=1024
CONFIG_HTTPD_MAX_URI_LEN=512
CONFIG_HTTPD_ERR_RESP_NO_DELAY=y
CONFIG_HTTPD_PURGE_BUF_LEN=32
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,11 @@
#define CFG_TUD_AUDIO_ENABLE_FEEDBACK_EP 0 // Feedback - 0 or 1
#endif

// Enable/disable conversion from 16.16 to 10.14 format on full-speed devices. See tud_audio_n_fb_set().
#ifndef CFG_TUD_AUDIO_ENABLE_FEEDBACK_FORMAT_CORRECTION
#define CFG_TUD_AUDIO_ENABLE_FEEDBACK_FORMAT_CORRECTION 0 // 0 or 1
#endif

// Audio interrupt control EP size - disabled if 0
#ifndef CFG_TUD_AUDIO_INT_CTR_EPSIZE_IN
#define CFG_TUD_AUDIO_INT_CTR_EPSIZE_IN 0 // Audio interrupt control - if required - 6 Bytes according to UAC 2 specification (p. 74)
Expand Down Expand Up @@ -454,10 +459,15 @@ TU_ATTR_WEAK bool tud_audio_rx_done_post_read_cb(uint8_t rhport, uint16_t n_byte

#if CFG_TUD_AUDIO_ENABLE_EP_OUT && CFG_TUD_AUDIO_ENABLE_FEEDBACK_EP
TU_ATTR_WEAK bool tud_audio_fb_done_cb(uint8_t rhport);
// User code should call this function with feedback value in 16.16 format for FS and HS.
// Value will be corrected for FS to 10.14 format automatically.
// (see Universal Serial Bus Specification Revision 2.0 5.12.4.2).
// Feedback value will be sent at FB endpoint interval till it's changed.

// This function is used to provide data rate feedback from an asynchronous sink. Feedback value will be sent at FB endpoint interval till it's changed.
//
// The feedback format is specified to be 16.16 for HS and 10.14 for FS devices (see Universal Serial Bus Specification Revision 2.0 5.12.4.2). By default,
// the choice of format is left to the caller and feedback argument is sent as-is. If CFG_TUD_AUDIO_ENABLE_FEEDBACK_FORMAT_CORRECTION is set, then tinyusb
// expects 16.16 format and handles the conversion to 10.14 on FS.
//
// Note that due to a bug in its USB Audio 2.0 driver, Windows currently requires 16.16 format for _all_ USB 2.0 devices. On Linux and macOS it seems the
// driver can work with either format. So a good compromise is to keep format correction disabled and stick to 16.16 format.
bool tud_audio_n_fb_set(uint8_t func_id, uint32_t feedback);
static inline bool tud_audio_fb_set(uint32_t feedback);
#endif
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,10 @@
#define DCD_ATTR_ENDPOINT_MAX 10
#define DCD_ATTR_ENDPOINT_EXCLUSIVE_NUMBER

#elif TU_CHECK_MCU(OPT_MCU_PIC32MZ)
#define DCD_ATTR_ENDPOINT_MAX 8
#define DCD_ATTR_ENDPOINT_EXCLUSIVE_NUMBER

//------------- ST -------------//
#elif TU_CHECK_MCU(OPT_MCU_STM32F0)
#define DCD_ATTR_ENDPOINT_MAX 8
Expand Down Expand Up @@ -197,6 +201,13 @@
#elif TU_CHECK_MCU(OPT_MCU_XMC4000)
#define DCD_ATTR_ENDPOINT_MAX 8

//------------- BridgeTek -------------//
#elif TU_CHECK_MCU(OPT_MCU_FT90X)
#define DCD_ATTR_ENDPOINT_MAX 8

#elif TU_CHECK_MCU(OPT_MCU_FT93X)
#define DCD_ATTR_ENDPOINT_MAX 16

#else
#warning "DCD_ATTR_ENDPOINT_MAX is not defined for this MCU, default to 8"
#define DCD_ATTR_ENDPOINT_MAX 8
Expand Down
Loading