From bc7ee5bb4b31532fbba226f3882d781d245a3a81 Mon Sep 17 00:00:00 2001 From: Hans Schneebauer Date: Thu, 28 May 2026 14:13:26 +0200 Subject: [PATCH] Updated to latest tool versions --- .gitignore | 40 +++++++++++++++---- .vscode/tasks.json | 21 ---------- Project/RTE/CMSIS/RTX_Config.h | 2 +- ...g.h.base@5.6.0 => RTX_Config.h.base@5.6.1} | 8 ++-- get_started.csolution.yml | 25 ++++++++---- vcpkg-configuration.json | 14 +++---- 6 files changed, 60 insertions(+), 50 deletions(-) delete mode 100644 .vscode/tasks.json rename Project/RTE/CMSIS/{RTX_Config.h.base@5.6.0 => RTX_Config.h.base@5.6.1} (99%) diff --git a/.gitignore b/.gitignore index 1dd0d91..0d41f89 100644 --- a/.gitignore +++ b/.gitignore @@ -54,17 +54,41 @@ dkms.conf # Clangd .clangd -# uv2csolution +# uv2csolution generated log file uv2csolution.log -# Csolution Output Files -tmp -out -*.cprj +# CMSIS Solution files and folders not to be tracked +# generated RTE files +**/RTE/_*/RTE_Components.h +**/RTE/_*/Pre_Include_*.h + +# default directory of build artifacts +**/out +# directory containing intermediate files to be regenerated +**/tmp + +# Update config files must be merged before commit +*.update@* + +# cbuild output files *.cbuild.yml *.cbuild-idx.yml +*.cbuild-run.yml *.cbuild-set.yml -*.cbuild-pack.yml -# Misc -.DS_Store +# .vscode JSON and debug adapter files generated by CMSIS Solution +.vscode/cmsis.json +.vscode/launch.json +.vscode/tasks.json +.vscode/settings.json +.cmd.jlink + +# legacy intermediate project file +*.cprj + +# SDS files +*.[sS][dD][sS] + +# FVP model generated files when using with SDS +**/__pycache__/ +sdsio.log diff --git a/.vscode/tasks.json b/.vscode/tasks.json deleted file mode 100644 index 9a4621d..0000000 --- a/.vscode/tasks.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "2.0.0", - "tasks": [ - { - "type": "virtual-hardware.run", - "program": "${command:virtual-hardware.getBinaryFile}", - "model": "${command:virtual-hardware.getModel}", - "problemMatcher": [], - "label": "virtual-hardware.run: Run Program" - }, - { - "label": "Start µVision Debugger", - "type": "process", - "command": "${env:LOCALAPPDATA}\\Keil_v5\\UV4\\UV4.exe", - "args": [ - "${command:cmsis-csolution.getSolutionPath}" - ], - "problemMatcher": [] - } - ] -} \ No newline at end of file diff --git a/Project/RTE/CMSIS/RTX_Config.h b/Project/RTE/CMSIS/RTX_Config.h index fe0c57b..8b95d02 100755 --- a/Project/RTE/CMSIS/RTX_Config.h +++ b/Project/RTE/CMSIS/RTX_Config.h @@ -17,7 +17,7 @@ * * ----------------------------------------------------------------------------- * - * $Revision: V5.6.0 + * $Revision: V5.6.1 * * Project: CMSIS-RTOS RTX * Title: RTX Configuration definitions diff --git a/Project/RTE/CMSIS/RTX_Config.h.base@5.6.0 b/Project/RTE/CMSIS/RTX_Config.h.base@5.6.1 similarity index 99% rename from Project/RTE/CMSIS/RTX_Config.h.base@5.6.0 rename to Project/RTE/CMSIS/RTX_Config.h.base@5.6.1 index fe0c57b..f8756c5 100644 --- a/Project/RTE/CMSIS/RTX_Config.h.base@5.6.0 +++ b/Project/RTE/CMSIS/RTX_Config.h.base@5.6.1 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2023 Arm Limited. All rights reserved. + * Copyright (c) 2013-2026 Arm Limited. All rights reserved. * * SPDX-License-Identifier: Apache-2.0 * @@ -17,7 +17,7 @@ * * ----------------------------------------------------------------------------- * - * $Revision: V5.6.0 + * $Revision: V5.6.1 * * Project: CMSIS-RTOS RTX * Title: RTX Configuration definitions @@ -228,9 +228,9 @@ // Default Processor mode for Thread execution // <0=> Unprivileged mode // <1=> Privileged mode -// Default: Unprivileged mode +// Default: Privileged mode #ifndef OS_PRIVILEGE_MODE -#define OS_PRIVILEGE_MODE 0 +#define OS_PRIVILEGE_MODE 1 #endif // diff --git a/get_started.csolution.yml b/get_started.csolution.yml index 6d6869b..f36d889 100644 --- a/get_started.csolution.yml +++ b/get_started.csolution.yml @@ -1,6 +1,6 @@ # A solution is a collection of related projects that share same base configuration. solution: - created-for: CMSIS-Toolbox@2.4.0 + created-for: CMSIS-Toolbox@2.12.0 cdefault: compiler: AC6 @@ -11,11 +11,20 @@ solution: - pack: Arm-Packs::Unity target-types: - - type: avh # runs on Arm Virtual Hardware - device: ARMCM3 - # add more hardware targets (don't forget to add the required packs) - - build-types: # defines toolchain options for 'debug' and 'release' + - type: avh # runs on Arm Virtual Hardware + device: ARMCM3 # add more hardware targets (don't forget to add the required packs) + target-set: + - set: + images: + - project-context: Project.debug + debugger: + name: Arm-FVP + model: FVP_MPS2_Cortex-M3 + config-file: Project/fvp_config.txt + args: --simlimit 10 + + build-types: + # defines toolchain options for 'debug' and 'release' - type: debug optimize: debug debug: on @@ -23,7 +32,7 @@ solution: - type: release optimize: balanced debug: off - + # List related projects. projects: - - project: Project/Project.cproject.yml \ No newline at end of file + - project: Project/Project.cproject.yml diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json index 010a1e2..9c98985 100644 --- a/vcpkg-configuration.json +++ b/vcpkg-configuration.json @@ -7,12 +7,10 @@ } ], "requires": { - "arm:tools/open-cmsis-pack/cmsis-toolbox": "2.4.0", - "arm:tools/kitware/cmake": "^3.31.5", - "arm:tools/ninja-build/ninja": "1.12.0", - "arm:compilers/arm/armclang": "6.22.0", - "arm:compilers/arm/arm-none-eabi-gcc": "^14.2.1", - "arm:models/arm/avh-fvp": "^11.31.28", - "arm:debuggers/arm/armdbg": "6.1.2" + "arm:tools/open-cmsis-pack/cmsis-toolbox": "^2.14.1", + "arm:tools/kitware/cmake": "^4.2.1", + "arm:tools/ninja-build/ninja": "^1.13.2", + "arm:compilers/arm/armclang": "6.24.0", + "arm:models/arm/avh-fvp": "^11.31.28" } -} +} \ No newline at end of file