Skip to content
Snippets Groups Projects
Commit 6d483d4d authored by Per Lindgren's avatar Per Lindgren
Browse files

fixed typos + launch to correct target

parent 3902b94d
No related branches found
No related tags found
No related merge requests found
{ {
// See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations. // See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp // Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
// List of extensions which should be recommended for users of this workspace. // List of extensions which should be recommended for users of this workspace.
"recommendations": [ "recommendations": [
"rust-lang.rust", "matklad.rust-analyzer",
"marus25.cortex-debug", "marus25.cortex-debug",
], ],
// List of extensions recommended by VS Code that should not be recommended for users of this workspace. // List of extensions recommended by VS Code that should not be recommended for users of this workspace.
"unwantedRecommendations": [ "unwantedRecommendations": []
]
} }
\ No newline at end of file
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
"interface/stlink-v2-1.cfg", "interface/stlink-v2-1.cfg",
"target/stm32f4x.cfg" "target/stm32f4x.cfg"
], ],
"executable": "./target/thumbv7m-none-eabi/debug/examples/${fileBasenameNoExtension}", "executable": "./target/thumbv7em-none-eabi/debug/examples/${fileBasenameNoExtension}",
"cpu": "cortex-m4", "cpu": "cortex-m4",
}, },
{ {
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
"interface/stlink-v2-1.cfg", "interface/stlink-v2-1.cfg",
"target/stm32f4x.cfg" "target/stm32f4x.cfg"
], ],
"executable": "./target/thumbv7m-none-eabi/release/examples/${fileBasenameNoExtension}", "executable": "./target/thumbv7em-none-eabi/release/examples/${fileBasenameNoExtension}",
"cpu": "cortex-m4", "cpu": "cortex-m4",
}, },
{ {
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
"interface/stlink-v2-1.cfg", "interface/stlink-v2-1.cfg",
"target/stm32f4x.cfg" "target/stm32f4x.cfg"
], ],
"executable": "./target/thumbv7m-none-eabi/release/examples/${fileBasenameNoExtension}", "executable": "./target/thumbv7em-none-eabi/release/examples/${fileBasenameNoExtension}",
"cpu": "cortex-m4", "cpu": "cortex-m4",
}, },
] ]
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"tasks": [ "tasks": [
{ {
"type": "cargo", "type": "cargo",
"command": "build --example ${fileBasenameNoExtension} --target thumbv7m-none-eabi", "command": "build --example ${fileBasenameNoExtension}",
"problemMatcher": [ "problemMatcher": [
"$rustc" "$rustc"
], ],
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
}, },
{ {
"type": "cargo", "type": "cargo",
"command": "build --example ${fileBasenameNoExtension} --release --target thumbv7m-none-eabi", "command": "build --example ${fileBasenameNoExtension} --release",
"problemMatcher": [ "problemMatcher": [
"$rustc" "$rustc"
], ],
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
}, },
{ {
"type": "cargo", "type": "cargo",
"command": "build --example ${fileBasenameNoExtension} --release --features nightly --target thumbv7m-none-eabi", "command": "build --example ${fileBasenameNoExtension} --release --features nightly",
"problemMatcher": [ "problemMatcher": [
"$rustc" "$rustc"
], ],
......
...@@ -248,7 +248,7 @@ const APP: () = { ...@@ -248,7 +248,7 @@ const APP: () = {
// //
// Give a rough estimate based on this info how long the complete task `uart1`, // Give a rough estimate based on this info how long the complete task `uart1`,
// would take to execute if written in FreeRTOS. (Include the context switch, to higher // would take to execute if written in FreeRTOS. (Include the context switch, to higher
// prio task, the mutex lock/unlock in both "threads".) // priority task, the mutex lock/unlock in both "threads".)
// //
// Motivate your answer (not just a number). // Motivate your answer (not just a number).
// //
......
...@@ -75,7 +75,7 @@ const APP: () = { ...@@ -75,7 +75,7 @@ const APP: () = {
// timing_task::APP::EXTI0 () at examples/timing_task.rs:11 // timing_task::APP::EXTI0 () at examples/timing_task.rs:11
// 11 #[rtic::app(device = stm32f411)] // 11 #[rtic::app(device = stm32f411)]
// //
// Since `exti0` has a default prio = 1, it will preempt `idle` (at prio = 0), // Since `exti0` has a default priority = 1, it will preempt `idle` (at priority = 0),
// and the debugger breaks in the `exti0` task. // and the debugger breaks in the `exti0` task.
// (Notice, RTIC translates logical priorities to hw priorities for you.) // (Notice, RTIC translates logical priorities to hw priorities for you.)
// //
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment