Skip to content

Commit ac91c49

Browse files
authored
Merge pull request #2099 from fpistm/CMSIS_5.9.0
chore: update to CMSIS 5.9.0
2 parents c19744c + 451eda8 commit ac91c49

File tree

23 files changed

+27
-4714
lines changed

23 files changed

+27
-4714
lines changed

.github/actions/pio-build/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This action build thanks PIO.
66

77
### `cmsis-version`
88

9-
The CMSIS version to use. Default `"5.7.0"`.
9+
The CMSIS version to use. Default `"5.9.0"`.
1010

1111
## Example usage
1212

.github/actions/pio-build/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: 'Compile using PlatformIO'
44
inputs:
55
cmsis-version:
66
description: 'CMSIS package version to use'
7-
default: '5.7.0'
7+
default: '5.9.0'
88
runs:
99
using: 'docker'
1010
image: 'Dockerfile'

CI/update/stm32wrapper.py

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
all_ll_header_file_template = j2_env.get_template(all_ll_h_file)
5454
ll_h_file_template = j2_env.get_template(ll_h_file)
5555
c_file_template = j2_env.get_template(c_file)
56-
dsp_file_template = Template('#include "../Source/{{ dsp }}/{{ dsp }}.c"')
56+
dsp_file_template = Template('#include "../Source/{{ dsp_dir }}/{{ dsp_name }}"\n\n')
5757
stm32_def_build_template = j2_env.get_template(stm32_def_build_file)
5858
system_stm32_template = j2_env.get_template(system_stm32_file)
5959

@@ -279,19 +279,16 @@ def wrap(arg_core, arg_cmsis, log):
279279
else:
280280
# Delete all subfolders
281281
deleteFolder(CMSIS_DSP_outSrc_path / "*")
282-
dirlist = []
283282
for path_object in CMSIS_DSPSrc_path.glob("**/*"):
284283
if path_object.is_file():
285284
if path_object.name.endswith(".c"):
286-
dirlist.append(path_object.parent.name)
287-
dirlist = sorted(set(dirlist))
288-
for dn in dirlist:
289-
fdn = CMSIS_DSP_outSrc_path / dn
290-
if not fdn.is_dir():
291-
createFolder(fdn)
292-
out_file = open(fdn / (f"{dn}.c"), "w", newline="\n")
293-
all_ll_file.write(dsp_file_template.render(dsp_path=dn))
294-
out_file.close()
285+
dn = path_object.parent.name
286+
fn = path_object.name
287+
if dn in fn:
288+
fdn = CMSIS_DSP_outSrc_path / dn
289+
out_file = open(fdn / (f"{fn}"), "w", newline="\n")
290+
out_file.write(dsp_file_template.render(dsp_dir=dn, dsp_name=fn))
291+
out_file.close()
295292
return 0
296293

297294

boards.txt

Lines changed: 0 additions & 128 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy