Skip to content

Commit 9063ede

Browse files
authored
Merge branch 'master' into nxp_k64
2 parents aa0fabd + 7bf5923 commit 9063ede

File tree

383 files changed

+10854
-3681
lines changed

Some content is hidden

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

383 files changed

+10854
-3681
lines changed

.codespellrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
[codespell]
33
# In the event of a false positive, add the problematic word, in all lowercase, to 'ignore-words.txt' (one word per line).
44
# Or copy & paste the whole problematic line to 'exclude-file.txt'
5-
ignore-words = .codespell/ignore-words.txt
6-
exclude-file = .codespell/exclude-file.txt
5+
ignore-words = tools/codespell/ignore-words.txt
6+
exclude-file = tools/codespell/exclude-file.txt
77
check-filenames =
88
check-hidden =
99
count =

.github/workflows/build_arm.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,10 @@ jobs:
3939
- 'lpc51 lpc54'
4040
- 'mm32 msp432e4'
4141
- 'nrf'
42-
- 'ra'
4342
- 'samd11 samd21'
4443
- 'samd51 same5x'
4544
- 'saml2x'
4645
- 'stm32f2 stm32f3'
47-
- 'stm32f4'
4846
- 'stm32l0 stm32u5 stm32wb'
4947
- 'tm4c123 xmc4000'
5048
steps:

.github/workflows/build_iar.yml

Lines changed: 3 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
# Alphabetical order
3333
# Note: bundle multiple families into a matrix since there is only one self-hosted instance can
3434
# run IAR build. Too many matrix can hurt due to setup/teardown overhead.
35-
- 'stm32f0 stm32f1 stm32f7 stm32g0 stm32g4 stm32h7 stm32l4'
35+
- 'lpc43 stm32f0 stm32f1 stm32f4 stm32f7 stm32g0 stm32g4 stm32h7 stm32l4'
3636
steps:
3737
- name: Clean workspace
3838
run: |
@@ -49,82 +49,6 @@ jobs:
4949
- name: Build
5050
run: python3 tools/build_cmake.py ${{ matrix.family }} -DTOOLCHAIN=iar -DCMAKE_BUILD_TYPE=MinSizeRel
5151

52-
# Upload binaries for hardware test with self-hosted
53-
- name: Prepare stm32l412nucleo Artifacts
54-
if: contains(matrix.family, 'stm32l4')
55-
working-directory: ${{github.workspace}}/cmake-build/cmake-build-stm32l412nucleo
52+
- name: Test on actual hardware (hardware in the loop)
5653
run: |
57-
find device/ -name "*.elf" -exec mv {} ../../ \;
58-
59-
- name: Upload Artifacts for stm32l412nucleo
60-
if: contains(matrix.family, 'stm32l4') && github.repository_owner == 'hathach'
61-
uses: actions/upload-artifact@v3
62-
with:
63-
name: stm32l4
64-
path: |
65-
*.elf
66-
67-
# ---------------------------------------
68-
# Hardware in the loop (HIL)
69-
# Current self-hosted instance is running on an EPYC 7232 server hosted by HiFiPhile user
70-
# - STM32L412 Nucleo with on-board jlink as ttyACM0
71-
# ---------------------------------------
72-
hw-stm32l412nucleo-test:
73-
needs: cmake
74-
runs-on: [self-hosted, Linux, X64, hifiphile]
75-
76-
steps:
77-
- name: Clean workspace
78-
run: |
79-
echo "Cleaning up previous run"
80-
rm -rf "${{ github.workspace }}"
81-
mkdir -p "${{ github.workspace }}"
82-
83-
- name: Download stm32l4 Artifacts
84-
uses: actions/download-artifact@v3
85-
with:
86-
name: stm32l4
87-
88-
- name: Create flash.sh
89-
run: |
90-
echo > flash.sh 'echo halt > flash.jlink'
91-
echo >> flash.sh 'echo r >> flash.jlink'
92-
echo >> flash.sh 'echo loadfile $1 >> flash.jlink'
93-
echo >> flash.sh 'echo r >> flash.jlink'
94-
echo >> flash.sh 'echo go >> flash.jlink'
95-
echo >> flash.sh 'echo exit >> flash.jlink'
96-
echo >> flash.sh 'cmdout=$(JLinkExe -device stm32l412kb -if swd -JTAGConf -1,-1 -speed auto -NoGui 1 -ExitOnError 1 -CommandFile flash.jlink)'
97-
echo >> flash.sh 'if (( $? )) ; then echo $cmdout ; fi'
98-
chmod +x flash.sh
99-
100-
- name: Test cdc_dual_ports
101-
run: |
102-
./flash.sh cdc_dual_ports.elf
103-
while (! ([ -e /dev/ttyACM1 ] && [ -e /dev/ttyACM2 ])) && [ $SECONDS -le 10 ]; do :; done
104-
test -e /dev/ttyACM1 && echo "ttyACM1 exists"
105-
test -e /dev/ttyACM2 && echo "ttyACM2 exists"
106-
107-
# Debian does not auto mount usb drive. skip this test for now
108-
- name: Test cdc_msc
109-
if: false
110-
run: |
111-
./flash.sh cdc_msc.elf
112-
readme='/media/pi/TinyUSB MSC/README.TXT'
113-
while (! ([ -e /dev/ttyACM1 ] && [ -f "$readme" ])) && [ $SECONDS -le 10 ]; do :; done
114-
test -e /dev/ttyACM1 && echo "ttyACM1 exists"
115-
test -f "$readme" && echo "$readme exists"
116-
cat "$readme"
117-
118-
- name: Test dfu
119-
run: |
120-
./flash.sh dfu.elf
121-
while (! (dfu-util -l | grep "Found DFU")) && [ $SECONDS -le 10 ]; do :; done
122-
dfu-util -d cafe -a 0 -U dfu0
123-
dfu-util -d cafe -a 1 -U dfu1
124-
grep "TinyUSB DFU! - Partition 0" dfu0
125-
grep "TinyUSB DFU! - Partition 1" dfu1
126-
127-
- name: Test dfu_runtime
128-
run: |
129-
./flash.sh dfu_runtime.elf
130-
while (! (dfu-util -l | grep "Found Runtime")) && [ $SECONDS -le 10 ]; do :; done
54+
python3 test/hil/hil_test.py hil_hfp.json

.github/workflows/cmake_arm.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,14 @@ jobs:
3535
# Alphabetical order
3636
- 'imxrt'
3737
- 'kinetis_kl'
38-
- 'lpc18'
38+
- 'lpc18 lpc40 lpc43'
3939
- 'lpc55'
4040
- 'mcx'
4141
- 'ra'
4242
- 'rp2040'
4343
- 'stm32f0'
4444
- 'stm32f1'
45+
- 'stm32f4'
4546
- 'stm32f7'
4647
- 'stm32g0'
4748
- 'stm32g4'

.idea/cmake.xml

Lines changed: 13 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations/kl25.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations/lpc1857.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations/lpc4088.xml

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations/mcx947.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations/nrf52840.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)