Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 32 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
21 changes: 0 additions & 21 deletions .vscode/tasks.json

This file was deleted.

2 changes: 1 addition & 1 deletion Project/RTE/CMSIS/RTX_Config.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*
* -----------------------------------------------------------------------------
*
* $Revision: V5.6.0
* $Revision: V5.6.1
*
* Project: CMSIS-RTOS RTX
* Title: RTX Configuration definitions
Expand Down
Original file line number Diff line number Diff line change
@@ -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
*
Expand All @@ -17,7 +17,7 @@
*
* -----------------------------------------------------------------------------
*
* $Revision: V5.6.0
* $Revision: V5.6.1
*
* Project: CMSIS-RTOS RTX
* Title: RTX Configuration definitions
Expand Down Expand Up @@ -228,9 +228,9 @@
// <o>Default Processor mode for Thread execution
// <0=> Unprivileged mode
// <1=> Privileged mode
// <i> Default: Unprivileged mode
// <i> Default: Privileged mode
#ifndef OS_PRIVILEGE_MODE
#define OS_PRIVILEGE_MODE 0
#define OS_PRIVILEGE_MODE 1
#endif

// </h>
Expand Down
25 changes: 17 additions & 8 deletions get_started.csolution.yml
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -11,19 +11,28 @@ 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

- type: release
optimize: balanced
debug: off

# List related projects.
projects:
- project: Project/Project.cproject.yml
- project: Project/Project.cproject.yml
14 changes: 6 additions & 8 deletions vcpkg-configuration.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
Loading