Skip to content

Commit cbf4b1a

Browse files
committed
Merge branch 'master' of https://github.com/hathach/tinyusb into pr1942
2 parents f8a21ff + 28817a7 commit cbf4b1a

File tree

861 files changed

+10380
-5932
lines changed

Some content is hidden

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

861 files changed

+10380
-5932
lines changed

.codespell/exclude-file.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-
return USB0.INTSTS1.BIT.ATTCH ? true : false;

.codespell/ignore-words.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,7 @@ fro
66
dout
77
mot
88
te
9+
attch
10+
endianess
11+
pris
12+
busses

.codespellrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ exclude-file = .codespell/exclude-file.txt
77
check-filenames =
88
check-hidden =
99
count =
10-
skip = .cproject,./.git,./hw/mcu,./lib,./examples/*/*/_build,./examples/*/*/ses,./examples/*/*/ozone,./hw/mcu,./test/unit-test/vendor,./tests_obsolete,./tools/uf2
10+
skip = *.rb,.cproject,.git,./lib,./examples/*/*/_build,./examples/*/*/ses,./examples/*/*/ozone,./hw/mcu,./tests_obsolete

.gitattributes

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Set the default behavior, in case people don't have core.autocrlf set.
22
* text=auto
33

4-
*.c text
5-
*.cpp text
4+
*.c text
5+
*.cpp text
66
*.h text
7-
*.icf text
7+
*.icf text
88
*.js text
99
*.json text
1010
*.ld text

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,21 +54,21 @@ body:
5454
Exact steps in chronological order, details should be specific e.g if you use a command/script to test with, please post it as well.
5555
1. Go to '...'
5656
2. Click on '....'
57-
3. See error
57+
3. See error
5858
validations:
5959
required: true
6060

