Skip to content

IDF master #5479

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.

Sign up for GitHub

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

Merged
merged 31 commits into from
Oct 1, 2021
Merged

IDF master #5479

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
505926c
IDF master 58022f859
me-no-dev Jul 29, 2021
0174bf2
IDF master 606557b48
me-no-dev Aug 4, 2021
c8a8313
IDF master 8131d6f46
me-no-dev Aug 5, 2021
5b04b60
IDF master 59aa60d52
me-no-dev Aug 6, 2021
5614564
IDF master 83956ebba
me-no-dev Aug 7, 2021
a7fd5f6
IDF master 83956ebbae
me-no-dev Aug 10, 2021
0d5a12f
IDF master b1c3ee71c5
me-no-dev Aug 12, 2021
29cd5cd
IDF master 2c49af9e75
me-no-dev Aug 12, 2021
fa81335
IDF master eb1a66e7c9
me-no-dev Aug 13, 2021
dc0ff8c
IDF master a20df743f1
me-no-dev Aug 13, 2021
9ced459
Fix build compilation due to changes in the HW_TIMER's structs
me-no-dev Aug 30, 2021
249a3e2
Merge branch 'master' into idf-master
me-no-dev Aug 30, 2021
82404b0
Fix compilation warnings and errors with USB
me-no-dev Aug 30, 2021
c6ff727
Update USBCDC.cpp
me-no-dev Aug 30, 2021
f5fee39
Update CMakeLists.txt
me-no-dev Aug 30, 2021
9afc0bd
IDF master b63ec47238
me-no-dev Aug 30, 2021
b05f3f5
Update libarduino_tinyusb.a
me-no-dev Aug 30, 2021
6c72afd
Merge branch 'master' into idf-master
me-no-dev Aug 31, 2021
0101877
Update HWCDC.cpp
me-no-dev Aug 31, 2021
6ed9294
IDF master 5f38b766a8
me-no-dev Sep 1, 2021
b3c651c
IDF master b1f851b8f8
me-no-dev Sep 1, 2021
5641a10
IDF master 61299f879e
me-no-dev Sep 2, 2021
b95f200
IDF master c8aab00fdb
me-no-dev Sep 3, 2021
9896bba
IDF master d5f58ab135
me-no-dev Sep 4, 2021
70293c4
IDF master 316988bd2d
me-no-dev Sep 6, 2021
ffab067
IDF master dd491ee851
me-no-dev Sep 8, 2021
d771914
IDF master 220590d599
me-no-dev Sep 10, 2021
f3b27f3
Merge branch 'master' into idf-master
me-no-dev Sep 15, 2021
19b3c51
IDF master 23a03a3bdb
me-no-dev Sep 24, 2021
94f518a
IDF master 3e370c4296
me-no-dev Sep 25, 2021
94b818b
Merge branch 'master' into idf-master
me-no-dev Oct 1, 2021
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
Prev Previous commit
Next Next commit
IDF master 3e370c4296
  • Loading branch information
@me-no-dev
me-no-dev committed Sep 25, 2021
commit 94f518a28a5f13db0e4e1902b606cd8813514b7f
6 changes: 3 additions & 3 deletions platform.txt
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tools/platformio-build-esp32.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@
"UNITY_INCLUDE_CONFIG_H",
"WITH_POSIX",
"_GNU_SOURCE",
("IDF_VER", '\\"v4.4-dev-3224-g23a03a3bdb\\"'),
("IDF_VER", '\\"v4.4-dev-3235-g3e370c4296\\"'),
"ESP_PLATFORM",
"ARDUINO_ARCH_ESP32",
"ESP32",
Expand Down
2 changes: 1 addition & 1 deletion tools/platformio-build-esp32c3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@
"UNITY_INCLUDE_CONFIG_H",
"WITH_POSIX",
"_GNU_SOURCE",
("IDF_VER", '\\"v4.4-dev-3224-g23a03a3bdb\\"'),
("IDF_VER", '\\"v4.4-dev-3235-g3e370c4296\\"'),
"ESP_PLATFORM",
"ARDUINO_ARCH_ESP32",
"ESP32",
Expand Down
2 changes: 1 addition & 1 deletion tools/platformio-build-esp32s2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@
"UNITY_INCLUDE_CONFIG_H",
"WITH_POSIX",
"_GNU_SOURCE",
("IDF_VER", '\\"v4.4-dev-3224-g23a03a3bdb\\"'),
("IDF_VER", '\\"v4.4-dev-3235-g3e370c4296\\"'),
"ESP_PLATFORM",
"ARDUINO_ARCH_ESP32",
"ESP32",
Expand Down
2 changes: 1 addition & 1 deletion tools/sdk/esp32/include/config/sdkconfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,5 +675,5 @@
#define CONFIG_ULP_COPROC_ENABLED CONFIG_ESP32_ULP_COPROC_ENABLED
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
#define CONFIG_ARDUINO_IDF_COMMIT "23a03a3bdb"
#define CONFIG_ARDUINO_IDF_COMMIT "3e370c4296"
#define CONFIG_ARDUINO_IDF_BRANCH "master"
Binary file modified tools/sdk/esp32/ld/libbtdm_app.a
View file
Open in desktop
Binary file not shown.
Binary file modified tools/sdk/esp32/lib/libapp_update.a
View file
Open in desktop
Binary file not shown.
Binary file modified tools/sdk/esp32/lib/libesp_system.a
View file
Open in desktop
Binary file not shown.
Binary file modified tools/sdk/esp32c3/bin/bootloader_dio_40m.bin
View file
Open in desktop
Binary file not shown.
Binary file modified tools/sdk/esp32c3/bin/bootloader_dio_80m.bin
View file
Open in desktop
Binary file not shown.
Binary file modified tools/sdk/esp32c3/bin/bootloader_dout_40m.bin
View file
Open in desktop
Binary file not shown.
Binary file modified tools/sdk/esp32c3/bin/bootloader_dout_80m.bin
View file
Open in desktop
Binary file not shown.
Binary file modified tools/sdk/esp32c3/bin/bootloader_qio_40m.bin
View file
Open in desktop
Binary file not shown.
Binary file modified tools/sdk/esp32c3/bin/bootloader_qio_80m.bin
View file
Open in desktop
Binary file not shown.
Binary file modified tools/sdk/esp32c3/bin/bootloader_qout_40m.bin
View file
Open in desktop
Binary file not shown.
Binary file modified tools/sdk/esp32c3/bin/bootloader_qout_80m.bin
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion tools/sdk/esp32c3/include/config/sdkconfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,5 +622,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 "23a03a3bdb"
#define CONFIG_ARDUINO_IDF_COMMIT "3e370c4296"
#define CONFIG_ARDUINO_IDF_BRANCH "master"
2 changes: 1 addition & 1 deletion tools/sdk/esp32c3/ld/sections.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,8 +311,8 @@ SECTIONS
_bss_start = ABSOLUTE(.);

