Skip to content

Commit 21bd3a5

Browse files
me-no-devme-no-dev
committed
IDF release/v4.4 799e503c47
1 parent f5ce556 commit 21bd3a5

File tree

67 files changed

+1394
-560
lines changed

Some content is hidden

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

67 files changed

+1394
-560
lines changed

‎platform.txt

Lines changed: 4 additions & 4 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
@@ -336,7 +336,7 @@
336336
"UNITY_INCLUDE_CONFIG_H",
337337
"WITH_POSIX",
338338
"_GNU_SOURCE",
339-
("IDF_VER", '\\"v4.4.7-231-g1424b2b1e6-dirty\\"'),
339+
("IDF_VER", '\\"v4.4.7-237-g799e503c47-dirty\\"'),
340340
"ESP_PLATFORM",
341341
"_POSIX_READER_WRITER_LOCKS",
342342
"ARDUINO_ARCH_ESP32",

‎tools/platformio-build-esp32c3.py

Lines changed: 1 addition & 1 deletion
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-231-g1424b2b1e6-dirty\\"'),
336+
("IDF_VER", '\\"v4.4.7-237-g799e503c47-dirty\\"'),
337337
"ESP_PLATFORM",
338338
"_POSIX_READER_WRITER_LOCKS",
339339
"ARDUINO_ARCH_ESP32",

‎tools/platformio-build-esp32s2.py

Lines changed: 1 addition & 1 deletion
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-231-g1424b2b1e6-dirty\\"'),
321+
("IDF_VER", '\\"v4.4.7-237-g799e503c47-dirty\\"'),
322322
"ESP_PLATFORM",
323323
"_POSIX_READER_WRITER_LOCKS",
324324
"ARDUINO_ARCH_ESP32",

‎tools/platformio-build-esp32s3.py

Lines changed: 1 addition & 1 deletion
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-231-g1424b2b1e6-dirty\\"'),
338+
("IDF_VER", '\\"v4.4.7-237-g799e503c47-dirty\\"'),
339339
"ESP_PLATFORM",
340340
"_POSIX_READER_WRITER_LOCKS",
341341
"ARDUINO_ARCH_ESP32",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -846,5 +846,5 @@
846846
#define CONFIG_ULP_COPROC_ENABLED CONFIG_ESP32_ULP_COPROC_ENABLED
847847
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
848848
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
849-
#define CONFIG_ARDUINO_IDF_COMMIT "1424b2b1e6"
849+
#define CONFIG_ARDUINO_IDF_COMMIT "799e503c47"
850850
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -846,5 +846,5 @@
846846
#define CONFIG_ULP_COPROC_ENABLED CONFIG_ESP32_ULP_COPROC_ENABLED
847847
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
848848
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
849-
#define CONFIG_ARDUINO_IDF_COMMIT "1424b2b1e6"
849+
#define CONFIG_ARDUINO_IDF_COMMIT "799e503c47"
850850
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

‎tools/sdk/esp32/ld/sections.ld

Lines changed: 2 additions & 2 deletions
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -846,5 +846,5 @@
846846
#define CONFIG_ULP_COPROC_ENABLED CONFIG_ESP32_ULP_COPROC_ENABLED
847847
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
848848
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
849-
#define CONFIG_ARDUINO_IDF_COMMIT "1424b2b1e6"
849+
#define CONFIG_ARDUINO_IDF_COMMIT "799e503c47"
850850
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -846,5 +846,5 @@
846846
#define CONFIG_ULP_COPROC_ENABLED CONFIG_ESP32_ULP_COPROC_ENABLED
847847
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
848848
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
849-
#define CONFIG_ARDUINO_IDF_COMMIT "1424b2b1e6"
849+
#define CONFIG_ARDUINO_IDF_COMMIT "799e503c47"
850850
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -852,5 +852,5 @@
852852
#define CONFIG_TOOLPREFIX CONFIG_SDK_TOOLPREFIX
853853
#define CONFIG_UDP_RECVMBOX_SIZE CONFIG_LWIP_UDP_RECVMBOX_SIZE
854854
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
855-
#define CONFIG_ARDUINO_IDF_COMMIT "1424b2b1e6"
855+
#define CONFIG_ARDUINO_IDF_COMMIT "799e503c47"
856856
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -852,5 +852,5 @@
852852
#define CONFIG_TOOLPREFIX CONFIG_SDK_TOOLPREFIX
853853
#define CONFIG_UDP_RECVMBOX_SIZE CONFIG_LWIP_UDP_RECVMBOX_SIZE
854854
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
855-
#define CONFIG_ARDUINO_IDF_COMMIT "1424b2b1e6"
855+
#define CONFIG_ARDUINO_IDF_COMMIT "799e503c47"
856856
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

