Skip to content

Commit 0672e77

Browse files
edholmes2232edholmes2232
committed
Merge branch 'development'
2 parents a4525a4 + 11da4b1 commit 0672e77

File tree

787 files changed

+151820
-4705
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

787 files changed

+151820
-4705
lines changed

‎.clang-format‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ CommentPragmas: '^\\s*\\/\\*\\*\\!'
2525
FixNamespaceComments: false
2626
IncludeBlocks: Regroup
2727
IndentCaseLabels: false
28-
IndentWidth: 4
28+
IndentWidth: 2
2929
IndentExternBlock: NoIndent
3030
NamespaceIndentation: None
3131
PenaltyReturnTypeOnItsOwnLine: 100

‎.clangd‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
CompileFlags:
2+
Add:
3+
- '-ferror-limit=0'
4+
- '-Wno-implicit-int'
5+
CompilationDatabase: build/Debug
6+
Diagnostics:
7+
Suppress:
8+
- unused-includes
9+
- unknown_typename
10+
- unknown_typename_suggest
11+
- typename_requires_specqual

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ Makefile
1616
*.ninja_deps
1717
compile_commands.json
1818

19+
.mxproject
20+
1921
# Executables and object files
2022
*.elf
2123
*.bin

‎.mxproject‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎.vscode/launch.json‎