*(.bss .bss.*)
*(.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)
*(.ext_ram.bss .ext_ram.bss.*)
*(COMMON)
_bt_bss_start = ABSOLUTE(.);
*libbt.a:(.bss .bss.* COMMON)
Expand Down
Binary file modified tools/sdk/esp32c3/lib/libapp_update.a
View file
Open in desktop
Binary file not shown.
Binary file modified tools/sdk/esp32c3/lib/libesp_system.a
View file
Open in desktop
Binary file not shown.
3 changes: 3 additions & 0 deletions tools/sdk/esp32s2/include/arduino_tinyusb/tinyusb/src/common/tusb_compiler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#ifndef _TUSB_COMPILER_H_
#define _TUSB_COMPILER_H_

#define TU_TOKEN(x) x
#define TU_STRING(x) #x ///< stringify without expand
#define TU_XSTRING(x) TU_STRING(x) ///< expand then stringify

Expand All @@ -41,6 +42,8 @@
#define TU_XSTRCAT(a, b) TU_STRCAT(a, b) ///< expand then concat
#define TU_XSTRCAT3(a, b, c) TU_STRCAT3(a, b, c) ///< expand then concat 3 tokens

#define TU_INCLUDE_PATH(_dir,_file) TU_XSTRING( TU_TOKEN(_dir)TU_TOKEN(_file) )

#if defined __COUNTER__ && __COUNTER__ != __COUNTER__
#define _TU_COUNTER_ __COUNTER__
#else
Expand Down
8 changes: 4 additions & 4 deletions tools/sdk/esp32s2/include/arduino_tinyusb/tinyusb/src/osal/osal_freertos.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
#define _TUSB_OSAL_FREERTOS_H_

// FreeRTOS Headers
#include "FreeRTOS.h"
#include "semphr.h"
#include "queue.h"
#include "task.h"
#include TU_INCLUDE_PATH(CFG_TUSB_OS_INC_PATH,FreeRTOS.h)
#include TU_INCLUDE_PATH(CFG_TUSB_OS_INC_PATH,semphr.h)
#include TU_INCLUDE_PATH(CFG_TUSB_OS_INC_PATH,queue.h)
#include TU_INCLUDE_PATH(CFG_TUSB_OS_INC_PATH,task.h)

#ifdef __cplusplus
extern "C" {
Expand Down
6 changes: 6 additions & 0 deletions tools/sdk/esp32s2/include/arduino_tinyusb/tinyusb/src/tusb_option.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,14 +203,20 @@
#define CFG_TUSB_MEM_SECTION
#endif

// alignment requirement of buffer used for endpoint transferring
#ifndef CFG_TUSB_MEM_ALIGN
#define CFG_TUSB_MEM_ALIGN TU_ATTR_ALIGNED(4)
#endif

// OS selection
#ifndef CFG_TUSB_OS
#define CFG_TUSB_OS OPT_OS_NONE
#endif

#ifndef CFG_TUSB_OS_INC_PATH
#define CFG_TUSB_OS_INC_PATH
#endif

//--------------------------------------------------------------------
// DEVICE OPTIONS
//--------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion tools/sdk/esp32s2/include/config/sdkconfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,5 +575,5 @@
#define CONFIG_USB_MSC_BUFSIZE CONFIG_TINYUSB_MSC_BUFSIZE
#define CONFIG_USB_MSC_ENABLED CONFIG_TINYUSB_MSC_ENABLED
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
#define CONFIG_ARDUINO_IDF_COMMIT "23a03a3bdb"
#define CONFIG_ARDUINO_IDF_COMMIT "3e370c4296"
#define CONFIG_ARDUINO_IDF_BRANCH "master"
2 changes: 1 addition & 1 deletion tools/sdk/esp32s2/ld/sections.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,8 +371,8 @@ SECTIONS
*(.ext_ram.bss*)

*(.bss .bss.*)
*(.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)
*(.ext_ram.bss .ext_ram.bss.*)
*(COMMON)
_bt_bss_start = ABSOLUTE(.);
*libbt.a:(.bss .bss.* COMMON)
Expand Down
Binary file modified tools/sdk/esp32s2/lib/libapp_update.a
View file
Open in desktop
Binary file not shown.
Binary file modified tools/sdk/esp32s2/lib/libarduino_tinyusb.a
View file
Open in desktop
Binary file not shown.
Binary file modified tools/sdk/esp32s2/lib/libesp_system.a
View file
Open in desktop
Binary file not shown.