Skip to content

Commit f257d6f

Browse files
me-no-devme-no-dev
authored
IDF release/v4.4 2720d45e71 (#5801)
1 parent aabbed0 commit f257d6f

24 files changed

+55
-56
lines changed

Diff for: ‎platform.txt

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

Diff for: ‎tools/platformio-build-esp32.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@
301301
"UNITY_INCLUDE_CONFIG_H",
302302
"WITH_POSIX",
303303
"_GNU_SOURCE",
304-
("IDF_VER", '\\"v4.4-dev-3540-g4e03a9c34c\\"'),
304+
("IDF_VER", '\\"v4.4-dev-3544-g2720d45e71\\"'),
305305
"ESP_PLATFORM",
306306
"ARDUINO_ARCH_ESP32",
307307
"ESP32",

Diff for: ‎tools/platformio-build-esp32c3.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@
292292
"UNITY_INCLUDE_CONFIG_H",
293293
"WITH_POSIX",
294294
"_GNU_SOURCE",
295-
("IDF_VER", '\\"v4.4-dev-3540-g4e03a9c34c\\"'),
295+
("IDF_VER", '\\"v4.4-dev-3544-g2720d45e71\\"'),
296296
"ESP_PLATFORM",
297297
"ARDUINO_ARCH_ESP32",
298298
"ESP32",

Diff for: ‎tools/platformio-build-esp32s2.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@
287287
"UNITY_INCLUDE_CONFIG_H",
288288
"WITH_POSIX",
289289
"_GNU_SOURCE",
290-
("IDF_VER", '\\"v4.4-dev-3540-g4e03a9c34c\\"'),
290+
("IDF_VER", '\\"v4.4-dev-3544-g2720d45e71\\"'),
291291
"ESP_PLATFORM",
292292
"ARDUINO_ARCH_ESP32",
293293
"ESP32",

Diff for: ‎tools/sdk/esp32/include/config/sdkconfig.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@
371371
#define CONFIG_LWIP_GARP_TMR_INTERVAL 60
372372
#define CONFIG_LWIP_TCPIP_RECVMBOX_SIZE 32
373373
#define CONFIG_LWIP_DHCP_RESTORE_LAST_IP 1
374-
#define CONFIG_LWIP_DHCP_OPTIONS_LEN 68
374+
#define CONFIG_LWIP_DHCP_OPTIONS_LEN 128
375375
#define CONFIG_LWIP_DHCPS 1
376376
#define CONFIG_LWIP_DHCPS_LEASE_UNIT 60
377377
#define CONFIG_LWIP_DHCPS_MAX_STATION_NUM 8
@@ -673,5 +673,5 @@
673673
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
674674
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
675675
#define CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP
676-
#define CONFIG_ARDUINO_IDF_COMMIT "4e03a9c34c"
677-
#define CONFIG_ARDUINO_IDF_BRANCH "master"
676+
#define CONFIG_ARDUINO_IDF_COMMIT "2720d45e71"
677+
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

Diff for: ‎tools/sdk/esp32/lib/libapp_update.a

0 Bytes
Binary file not shown.

Diff for: ‎tools/sdk/esp32/lib/libesp_system.a

0 Bytes
Binary file not shown.

Diff for: ‎tools/sdk/esp32/lib/liblwip.a

-140 Bytes
Binary file not shown.

Diff for: ‎tools/sdk/esp32/sdkconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1029,7 +1029,7 @@ CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32
10291029
# CONFIG_LWIP_DHCP_DOES_ARP_CHECK is not set
10301030
# CONFIG_LWIP_DHCP_DISABLE_CLIENT_ID is not set
10311031
CONFIG_LWIP_DHCP_RESTORE_LAST_IP=y
1032-
CONFIG_LWIP_DHCP_OPTIONS_LEN=68
1032+
CONFIG_LWIP_DHCP_OPTIONS_LEN=128
10331033

10341034
#
10351035
# DHCP server

Diff for: ‎tools/sdk/esp32c3/include/config/sdkconfig.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@
340340
#define CONFIG_LWIP_GARP_TMR_INTERVAL 60
341341
#define CONFIG_LWIP_TCPIP_RECVMBOX_SIZE 32
342342
#define CONFIG_LWIP_DHCP_DOES_ARP_CHECK 1
343-
#define CONFIG_LWIP_DHCP_OPTIONS_LEN 68
343+
#define CONFIG_LWIP_DHCP_OPTIONS_LEN 128
344344
#define CONFIG_LWIP_DHCPS 1
345345
#define CONFIG_LWIP_DHCPS_LEASE_UNIT 60
346346
#define CONFIG_LWIP_DHCPS_MAX_STATION_NUM 8
@@ -627,5 +627,5 @@
627627
#define CONFIG_TIMER_TASK_STACK_SIZE CONFIG_ESP_TIMER_TASK_STACK_SIZE
628628
#define CONFIG_TOOLPREFIX CONFIG_SDK_TOOLPREFIX
629629
#define CONFIG_UDP_RECVMBOX_SIZE CONFIG_LWIP_UDP_RECVMBOX_SIZE
630-
#define CONFIG_ARDUINO_IDF_COMMIT "4e03a9c34c"
631-
#define CONFIG_ARDUINO_IDF_BRANCH "master"
630+
#define CONFIG_ARDUINO_IDF_COMMIT "2720d45e71"
631+
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

Diff for: ‎tools/sdk/esp32c3/lib/libapp_update.a

0 Bytes
Binary file not shown.

Diff for: ‎tools/sdk/esp32c3/lib/libesp_system.a

0 Bytes
Binary file not shown.

Diff for: ‎tools/sdk/esp32c3/lib/liblwip.a

280 Bytes
Binary file not shown.

Diff for: ‎tools/sdk/esp32c3/sdkconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1047,7 +1047,7 @@ CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32
10471047
CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y
10481048
# CONFIG_LWIP_DHCP_DISABLE_CLIENT_ID is not set
10491049
# CONFIG_LWIP_DHCP_RESTORE_LAST_IP is not set
1050-
CONFIG_LWIP_DHCP_OPTIONS_LEN=68
1050+
CONFIG_LWIP_DHCP_OPTIONS_LEN=128
10511051

10521052
#
10531053
# DHCP server

Diff for: ‎tools/sdk/esp32s2/include/arduino_tinyusb/tinyusb/src/class/usbtmc/usbtmc_device.h

-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
/*
2-
* usbtmc_device.h
3-
*
4-
* Created on: Sep 10, 2019
5-
* Author: nconrad
6-
*/
71
/*
82
* The MIT License (MIT)
93
*

Diff for: ‎tools/sdk/esp32s2/include/arduino_tinyusb/tinyusb/src/class/video/video.h

+8
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,7 @@ TU_VERIFY_STATIC( sizeof(video_probe_and_commit_control_t) == 48, "size is not c
373373
#define TUD_VIDEO_DESC_CS_VC_LEN 12
374374
#define TUD_VIDEO_DESC_INPUT_TERM_LEN 8
375375
#define TUD_VIDEO_DESC_OUTPUT_TERM_LEN 9
376+
#define TUD_VIDEO_DESC_CAMERA_TERM_LEN 18
376377
#define TUD_VIDEO_DESC_STD_VS_LEN 9
377378
#define TUD_VIDEO_DESC_CS_VS_IN_LEN 13
378379
#define TUD_VIDEO_DESC_CS_VS_OUT_LEN 9
@@ -412,6 +413,13 @@ TU_VERIFY_STATIC( sizeof(video_probe_and_commit_control_t) == 48, "size is not c
412413
TUD_VIDEO_DESC_OUTPUT_TERM_LEN, TUSB_DESC_CS_INTERFACE, VIDEO_CS_ITF_VC_OUTPUT_TERMINAL, \
413414
_tid, U16_TO_U8S_LE(_tt), _at, _srcid, _stridx
414415

416+
/* 3.7.2.3 */
417+
#define TUD_VIDEO_DESC_CAMERA_TERM(_tid, _at, _stridx, _focal_min, _focal_max, _focal, _ctls) \
418+
TUD_VIDEO_DESC_CAMERA_TERM_LEN, TUSB_DESC_CS_INTERFACE, VIDEO_CS_ITF_VC_INPUT_TERMINAL, \
419+
_tid, U16_TO_U8S_LE(VIDEO_ITT_CAMERA), _at, _stridx, \
420+
U16_TO_U8S_LE(_focal_min), U16_TO_U8S_LE(_focal_max), U16_TO_U8S_LE(_focal), 3, \
421+
TU_U32_BYTE0(_ctls), TU_U32_BYTE1(_ctls), TU_U32_BYTE2(_ctls)
422+
415423
/* 3.9.1 */
416424
#define TUD_VIDEO_DESC_STD_VS(_itfnum, _alt, _epn, _stridx) \
417425
TUD_VIDEO_DESC_STD_VS_LEN, TUSB_DESC_INTERFACE, _itfnum, _alt, \

Diff for: ‎tools/sdk/esp32s2/include/arduino_tinyusb/tinyusb/src/common/tusb_common.h

+13-13
Original file line numberDiff line numberDiff line change
@@ -38,20 +38,21 @@
3838
#define TU_MIN(_x, _y) ( ( (_x) < (_y) ) ? (_x) : (_y) )
3939
#define TU_MAX(_x, _y) ( ( (_x) > (_y) ) ? (_x) : (_y) )
4040

41-
#define TU_U16_HIGH(_u16) ((uint8_t) (((_u16) >> 8) & 0x00ff))
42-
#define TU_U16_LOW(_u16) ((uint8_t) ((_u16) & 0x00ff))
43-
#define U16_TO_U8S_BE(_u16) TU_U16_HIGH(_u16), TU_U16_LOW(_u16)
44-
#define U16_TO_U8S_LE(_u16) TU_U16_LOW(_u16), TU_U16_HIGH(_u16)
41+
#define TU_U16_HIGH(_u16) ((uint8_t) (((_u16) >> 8) & 0x00ff))
42+
#define TU_U16_LOW(_u16) ((uint8_t) ((_u16) & 0x00ff))
43+
#define U16_TO_U8S_BE(_u16) TU_U16_HIGH(_u16), TU_U16_LOW(_u16)
44+
#define U16_TO_U8S_LE(_u16) TU_U16_LOW(_u16), TU_U16_HIGH(_u16)
4545

46-
#define TU_U32_BYTE3(_u32) ((uint8_t) ((((uint32_t) _u32) >> 24) & 0x000000ff)) // MSB
47-
#define TU_U32_BYTE2(_u32) ((uint8_t) ((((uint32_t) _u32) >> 16) & 0x000000ff))
48-
#define TU_U32_BYTE1(_u32) ((uint8_t) ((((uint32_t) _u32) >> 8) & 0x000000ff))
49-
#define TU_U32_BYTE0(_u32) ((uint8_t) (((uint32_t) _u32) & 0x000000ff)) // LSB
46+
#define TU_U32_BYTE3(_u32) ((uint8_t) ((((uint32_t) _u32) >> 24) & 0x000000ff)) // MSB
47+
#define TU_U32_BYTE2(_u32) ((uint8_t) ((((uint32_t) _u32) >> 16) & 0x000000ff))
48+
#define TU_U32_BYTE1(_u32) ((uint8_t) ((((uint32_t) _u32) >> 8) & 0x000000ff))
49+
#define TU_U32_BYTE0(_u32) ((uint8_t) (((uint32_t) _u32) & 0x000000ff)) // LSB
5050

51-
#define U32_TO_U8S_BE(_u32) TU_U32_BYTE3(_u32), TU_U32_BYTE2(_u32), TU_U32_BYTE1(_u32), TU_U32_BYTE0(_u32)
52-
#define U32_TO_U8S_LE(_u32) TU_U32_BYTE0(_u32), TU_U32_BYTE1(_u32), TU_U32_BYTE2(_u32), TU_U32_BYTE3(_u32)
51+
#define U32_TO_U8S_BE(_u32) TU_U32_BYTE3(_u32), TU_U32_BYTE2(_u32), TU_U32_BYTE1(_u32), TU_U32_BYTE0(_u32)
52+
#define U32_TO_U8S_LE(_u32) TU_U32_BYTE0(_u32), TU_U32_BYTE1(_u32), TU_U32_BYTE2(_u32), TU_U32_BYTE3(_u32)
5353

5454
#define TU_BIT(n) (1UL << (n))
55+
#define TU_GENMASK(h, l) ( (UINT32_MAX << (l)) & (UINT32_MAX >> (31 - (h))) )
5556

5657
//--------------------------------------------------------------------+
5758
// Includes
@@ -161,7 +162,6 @@ static inline uint8_t tu_log2(uint32_t value)
161162
#if TUP_ARCH_STRICT_ALIGN
162163

163164
// Rely on compiler to generate correct code for unaligned access
164-
165165
typedef struct { uint16_t val; } TU_ATTR_PACKED tu_unaligned_uint16_t;
166166
typedef struct { uint32_t val; } TU_ATTR_PACKED tu_unaligned_uint32_t;
167167

@@ -227,8 +227,8 @@ TU_ATTR_ALWAYS_INLINE static inline void tu_unaligned_write16(void* mem, uint16_
227227
#else
228228

229229
// MCU that could access unaligned memory natively
230-
TU_ATTR_ALWAYS_INLINE static inline uint32_t tu_unaligned_read32 (const void* mem ) { return *((uint32_t*) mem); }
231-
TU_ATTR_ALWAYS_INLINE static inline uint16_t tu_unaligned_read16 (const void* mem ) { return *((uint16_t*) mem); }
230+
TU_ATTR_ALWAYS_INLINE static inline uint32_t tu_unaligned_read32 (const void* mem) { return *((uint32_t const *) mem); }
231+
TU_ATTR_ALWAYS_INLINE static inline uint16_t tu_unaligned_read16 (const void* mem) { return *((uint16_t const *) mem); }
232232

233233
TU_ATTR_ALWAYS_INLINE static inline void tu_unaligned_write32 (void* mem, uint32_t value ) { *((uint32_t*) mem) = value; }
234234
TU_ATTR_ALWAYS_INLINE static inline void tu_unaligned_write16 (void* mem, uint16_t value ) { *((uint16_t*) mem) = value; }

Diff for: ‎tools/sdk/esp32s2/include/arduino_tinyusb/tinyusb/src/common/tusb_types.h

+16-19
Original file line numberDiff line numberDiff line change
@@ -349,32 +349,24 @@ TU_VERIFY_STATIC( sizeof(tusb_desc_interface_t) == 9, "size is not correct");
349349
/// USB Endpoint Descriptor
350350
typedef struct TU_ATTR_PACKED
351351
{
352-
uint8_t bLength ; ///< Size of this descriptor in bytes
353-
uint8_t bDescriptorType ; ///< ENDPOINT Descriptor Type
352+
uint8_t bLength ; // Size of this descriptor in bytes
353+
uint8_t bDescriptorType ; // ENDPOINT Descriptor Type
354354

355-
uint8_t bEndpointAddress ; ///< The address of the endpoint on the USB device described by this descriptor. The address is encoded as follows: \n Bit 3...0: The endpoint number \n Bit 6...4: Reserved, reset to zero \n Bit 7: Direction, ignored for control endpoints 0 = OUT endpoint 1 = IN endpoint.
355+
uint8_t bEndpointAddress ; // The address of the endpoint
356356

357357
struct TU_ATTR_PACKED {
358-
uint8_t xfer : 2;
359-
uint8_t sync : 2;
360-
uint8_t usage : 2;
358+
uint8_t xfer : 2; // Control, ISO, Bulk, Interrupt
359+
uint8_t sync : 2; // None, Asynchronous, Adaptive, Synchronous
360+
uint8_t usage : 2; // Data, Feedback, Implicit feedback
361361
uint8_t : 2;
362-
} bmAttributes ; ///< This field describes the endpoint's attributes when it is configured using the bConfigurationValue. \n Bits 1..0: Transfer Type \n- 00 = Control \n- 01 = Isochronous \n- 10 = Bulk \n- 11 = Interrupt \n If not an isochronous endpoint, bits 5..2 are reserved and must be set to zero. If isochronous, they are defined as follows: \n Bits 3..2: Synchronization Type \n- 00 = No Synchronization \n- 01 = Asynchronous \n- 10 = Adaptive \n- 11 = Synchronous \n Bits 5..4: Usage Type \n- 00 = Data endpoint \n- 01 = Feedback endpoint \n- 10 = Implicit feedback Data endpoint \n- 11 = Reserved \n Refer to Chapter 5 of USB 2.0 specification for more information. \n All other bits are reserved and must be reset to zero. Reserved bits must be ignored by the host.
362+
} bmAttributes;
363363

364-
struct TU_ATTR_PACKED {
365-
#if defined(__CCRX__)
366-
//FIXME the original defined bit field has a problem with the CCRX toolchain, so only a size field is defined
367-
uint16_t size;
368-
#else
369-
uint16_t size : 11; ///< Maximum packet size this endpoint is capable of sending or receiving when this configuration is selected. \n For isochronous endpoints, this value is used to reserve the bus time in the schedule, required for the per-(micro)frame data payloads. The pipe may, on an ongoing basis, actually use less bandwidth than that reserved. The device reports, if necessary, the actual bandwidth used via its normal, non-USB defined mechanisms. \n For all endpoints, bits 10..0 specify the maximum packet size (in bytes). \n For high-speed isochronous and interrupt endpoints: \n Bits 12..11 specify the number of additional transaction opportunities per microframe: \n- 00 = None (1 transaction per microframe) \n- 01 = 1 additional (2 per microframe) \n- 10 = 2 additional (3 per microframe) \n- 11 = Reserved \n Bits 15..13 are reserved and must be set to zero.
370-
uint16_t hs_period_mult : 2;
371-
uint16_t TU_RESERVED : 3;
372-
#endif
373-
}wMaxPacketSize;
374-
375-
uint8_t bInterval ; ///< Interval for polling endpoint for data transfers. Expressed in frames or microframes depending on the device operating speed (i.e., either 1 millisecond or 125 us units). \n- For full-/high-speed isochronous endpoints, this value must be in the range from 1 to 16. The bInterval value is used as the exponent for a \f$ 2^(bInterval-1) \f$ value; e.g., a bInterval of 4 means a period of 8 (\f$ 2^(4-1) \f$). \n- For full-/low-speed interrupt endpoints, the value of this field may be from 1 to 255. \n- For high-speed interrupt endpoints, the bInterval value is used as the exponent for a \f$ 2^(bInterval-1) \f$ value; e.g., a bInterval of 4 means a period of 8 (\f$ 2^(4-1) \f$) . This value must be from 1 to 16. \n- For high-speed bulk/control OUT endpoints, the bInterval must specify the maximum NAK rate of the endpoint. A value of 0 indicates the endpoint never NAKs. Other values indicate at most 1 NAK each bInterval number of microframes. This value must be in the range from 0 to 255. \n Refer to Chapter 5 of USB 2.0 specification for more information.
364+
uint16_t wMaxPacketSize ; // Bit 10..0 : max packet size, bit 12..11 additional transaction per highspeed micro-frame
365+
uint8_t bInterval ; // Polling interval, in frames or microframes depending on the operating speed
376366
} tusb_desc_endpoint_t;
377367

368+
TU_VERIFY_STATIC( sizeof(tusb_desc_endpoint_t) == 7, "size is not correct");
369+
378370
/// USB Other Speed Configuration Descriptor
379371
typedef struct TU_ATTR_PACKED
380372
{
@@ -521,6 +513,11 @@ static inline uint8_t tu_edpt_addr(uint8_t num, uint8_t dir)
521513
return (uint8_t)(num | (dir ? TUSB_DIR_IN_MASK : 0));
522514
}
523515

516+
static inline uint16_t tu_edpt_packet_size(tusb_desc_endpoint_t const* desc_ep)
517+
{
518+
return tu_le16toh(desc_ep->wMaxPacketSize) & TU_GENMASK(10, 0);
519+
}
520+
524521
//--------------------------------------------------------------------+
525522
// Descriptor helper
526523
//--------------------------------------------------------------------+

Diff for: ‎tools/sdk/esp32s2/include/config/sdkconfig.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@
294294
#define CONFIG_LWIP_GARP_TMR_INTERVAL 60
295295
#define CONFIG_LWIP_TCPIP_RECVMBOX_SIZE 32
296296
#define CONFIG_LWIP_DHCP_RESTORE_LAST_IP 1
297-
#define CONFIG_LWIP_DHCP_OPTIONS_LEN 68
297+
#define CONFIG_LWIP_DHCP_OPTIONS_LEN 128
298298
#define CONFIG_LWIP_DHCPS 1
299299
#define CONFIG_LWIP_DHCPS_LEASE_UNIT 60
300300
#define CONFIG_LWIP_DHCPS_MAX_STATION_NUM 8
@@ -575,5 +575,5 @@
575575
#define CONFIG_USB_MSC_BUFSIZE CONFIG_TINYUSB_MSC_BUFSIZE
576576
#define CONFIG_USB_MSC_ENABLED CONFIG_TINYUSB_MSC_ENABLED
577577
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
578-
#define CONFIG_ARDUINO_IDF_COMMIT "4e03a9c34c"
579-
#define CONFIG_ARDUINO_IDF_BRANCH "master"
578+
#define CONFIG_ARDUINO_IDF_COMMIT "2720d45e71"
579+
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

Diff for: ‎tools/sdk/esp32s2/lib/libapp_update.a

0 Bytes
Binary file not shown.

Diff for: ‎tools/sdk/esp32s2/lib/libarduino_tinyusb.a

-1.81 KB
Binary file not shown.

Diff for: ‎tools/sdk/esp32s2/lib/libesp_system.a

0 Bytes
Binary file not shown.

Diff for: ‎tools/sdk/esp32s2/lib/liblwip.a

-144 Bytes
Binary file not shown.

Diff for: ‎tools/sdk/esp32s2/sdkconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -880,7 +880,7 @@ CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32
880880
# CONFIG_LWIP_DHCP_DOES_ARP_CHECK is not set
881881
# CONFIG_LWIP_DHCP_DISABLE_CLIENT_ID is not set
882882
CONFIG_LWIP_DHCP_RESTORE_LAST_IP=y
883-
CONFIG_LWIP_DHCP_OPTIONS_LEN=68
883+
CONFIG_LWIP_DHCP_OPTIONS_LEN=128
884884

885885
#
886886
# DHCP server

0 commit comments

Comments
 (0)