Lines changed: 62 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,64 @@
11
{
2-
// Use IntelliSense to learn about possible attributes.
3-
// Hover to view descriptions of existing attributes.
4-
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5-
"version": "0.2.0",
6-
"configurations": [
7-
{
8-
"name": "Build & Debug Microcontroller - ST-Link",
9-
"cwd": "${workspaceFolder}",
10-
"type": "cortex-debug",
11-
"executable": "${command:cmake.launchTargetPath}",
12-
// Let CMake extension decide executable: "${command:cmake.launchTargetPath}"
13-
// Or fixed file path: "${workspaceFolder}/path/to/filename.elf"
14-
"request": "launch",
15-
"servertype": "stlink",
16-
"device": "STM32WB55RGVx", //MCU used
17-
"interface": "swd",
18-
"serialNumber": "", //Set ST-Link ID if you use multiple at the same time
19-
"runToEntryPoint": "main",
20-
"svdFile": "${config:STM32VSCodeExtension.cubeCLT.path}/STMicroelectronics_CMSIS_SVD/STM32WB55_CM4.svd",
21-
"v1": false, //Change it depending on ST Link version
22-
"serverpath": "${config:STM32VSCodeExtension.cubeCLT.path}/STLink-gdb-server/bin/ST-LINK_gdbserver",
23-
"stm32cubeprogrammer":"${config:STM32VSCodeExtension.cubeCLT.path}/STM32CubeProgrammer/bin",
24-
"stlinkPath": "${config:STM32VSCodeExtension.cubeCLT.path}/STLink-gdb-server/bin/ST-LINK_gdbserver",
25-
"armToolchainPath": "${config:STM32VSCodeExtension.cubeCLT.path}/GNU-tools-for-STM32/bin",
26-
"gdbPath":"${config:STM32VSCodeExtension.cubeCLT.path}/GNU-tools-for-STM32/bin/arm-none-eabi-gdb",
27-
"serverArgs": [
28-
"-m","0",
29-
],
30-
//"preLaunchTask": "Build + Flash"
31-
/* If you use external loader, add additional arguments */
32-
//"serverArgs": ["--extload", "path/to/ext/loader.stldr"],
33-
},
34-
{
35-
"name": "Attach to Microcontroller - ST-Link",
36-
"cwd": "${workspaceFolder}",
37-
"type": "cortex-debug",
38-
"executable": "${command:cmake.launchTargetPath}",
39-
// Let CMake extension decide executable: "${command:cmake.launchTargetPath}"
40-
// Or fixed file path: "${workspaceFolder}/path/to/filename.elf"
41-
"request": "attach",
42-
"servertype": "stlink",
43-
"device": "STM32WB55RGVx", //MCU used
44-
"interface": "swd",
45-
"serialNumber": "", //Set ST-Link ID if you use multiple at the same time
46-
"runToEntryPoint": "main",
47-
"svdFile": "${config:STM32VSCodeExtension.cubeCLT.path}/STMicroelectronics_CMSIS_SVD/STM32WB55_CM4.svd",
48-
"v1": false, //Change it depending on ST Link version
49-
"serverpath": "${config:STM32VSCodeExtension.cubeCLT.path}/STLink-gdb-server/bin/ST-LINK_gdbserver",
50-
"stm32cubeprogrammer":"${config:STM32VSCodeExtension.cubeCLT.path}/STM32CubeProgrammer/bin",
51-
"stlinkPath": "${config:STM32VSCodeExtension.cubeCLT.path}/STLink-gdb-server/bin/ST-LINK_gdbserver",
52-
"armToolchainPath": "${config:STM32VSCodeExtension.cubeCLT.path}/GNU-tools-for-STM32/bin",
53-
"gdbPath":"${config:STM32VSCodeExtension.cubeCLT.path}/GNU-tools-for-STM32/bin/arm-none-eabi-gdb",
54-
"serverArgs": [
55-
"-m","0",
56-
],
57-
/* If you use external loader, add additional arguments */
58-
//"serverArgs": ["--extload", "path/to/ext/loader.stldr"],
59-
}
60-
]
2+
// Use IntelliSense to learn about possible attributes.
3+
// Hover to view descriptions of existing attributes.
4+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5+
"version": "0.2.0",
6+
"configurations": [
7+
{
8+
"name": "Build & Debug Microcontroller - ST-Link",
9+
"cwd": "${workspaceFolder}",
10+
"type": "cortex-debug",
11+
// "executable": "${command:cmake.launchTargetPath}",
12+
"executable": "${workspaceFolder}/build/Debug/Speech2Touch.elf",
13+
// Let CMake extension decide executable: "${command:cmake.launchTargetPath}"
14+
// Or fixed file path: "${workspaceFolder}/path/to/filename.elf"
15+
"request": "launch",
16+
"servertype": "stlink",
17+
"device": "STM32WB55RGVx", //MCU used
18+
"interface": "swd",
19+
"serialNumber": "", //Set ST-Link ID if you use multiple at the same time
20+
"runToEntryPoint": "main",
21+
"svdFile": "${config:STM32VSCodeExtension.cubeCLT.path}/STMicroelectronics_CMSIS_SVD/STM32WB55_CM4.svd",
22+
"v1": false, //Change it depending on ST Link version
23+
"serverpath": "${config:STM32VSCodeExtension.cubeCLT.path}/STLink-gdb-server/bin/ST-LINK_gdbserver",
24+
"stm32cubeprogrammer": "${config:STM32VSCodeExtension.cubeCLT.path}/STM32CubeProgrammer/bin",
25+
"stlinkPath": "${config:STM32VSCodeExtension.cubeCLT.path}/STLink-gdb-server/bin/ST-LINK_gdbserver",
26+
"armToolchainPath": "${config:STM32VSCodeExtension.cubeCLT.path}/GNU-tools-for-STM32/bin",
27+
"gdbPath": "${config:STM32VSCodeExtension.cubeCLT.path}/GNU-tools-for-STM32/bin/arm-none-eabi-gdb",
28+
"serverArgs": [
29+
"-m",
30+
"0",
31+
],
32+
"preLaunchTask": "CMake Build Firmware",
33+
/* If you use external loader, add additional arguments */
34+
//"serverArgs": ["--extload", "path/to/ext/loader.stldr"],
35+
},
36+
{
37+
"name": "Attach to Microcontroller - ST-Link",
38+
"cwd": "${workspaceFolder}",
39+
"type": "cortex-debug",
40+
"executable": "${command:cmake.launchTargetPath}",
41+
// Let CMake extension decide executable: "${command:cmake.launchTargetPath}"
42+
// Or fixed file path: "${workspaceFolder}/path/to/filename.elf"
43+
"request": "attach",
44+
"servertype": "stlink",
45+
"device": "STM32WB55RGVx", //MCU used
46+
"interface": "swd",
47+
"serialNumber": "", //Set ST-Link ID if you use multiple at the same time
48+
"runToEntryPoint": "main",
49+
"svdFile": "${config:STM32VSCodeExtension.cubeCLT.path}/STMicroelectronics_CMSIS_SVD/STM32WB55_CM4.svd",
50+
"v1": false, //Change it depending on ST Link version
51+
"serverpath": "${config:STM32VSCodeExtension.cubeCLT.path}/STLink-gdb-server/bin/ST-LINK_gdbserver",
52+
"stm32cubeprogrammer": "${config:STM32VSCodeExtension.cubeCLT.path}/STM32CubeProgrammer/bin",
53+
"stlinkPath": "${config:STM32VSCodeExtension.cubeCLT.path}/STLink-gdb-server/bin/ST-LINK_gdbserver",
54+
"armToolchainPath": "${config:STM32VSCodeExtension.cubeCLT.path}/GNU-tools-for-STM32/bin",
55+
"gdbPath": "${config:STM32VSCodeExtension.cubeCLT.path}/GNU-tools-for-STM32/bin/arm-none-eabi-gdb",
56+
"serverArgs": [
57+
"-m",
58+
"0",
59+
],
60+
/* If you use external loader, add additional arguments */
61+
//"serverArgs": ["--extload", "path/to/ext/loader.stldr"],
62+
}
63+
]
6164
}

0 commit comments

Comments
 (0)