‎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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -852,5 +852,5 @@
852852
#define CONFIG_TOOLPREFIX CONFIG_SDK_TOOLPREFIX
853853
#define CONFIG_UDP_RECVMBOX_SIZE CONFIG_LWIP_UDP_RECVMBOX_SIZE
854854
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
855-
#define CONFIG_ARDUINO_IDF_COMMIT "1424b2b1e6"
855+
#define CONFIG_ARDUINO_IDF_COMMIT "799e503c47"
856856
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -852,5 +852,5 @@
852852
#define CONFIG_TOOLPREFIX CONFIG_SDK_TOOLPREFIX
853853
#define CONFIG_UDP_RECVMBOX_SIZE CONFIG_LWIP_UDP_RECVMBOX_SIZE
854854
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
855-
#define CONFIG_ARDUINO_IDF_COMMIT "1424b2b1e6"
855+
#define CONFIG_ARDUINO_IDF_COMMIT "799e503c47"
856856
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -718,5 +718,5 @@
718718
#define CONFIG_USB_MSC_BUFSIZE CONFIG_TINYUSB_MSC_BUFSIZE
719719
#define CONFIG_USB_MSC_ENABLED CONFIG_TINYUSB_MSC_ENABLED
720720
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
721-
#define CONFIG_ARDUINO_IDF_COMMIT "1424b2b1e6"
721+
#define CONFIG_ARDUINO_IDF_COMMIT "799e503c47"
722722
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -718,5 +718,5 @@
718718
#define CONFIG_USB_MSC_BUFSIZE CONFIG_TINYUSB_MSC_BUFSIZE
719719
#define CONFIG_USB_MSC_ENABLED CONFIG_TINYUSB_MSC_ENABLED
720720
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
721-
#define CONFIG_ARDUINO_IDF_COMMIT "1424b2b1e6"
721+
#define CONFIG_ARDUINO_IDF_COMMIT "799e503c47"
722722
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

‎tools/sdk/esp32s2/include/arduino_tinyusb/tinyusb/src/common/tusb_compiler.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@
128128
#define TU_ATTR_SECTION(sec_name) __attribute__ ((section(#sec_name)))
129129
#define TU_ATTR_PACKED __attribute__ ((packed))
130130
#define TU_ATTR_WEAK __attribute__ ((weak))
131+
// #define TU_ATTR_WEAK_ALIAS(f) __attribute__ ((weak, alias(#f))
131132
#ifndef TU_ATTR_ALWAYS_INLINE // allow to override for debug
132133
#define TU_ATTR_ALWAYS_INLINE __attribute__ ((always_inline))
133134
#endif

‎tools/sdk/esp32s2/include/arduino_tinyusb/tinyusb/src/common/tusb_mcu.h

Lines changed: 40 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -402,28 +402,57 @@
402402
#elif TU_CHECK_MCU(OPT_MCU_F1C100S)
403403
#define TUP_DCD_ENDPOINT_MAX 4
404404

405-
//------------- WCH -------------//
406-
#elif TU_CHECK_MCU(OPT_MCU_CH32V307)
407-
// v307 support both FS and HS
405+
//--------------------------------------------------------------------+
406+
// WCH
407+
//--------------------------------------------------------------------+
408+
#elif TU_CHECK_MCU(OPT_MCU_CH32F20X)
408409
#define TUP_USBIP_WCH_USBHS
409410
#define TUP_USBIP_WCH_USBFS
410411

411-
#define TUP_RHPORT_HIGHSPEED 1 // default to highspeed
412-
#define TUP_DCD_ENDPOINT_MAX (CFG_TUD_MAX_SPEED == OPT_MODE_HIGH_SPEED ? 16 : 8)
412+
#if !defined(CFG_TUD_WCH_USBIP_USBFS)
413+
#define CFG_TUD_WCH_USBIP_USBFS 0
414+
#endif
413415

414-
#elif TU_CHECK_MCU(OPT_MCU_CH32F20X)
415-
#define TUP_USBIP_WCH_USBHS
416-
#define TUP_USBIP_WCH_USBFS
416+
#if !defined(CFG_TUD_WCH_USBIP_USBHS)
417+
#define CFG_TUD_WCH_USBIP_USBHS (CFG_TUD_WCH_USBIP_USBFS ? 0 : 1)
418+
#endif
417419

418-
#define TUP_RHPORT_HIGHSPEED 1 // default to highspeed
419-
#define TUP_DCD_ENDPOINT_MAX (CFG_TUD_MAX_SPEED == OPT_MODE_HIGH_SPEED ? 16 : 8)
420+
#define TUP_RHPORT_HIGHSPEED CFG_TUD_WCH_USBIP_USBHS
421+
#define TUP_DCD_ENDPOINT_MAX (CFG_TUD_WCH_USBIP_USBHS ? 16 : 8)
420422

