diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 5a6574be5ca85aa34740cc7fa0c1fec61bedcb90..c7761ab4992153540837be4bd84c72a6d3d6770c 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,14 +1,11 @@ { // See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations. // Extension identifier format: ${publisher}.${name}. Example: vscode.csharp - // List of extensions which should be recommended for users of this workspace. "recommendations": [ - "rust-lang.rust", + "matklad.rust-analyzer", "marus25.cortex-debug", ], // 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 diff --git a/.vscode/launch.json b/.vscode/launch.json index e353e7c06038970651569f87d501eebf68f0cf74..76e46ecb2f0192933eb32d97de22a5a9a6dfb5e2 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -22,7 +22,7 @@ "interface/stlink-v2-1.cfg", "target/stm32f4x.cfg" ], - "executable": "./target/thumbv7m-none-eabi/debug/examples/${fileBasenameNoExtension}", + "executable": "./target/thumbv7em-none-eabi/debug/examples/${fileBasenameNoExtension}", "cpu": "cortex-m4", }, { @@ -38,7 +38,7 @@ "interface/stlink-v2-1.cfg", "target/stm32f4x.cfg" ], - "executable": "./target/thumbv7m-none-eabi/release/examples/${fileBasenameNoExtension}", + "executable": "./target/thumbv7em-none-eabi/release/examples/${fileBasenameNoExtension}", "cpu": "cortex-m4", }, { @@ -54,7 +54,7 @@ "interface/stlink-v2-1.cfg", "target/stm32f4x.cfg" ], - "executable": "./target/thumbv7m-none-eabi/release/examples/${fileBasenameNoExtension}", + "executable": "./target/thumbv7em-none-eabi/release/examples/${fileBasenameNoExtension}", "cpu": "cortex-m4", }, ] diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 2f6aa72bafabd20ae7819d196f688b0818aca034..c8e3f535490d50427e3850834239ed4d600e3931 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -5,7 +5,7 @@ "tasks": [ { "type": "cargo", - "command": "build --example ${fileBasenameNoExtension} --target thumbv7m-none-eabi", + "command": "build --example ${fileBasenameNoExtension}", "problemMatcher": [ "$rustc" ], @@ -14,7 +14,7 @@ }, { "type": "cargo", - "command": "build --example ${fileBasenameNoExtension} --release --target thumbv7m-none-eabi", + "command": "build --example ${fileBasenameNoExtension} --release", "problemMatcher": [ "$rustc" ], @@ -23,7 +23,7 @@ }, { "type": "cargo", - "command": "build --example ${fileBasenameNoExtension} --release --features nightly --target thumbv7m-none-eabi", + "command": "build --example ${fileBasenameNoExtension} --release --features nightly", "problemMatcher": [ "$rustc" ], diff --git a/examples/timing_resources.rs b/examples/timing_resources.rs index acdff4b3c2544a96615e0e6bb8b9bc05b96cd012..f4b486273ef49b4172a20c56ba923056891b4ba5 100644 --- a/examples/timing_resources.rs +++ b/examples/timing_resources.rs @@ -248,7 +248,7 @@ const APP: () = { // // 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 -// 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). // diff --git a/examples/timing_task.rs b/examples/timing_task.rs index 811dca8b3f018f38d55862f458216d666c031c25..e972a8a8a960b562b166607a57afa04966b42eae 100644 --- a/examples/timing_task.rs +++ b/examples/timing_task.rs @@ -75,7 +75,7 @@ const APP: () = { // timing_task::APP::EXTI0 () at examples/timing_task.rs:11 // 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. // (Notice, RTIC translates logical priorities to hw priorities for you.) //