feat: moved to CMSIS 6.2.0

Add new package CMSIS-DSP and CMSIS-NN.

Signed-off-by: Frederic Pillon <frederic.pillon@st.com>

Author: fpistm

CI/update/stm32wrapper.py

@@ -19,7 +19,9 @@
 system_path = ""
 
 # CMSIS outside of the core. Can be updated by arg
-CMSIS_path = core_path.parent / "ArduinoModule-CMSIS" / "CMSIS_5"
+# CMSIS_VERSION = "CMSIS_5"
+CMSIS_VERSION = "CMSIS_6"
+CMSIS_path = core_path.parent / "ArduinoModule-CMSIS" / CMSIS_VERSION
 CMSIS_DSPSrc_path = ""
 
 # Out sources files
@@ -82,7 +84,7 @@ def checkConfig(arg_core, arg_cmsis):
 
     if arg_core is not None:
         core_path = Path(arg_core).resolve()
-        CMSIS_path = core_path.parent / "ArduinoModule-CMSIS" / "CMSIS_5"
+        CMSIS_path = core_path.parent / "ArduinoModule-CMSIS" / CMSIS_VERSION
 
     if not core_path.is_dir():
         print(f"Could not find {core_path}")
@@ -103,7 +105,11 @@ def checkConfig(arg_core, arg_cmsis):
 
     if arg_cmsis is not None:
         CMSIS_path = Path(arg_cmsis).resolve()
-    CMSIS_DSPSrc_path = CMSIS_path / "CMSIS" / "DSP" / "Source"
+
+    if CMSIS_VERSION == "CMSIS_6":
+        CMSIS_DSPSrc_path = CMSIS_path / ".." / "CMSIS-DSP" / "Source"
+    else:
+        CMSIS_DSPSrc_path = CMSIS_path / "CMSIS" / "DSP" / "Source"
 
 
 def printCMSISStartup(log):
@@ -289,13 +295,16 @@ def wrap(arg_core, arg_cmsis, log):
         print("CMSIS DSP generation skipped.")
     else:
         # Delete all subfolders
-        deleteFolder(CMSIS_DSP_outSrc_path / "*")
+        for path_object in CMSIS_DSP_outSrc_path.glob("*"):
+            if path_object.is_dir():
+                deleteFolder(path_object)
         for path_object in CMSIS_DSPSrc_path.glob("**/*"):
             if path_object.is_file() and path_object.name.endswith(".c"):
                 dn = path_object.parent.name
                 fn = path_object.name
                 if dn in fn:
                     fdn = CMSIS_DSP_outSrc_path / dn
+                    createFolder(fdn)
                     with open(fdn / (f"{fn}"), "w", newline="\n") as out_file:
                         out_file.write(
                             dsp_file_template.render(dsp_dir=dn, dsp_name=fn)

libraries/CMSIS_DSP/src/WindowFunctions/WindowFunctions.c

@@ -0,0 +1 @@
+#include "../Source/WindowFunctions/WindowFunctions.c"

platform.txt

@@ -25,7 +25,9 @@ tools_bin_path.linux={runtime.tools.STM32Tools.path}/linux
 
 core_stm32_dir={build.core.path}/stm32
 hal_dir={build.system.path}/Drivers/{build.series}_HAL_Driver
-cmsis_dir={runtime.tools.CMSIS-5.9.0.path}/CMSIS
+cmsis_dir={runtime.tools.CMSIS-6.2.0.path}/CMSIS
+cmsis_dsp={runtime.tools.CMSIS_DSP-1.16.2.path}
+cmsis_nn={runtime.tools.CMSIS_NN-7.0.0.path}
 cmsis_dev_dir={build.system.path}/Drivers/CMSIS/Device/ST/{build.series}
 usbd_core_dir={build.system.path}/Middlewares/ST/STM32_USB_Device_Library/Core
 builtin_library_dir={build.core.path}/../../libraries
@@ -37,7 +39,7 @@ USBDevice_include_dir={builtin_library_dir}/USBDevice/inc
 # STM compile variables
 # ----------------------
 compiler.stm.extra_include="-I{build.source.path}" "-I{build.core.path}/avr" "-I{core_stm32_dir}" "-I{SrcWrapper_include_dir}" "-I{SrcWrapper_include_dir}/LL" "-I{hal_dir}/Inc" "-I{hal_dir}/Src" "-I{build.system.path}/{build.series}" "-I{USBDevice_include_dir}" "-I{usbd_core_dir}/Inc" "-I{usbd_core_dir}/Src" "-I{VirtIO_include_dir}" {build.virtio_extra_include}
-compiler.arm.cmsis.c.flags="-I{cmsis_dir}/Core/Include/" "-I{cmsis_dev_dir}/Include/" "-I{cmsis_dev_dir}/Source/Templates/gcc/" "-I{cmsis_dir}/DSP/Include" "-I{cmsis_dir}/DSP/PrivateInclude"
+compiler.arm.cmsis.c.flags="-I{cmsis_dir}/Core/Include/" "-I{cmsis_dev_dir}/Include/" "-I{cmsis_dev_dir}/Source/Templates/gcc/" "-I{cmsis_dsp}/Include" "-I{cmsis_dsp}/PrivateInclude"
 
 compiler.warning_flags=-w
 compiler.warning_flags.none=-w