Skip to content

Commit

Permalink
Merge pull request #2099 from fpistm/CMSIS_5.9.0
Browse files Browse the repository at this point in the history
chore: update to CMSIS 5.9.0
  • Loading branch information
fpistm authored Aug 10, 2023
2 parents c19744c + 451eda8 commit ac91c49
Show file tree
Hide file tree
Showing 23 changed files with 27 additions and 4,714 deletions.
2 changes: 1 addition & 1 deletion .github/actions/pio-build/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This action build thanks PIO.

### `cmsis-version`

The CMSIS version to use. Default `"5.7.0"`.
The CMSIS version to use. Default `"5.9.0"`.

## Example usage

Expand Down
2 changes: 1 addition & 1 deletion .github/actions/pio-build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description: 'Compile using PlatformIO'
inputs:
cmsis-version:
description: 'CMSIS package version to use'
default: '5.7.0'
default: '5.9.0'
runs:
using: 'docker'
image: 'Dockerfile'
Expand Down
19 changes: 8 additions & 11 deletions CI/update/stm32wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
all_ll_header_file_template = j2_env.get_template(all_ll_h_file)
ll_h_file_template = j2_env.get_template(ll_h_file)
c_file_template = j2_env.get_template(c_file)
dsp_file_template = Template('#include "../Source/{{ dsp }}/{{ dsp }}.c"')
dsp_file_template = Template('#include "../Source/{{ dsp_dir }}/{{ dsp_name }}"\n\n')
stm32_def_build_template = j2_env.get_template(stm32_def_build_file)
system_stm32_template = j2_env.get_template(system_stm32_file)

Expand Down Expand Up @@ -279,19 +279,16 @@ def wrap(arg_core, arg_cmsis, log):
else:
# Delete all subfolders
deleteFolder(CMSIS_DSP_outSrc_path / "*")
dirlist = []
for path_object in CMSIS_DSPSrc_path.glob("**/*"):
if path_object.is_file():
if path_object.name.endswith(".c"):
dirlist.append(path_object.parent.name)
dirlist = sorted(set(dirlist))
for dn in dirlist:
fdn = CMSIS_DSP_outSrc_path / dn
if not fdn.is_dir():
createFolder(fdn)
out_file = open(fdn / (f"{dn}.c"), "w", newline="\n")
all_ll_file.write(dsp_file_template.render(dsp_path=dn))
out_file.close()
dn = path_object.parent.name
fn = path_object.name
if dn in fn:
fdn = CMSIS_DSP_outSrc_path / dn
out_file = open(fdn / (f"{fn}"), "w", newline="\n")
out_file.write(dsp_file_template.render(dsp_dir=dn, dsp_name=fn))
out_file.close()
return 0


Expand Down
128 changes: 0 additions & 128 deletions boards.txt

Large diffs are not rendered by default.

Loading

0 comments on commit ac91c49

Please sign in to comment.