chore(pio): support new cmsis 6 version

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

Author: fpistm

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

@@ -6,7 +6,11 @@ This action build thanks PIO.
 
 ### `cmsis-version`
 
-The CMSIS version to use. Default `"5.9.0"`.
+The CMSIS version to use. Default `"6.2.0"`.
+
+### `cmsis_dsp-version`
+
+The CMSIS DSP version to use. Default `"1.16.2"`.
 
 ## Example usage
 

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

@@ -4,9 +4,13 @@ description: 'Compile using PlatformIO'
 inputs:
   cmsis-version:
     description: 'CMSIS package version to use'
-    default: '5.9.0'
+    default: '6.2.0'
+  cmsis_dsp-version:
+    description: 'CMSIS DSP package version to use'
+    default: '1.16.2'
 runs:
   using: 'docker'
   image: 'Dockerfile'
   args:
     - ${{ inputs.cmsis-version }}
+    - ${{ inputs.cmsis_dsp-version }}

.github/actions/pio-build/entrypoint.sh

@@ -2,6 +2,8 @@
 
 readonly CMSIS_VERSION="$1"
 readonly CMSIS_ARCHIVE="CMSIS-${CMSIS_VERSION}.tar.bz2"
+readonly CMSIS_DSP_VERSION="$2"
+readonly CMSIS_DSP_ARCHIVE="CMSIS_DSP-${CMSIS_DSP_VERSION}.tar.bz2"
 
 # Use python venv
 python3 -m venv "$HOME/venv"
@@ -11,14 +13,23 @@ python3 -m venv "$HOME/venv"
 python3 -m pip install --quiet --upgrade platformio
 
 # Install the development version of ststm32 platform
-platformio platform install "https://github.com/platformio/platform-ststm32.git" || {
+pio pkg install --platform "https://github.com/platformio/platform-ststm32.git" || {
   exit 1
 }
 # Prepare framework for CI
+# Modify platform.json to use local framework-arduinoststm32 package
 python3 -c "import json; import os; fp=open(os.path.expanduser('~/.platformio/platforms/ststm32/platform.json'), 'r+'); data=json.load(fp); data['packages']['framework-arduinoststm32']['version'] = '*'; del data['packages']['framework-arduinoststm32']['owner']; fp.seek(0); fp.truncate(); json.dump(data, fp); fp.close()" || {
   exit 1
 }
-
+# Modify platform.json to use local CMSIS package without owner and version restrictions
+python3 -c "import json; import os; fp=open(os.path.expanduser('~/.platformio/platforms/ststm32/platform.json'), 'r+'); data=json.load(fp); data['packages']['framework-cmsis']['version'] = '*'; del data['packages']['framework-cmsis']['owner']; fp.seek(0); fp.truncate(); json.dump(data, fp); fp.close()" || {
+  exit 1
+}
+# Add to platform.json the CMSIS DSP package
+python3 -c "import json; import os; fp=open(os.path.expanduser('~/.platformio/platforms/ststm32/platform.json'), 'r+'); data=json.load(fp); data['packages']['framework-cmsis_dsp'] = {'type': 'framework', 'optional': true, 'version': '*'}; fp.seek(0); fp.truncate(); json.dump(data, fp); fp.close()" || {
+  exit 1
+}
+# Create symbolic link to the framework-arduinoststm32 package pointing to the repository workspace
 ln --symbolic "$GITHUB_WORKSPACE" "$HOME/.platformio/packages/framework-arduinoststm32" || {
   exit 1
 }
@@ -29,6 +40,21 @@ wget --no-verbose "https://github.com/stm32duino/ArduinoModule-CMSIS/releases/do
 tar --extract --bzip2 --file="$CMSIS_ARCHIVE" || {
   exit 1
 }
+# Create symbolic link to the framework-cmsis package pointing to the unpacked CMSIS package
+ln --symbolic "$GITHUB_WORKSPACE/CMSIS-${CMSIS_VERSION}" "$HOME/.platformio/packages/framework-cmsis" || {
+  exit 1
+}
+# Download and unpack CMSIS DSP package
+wget --no-verbose "https://github.com/stm32duino/ArduinoModule-CMSIS/releases/download/$CMSIS_VERSION/$CMSIS_DSP_ARCHIVE" || {
+  exit 1
+}
+tar --extract --bzip2 --file="$CMSIS_DSP_ARCHIVE" || {
+  exit 1
+}
+# Create symbolic link to the framework-cmsis_dsp package pointing to the unpacked CMSIS DSP package
+ln --symbolic "$GITHUB_WORKSPACE/CMSIS_DSP-${CMSIS_DSP_VERSION}" "$HOME/.platformio/packages/framework-cmsis_dsp" || {
+  exit 1
+}
 cd "$GITHUB_WORKSPACE/CI/build/" || {
   exit 1
 }

tools/platformio/platformio-build.py

@@ -37,7 +37,12 @@
 CMSIS_DIR = join(platform.get_package_dir("framework-cmsis"), "CMSIS")
 assert isdir(FRAMEWORK_DIR)
 assert isdir(CMSIS_DIR)
-
+# check if cmsis DSP is available in CMSIS_DIR or in separate package
+if not isdir(join(CMSIS_DIR, "DSP")):
+    CMSIS_DSP_DIR = join(platform.get_package_dir("framework-cmsis_dsp"), "CMSIS_DSP")
+    assert isdir(CMSIS_DSP_DIR)
+else:
+    CMSIS_DSP_DIR = join(CMSIS_DIR, "DSP")
 
 mcu = board_config.get("build.mcu", "")
 mcu_type = mcu[:-2]
@@ -336,8 +341,8 @@ def get_arduino_board_id(board_config, mcu):
             "Templates",
             "gcc",
         ),
-        join(CMSIS_DIR, "DSP", "Include"),
-        join(CMSIS_DIR, "DSP", "PrivateInclude"),
+        join(CMSIS_DSP_DIR, "Include"),
+        join(CMSIS_DSP_DIR, "PrivateInclude"),
         join(FRAMEWORK_DIR, "cores", "arduino"),
     ],
     LINKFLAGS=machine_flags