421423
#elif TU_CHECK_MCU(OPT_MCU_CH32V20X)
424+
// v20x support both FSDEV (USBD) and USBFS, default to FSDEV
422425
#define TUP_USBIP_WCH_USBFS
426+
#define TUP_USBIP_FSDEV
427+
#define TUP_USBIP_FSDEV_CH32
428+
429+
#if !defined(CFG_TUD_WCH_USBIP_USBFS)
430+
#define CFG_TUD_WCH_USBIP_USBFS 0
431+
#endif
432+
433+
#if !defined(CFG_TUD_WCH_USBIP_FSDEV)
434+
#define CFG_TUD_WCH_USBIP_FSDEV (CFG_TUD_WCH_USBIP_USBFS ? 0 : 1)
435+
#endif
436+
423437
#define TUP_DCD_ENDPOINT_MAX 8
424438

425-
#endif
439+
#elif TU_CHECK_MCU(OPT_MCU_CH32V307)
440+
// v307 support both FS and HS, default to HS
441+
#define TUP_USBIP_WCH_USBHS
442+
#define TUP_USBIP_WCH_USBFS
426443

444+
#if !defined(CFG_TUD_WCH_USBIP_USBFS)
445+
#define CFG_TUD_WCH_USBIP_USBFS 0
446+
#endif
447+
448+
#if !defined(CFG_TUD_WCH_USBIP_USBHS)
449+
#define CFG_TUD_WCH_USBIP_USBHS (CFG_TUD_WCH_USBIP_USBFS ? 0 : 1)
450+
#endif
451+
452+
#define TUP_RHPORT_HIGHSPEED CFG_TUD_WCH_USBIP_USBHS
453+
#define TUP_DCD_ENDPOINT_MAX (CFG_TUD_WCH_USBIP_USBHS ? 16 : 8)
454+
455+
#endif
427456

428457
//--------------------------------------------------------------------+
429458
// External USB controller

‎tools/sdk/esp32s2/include/arduino_tinyusb/tinyusb/src/device/dcd.h

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
* This file is part of the TinyUSB stack.
2525
*/
2626

27-
#ifndef _TUSB_DCD_H_
28-
#define _TUSB_DCD_H_
27+
#ifndef TUSB_DCD_H_
28+
#define TUSB_DCD_H_
2929

3030
#include "common/tusb_common.h"
3131
#include "osal/osal.h"
@@ -35,14 +35,6 @@
3535
extern "C" {
3636
#endif
3737

38-
//--------------------------------------------------------------------+
39-
// Configuration
40-
//--------------------------------------------------------------------+
41-
42-
#ifndef CFG_TUD_ENDPPOINT_MAX
43-
#define CFG_TUD_ENDPPOINT_MAX TUP_DCD_ENDPOINT_MAX
44-
#endif
45-
4638
//--------------------------------------------------------------------+
4739
// MACRO CONSTANT TYPEDEF PROTYPES
4840
//--------------------------------------------------------------------+
@@ -149,10 +141,10 @@ void dcd_set_address(uint8_t rhport, uint8_t dev_addr);
149141
void dcd_remote_wakeup(uint8_t rhport);
150142

151143
// Connect by enabling internal pull-up resistor on D+/D-
152-
void dcd_connect(uint8_t rhport) TU_ATTR_WEAK;
144+
void dcd_connect(uint8_t rhport);
153145

154146
// Disconnect by disabling internal pull-up resistor on D+/D-
155-
void dcd_disconnect(uint8_t rhport) TU_ATTR_WEAK;
147+
void dcd_disconnect(uint8_t rhport);
156148

157149
// Enable/Disable Start-of-frame interrupt. Default is disabled
158150
void dcd_sof_enable(uint8_t rhport, bool en);
@@ -254,4 +246,4 @@ TU_ATTR_ALWAYS_INLINE static inline void dcd_event_sof(uint8_t rhport, uint32_t
254246
}
255247
#endif
256248

257-
#endif /* _TUSB_DCD_H_ */
249+
#endif

‎tools/sdk/esp32s2/include/arduino_tinyusb/tinyusb/src/device/usbd.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ void tud_task (void) {
6060
// Check if there is pending events need processing by tud_task()
6161
bool tud_task_event_ready(void);
6262

63-
#ifndef _TUSB_DCD_H_
63+
#ifndef TUSB_DCD_H_
6464
extern void dcd_int_handler(uint8_t rhport);
6565
#endif
6666

0 commit comments

Comments
 (0)