From 7876d7349957c2ffb186e7e5604ec11576b9833e Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sat, 6 Nov 2021 02:18:43 +0100 Subject: [PATCH] updated vscode files --- .vscode/launch.json | 20 +++++++++++++++++--- .vscode/tasks.json | 16 ++++++++++++++-- va108xx-hal-rs | 2 +- va108xx-rs | 2 +- vorago-reb1-rs | 2 +- 5 files changed, 34 insertions(+), 8 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 21da3e5..f675e8c 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -7,14 +7,28 @@ { "type": "cortex-debug", "request": "launch", - "name": "Debug Minimal Blinky", + "name": "Debug PAC Blinky", "servertype": "jlink", "gdbPath": "/usr/bin/gdb-multiarch", "cwd": "${workspaceRoot}", "device": "VA10820", "svdFile": "./va108xx-rs/va108xx.svd", - "preLaunchTask": "rust: cargo build minimal blinky", - "executable": "${workspaceFolder}/target/thumbv6m-none-eabi/debug/examples/minimal-blinky", + "preLaunchTask": "rust: cargo build pac blinky", + "executable": "${workspaceFolder}/target/thumbv6m-none-eabi/debug/examples/blinky_pac", + "interface": "jtag", + "runToMain": true, + }, + { + "type": "cortex-debug", + "request": "launch", + "name": "Debug HAL Blinky", + "servertype": "jlink", + "gdbPath": "/usr/bin/gdb-multiarch", + "cwd": "${workspaceRoot}", + "device": "VA10820", + "svdFile": "./va108xx-rs/va108xx.svd", + "preLaunchTask": "rust: cargo build hal blinky", + "executable": "${workspaceFolder}/target/thumbv6m-none-eabi/debug/examples/blinky_hal", "interface": "jtag", "runToMain": true, }, diff --git a/.vscode/tasks.json b/.vscode/tasks.json index f352763..1dbc738 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -16,11 +16,23 @@ } }, { - "label": "rust: cargo build minimal blinky", + "label": "rust: cargo build pac blinky", "type": "shell", "command": "~/.cargo/bin/cargo", // note: full path to the cargo "args": [ - "build", "-p", "vorago-reb1", "--example", "minimal-blinky", + "build", "-p", "vorago-reb1", "--example", "blinky_pac", + ], + "group": { + "kind": "build", + "isDefault": true + } + }, + { + "label": "rust: cargo build hal blinky", + "type": "shell", + "command": "~/.cargo/bin/cargo", // note: full path to the cargo + "args": [ + "build", "-p", "vorago-reb1", "--example", "blinky_hal", ], "group": { "kind": "build", diff --git a/va108xx-hal-rs b/va108xx-hal-rs index a1a0e19..8208582 160000 --- a/va108xx-hal-rs +++ b/va108xx-hal-rs @@ -1 +1 @@ -Subproject commit a1a0e19d75744c85badeaac7a13c0d0be13655da +Subproject commit 8208582e8eb6699799c2eadc72d55d092925eded diff --git a/va108xx-rs b/va108xx-rs index 96df701..d978428 160000 --- a/va108xx-rs +++ b/va108xx-rs @@ -1 +1 @@ -Subproject commit 96df701b5f8ce2101348c6cc259ecf5e4ac01a18 +Subproject commit d9784284a843f20f31b581ea2d5dd2ba79566ca6 diff --git a/vorago-reb1-rs b/vorago-reb1-rs index b6027d6..3be4167 160000 --- a/vorago-reb1-rs +++ b/vorago-reb1-rs @@ -1 +1 @@ -Subproject commit b6027d65d80b8a93acc7875e17cb32371bd9341d +Subproject commit 3be416755c85a3fef0f03c11e7b703534fe6ecfa