6161
- type: textarea
6262
attributes:
63-
label: Debug Log as txt file
63+
label: Debug Log as txt file (LOG/CFG_TUSB_DEBUG=2)
6464
placeholder: |
6565
Attach your debug log txt file here, where the issue occurred, best with comments to explain the actual events.
66-
66+
6767
Note1: Please DO NOT paste your lengthy log contents here since it hurts the readability.
68-
Note2: To enable logging, add `LOG=3` to to the make command if building with stock examples or set `CFG_TUSB_DEBUG=3` in your tusb_config.h.
68+
Note2: To enable logging, add `LOG=2` to to the make command if building with stock examples or set `CFG_TUSB_DEBUG=2` in your tusb_config.h.
6969
More information can be found at [example's readme](https://github.com/hathach/tinyusb/blob/master/docs/getting_started.md)
7070
validations:
71-
required: false
71+
required: true
7272

7373
- type: textarea
7474
attributes:

.github/workflows/build_aarch64.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ jobs:
4242
- name: Checkout TinyUSB
4343
uses: actions/checkout@v3
4444

45-
- name: Checkout common submodules in lib
46-
run: git submodule update --init lib/FreeRTOS-Kernel lib/lwip lib/sct_neopixel
47-
4845
- name: Checkout hathach/linkermap
4946
uses: actions/checkout@v3
5047
with:
@@ -72,7 +69,7 @@ jobs:
7269
run: echo >> $GITHUB_PATH `echo ~/cache/toolchain/*/bin`
7370

7471
- name: Get Dependencies
75-
run: python3 tools/get_dependencies.py ${{ matrix.family }}
72+
run: python3 tools/get_family_deps.py ${{ matrix.family }}
7673

7774
- name: Build
7875
run: python3 tools/build_family.py ${{ matrix.family }}

.github/workflows/build_arm.yml

Lines changed: 22 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,21 @@ jobs:
3434
# Alphabetical order
3535
- 'broadcom_32bit'
3636
- 'imxrt'
37-
- 'lpc15 lpc18'
38-
- 'lpc54 lpc55'
37+
- 'kinetis_k32 kinetis_kl'
38+
- 'lpc11 lpc13 lpc15 lpc17 lpc18'
39+
- 'lpc51 lpc54 lpc55'
3940
- 'mm32 msp432e4'
4041
- 'nrf'
42+
- 'ra'
4143
- 'rp2040'
42-
- 'samd11'
43-
- 'samd21'
44-
- 'samd51'
44+
- 'samd11 samd21'
45+
- 'samd51 same5x'
4546
- 'saml2x'
46-
- 'stm32f0 stm32f1'
47+
- 'stm32f0 stm32f1 stm32f2 stm32f3'
4748
- 'stm32f4'
4849
- 'stm32f7'
49-
- 'stm32g4 stm32wb'
50-
- 'stm32h7'
51-
- 'stm32l4'
50+
- 'stm32g4 stm32h7'
51+
- 'stm32l0 stm32l4 stm32u5 stm32wb'
5252
- 'tm4c123 xmc4000'
5353
steps:
5454
- name: Setup Python
@@ -64,9 +64,6 @@ jobs:
6464
- name: Checkout TinyUSB
6565
uses: actions/checkout@v3
6666

67-
- name: Checkout common submodules in lib
68-
run: git submodule update --init lib/FreeRTOS-Kernel lib/lwip
69-
7067
- name: Checkout hathach/linkermap
7168
uses: actions/checkout@v3
7269
with:
@@ -80,7 +77,7 @@ jobs:
8077
echo >> $GITHUB_ENV PICO_SDK_PATH=~/pico-sdk
8178
8279
- name: Get Dependencies
83-
run: python3 tools/get_dependencies.py ${{ matrix.family }}
80+
run: python3 tools/get_family_deps.py ${{ matrix.family }}
8481

8582
- name: Build
8683
run: python3 tools/build_family.py ${{ matrix.family }}
@@ -97,58 +94,28 @@ jobs:
9794
# Upload binaries for rp2040/stm32l412nucleo hardware test with self-hosted
9895

9996
- name: Prepare rp2040 Artifacts
100-
if: matrix.family == 'rp2040' && github.repository_owner == 'hathach'
97+
if: contains(matrix.family, 'rp2040') && github.repository_owner == 'hathach'
10198
run: find examples/ -name "*.elf" -exec mv {} . \;
10299

103100
- name: Prepare stm32l412nucleo Artifacts
104-
if: matrix.family == 'stm32l4'
101+
if: contains(matrix.family, 'stm32l4')
105102
run: find examples/ -path "*stm32l412nucleo/*.elf" -exec mv {} . \;
106103

107-
- name: Upload Artifacts for hardware testing
108-
if: matrix.family == 'stm32l4' || (matrix.family == 'rp2040' && github.repository_owner == 'hathach')
104+
- name: Upload Artifacts for rp2040
105+
if: contains(matrix.family,'rp2040') && github.repository_owner == 'hathach'
109106
uses: actions/upload-artifact@v3
110107
with:
111-
name: ${{ matrix.family }}
108+
name: rp2040
112109
path: |
113110
*.elf
114111
115-
# ---------------------------------------
116-
# Build all no-family (orphaned) boards
117-
# disable this workflow since it is often failed randomly
118-
# ---------------------------------------
119-
build-board:
120-
runs-on: ubuntu-latest
121-
if: false
122-
strategy:
123-
fail-fast: false
124-
matrix:
125-
example:
126-
# Alphabetical order, a group of 4
127-
- 'device/audio_test device/board_test device/cdc_dual_ports device/cdc_msc'
128-
- 'device/cdc_msc_freertos device/dfu_runtime device/hid_composite device/hid_composite_freertos'
129-
- 'device/hid_generic_inout device/hid_multiple_interface device/midi_test device/msc_dual_lun'
130-
- 'device/net_lwip_webserver'
131-
- 'device/uac2_headset device/usbtmc device/webusb_serial host/cdc_msc_hid'
132-
133-
steps:
134-
- name: Setup Python
135-
uses: actions/setup-python@v4
136-
with:
137-
python-version: '3.x'
138-
139-
- name: Install ARM GCC
140-
uses: carlosperate/arm-none-eabi-gcc-action@v1
112+
- name: Upload Artifacts for stm32l412nucleo
113+
if: contains(matrix.family, 'stm32l4') && github.repository_owner == 'hathach'
114+
uses: actions/upload-artifact@v3
141115
with:
142-
release: '11.2-2022.02'
143-
144-
- name: Checkout TinyUSB
145-
uses: actions/checkout@v3
146-
147-
- name: Checkout common submodules in lib
148-
run: git submodule update --init lib/FreeRTOS-Kernel lib/lwip
149-
150-
- name: Build
151-
run: python3 tools/build_board.py ${{ matrix.example }}
116+
name: stm32l4
117+
path: |
118+
*.elf
152119
153120
# ---------------------------------------
154121
# Hardware in the loop (HIL)
@@ -274,4 +241,4 @@ jobs:
274241
- name: Test dfu_runtime
275242
run: |
276243
./flash.sh dfu_runtime.elf
277-
while (! (dfu-util -l | grep "Found Runtime")) && [ $SECONDS -le 10 ]; do :; done
244+
while (! (dfu-util -l | grep "Found Runtime")) && [ $SECONDS -le 10 ]; do :; done

.github/workflows/build_esp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
path: linkermap
5555

5656
- name: Build
57-
run: docker run --rm -v $PWD:/project -w /project espressif/idf:latest python3 tools/build_esp32sx.py ${{ matrix.board }}
57+
run: docker run --rm -v $PWD:/project -w /project espressif/idf:latest python3 tools/build_esp32.py ${{ matrix.board }}
5858

5959
- name: Linker Map
6060
run: |

.github/workflows/build_iar.yml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
family:
3131
# Alphabetical order
3232
# Note: bundle multiple families into a matrix since there is only one self-hosted instance can
33-
# run IAR build. Too many matrix can hurt due to setup/teardown overhead.
33+
# run IAR build. Too many matrix can hurt due to setup/teardown overhead.
3434
- 'stm32f0 stm32f1 stm32f4 stm32f7 stm32g4 stm32h7 stm32l4'
3535
steps:
3636
- name: Clean workspace
@@ -42,16 +42,8 @@ jobs:
4242
- name: Checkout TinyUSB
4343
uses: actions/checkout@v3
4444

45-
- name: Checkout submodules and dependencies
46-
run: |
47-
git submodule update --init lib/FreeRTOS-Kernel lib/lwip lib/sct_neopixel
48-
python3 tools/get_dependencies.py ${{ matrix.family }}
49-
50-
#- name: Checkout pico-sdk for rp2040
51-
# if: matrix.family == 'rp2040'
52-
# run: |
53-
# git clone --depth 1 -b develop https://github.com/raspberrypi/pico-sdk ~/pico-sdk
54-
# echo >> $GITHUB_ENV PICO_SDK_PATH=~/pico-sdk
45+
- name: Get Dependencies
46+
run: python3 tools/get_family_deps.py ${{ matrix.family }}
5547

5648
- name: Build
5749
run: python3 tools/build_family.py ${{ matrix.family }} CC=iccarm

.github/workflows/build_msp430.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ concurrency:
2121
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
2222
cancel-in-progress: true
2323

24-
jobs:
24+
jobs:
2525
build-msp430:
2626
runs-on: ubuntu-latest
2727
strategy:
@@ -40,9 +40,6 @@ jobs:
4040
- name: Checkout TinyUSB
4141
uses: actions/checkout@v3
4242

43-
- name: Checkout common submodules in lib
44-
run: git submodule update --init lib/FreeRTOS-Kernel lib/lwip
45-
4643
- name: Checkout hathach/linkermap
4744
uses: actions/checkout@v3
4845
with:
@@ -70,7 +67,7 @@ jobs:
7067
run: echo >> $GITHUB_PATH `echo ~/cache/toolchain/*/bin`
7168

7269
- name: Get Dependencies
73-
run: python3 tools/get_dependencies.py ${{ matrix.family }}
70+
run: python3 tools/get_family_deps.py ${{ matrix.family }}
7471

7572
- name: Build
7673
run: python3 tools/build_family.py ${{ matrix.family }}

0 commit comments

Comments
 (0)