From 421b759bb914b14c085870c3c310d5d32159b698 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sun, 7 Nov 2021 15:52:42 +0100 Subject: [PATCH] cleaned up blinky tasks --- .vscode/launch.json | 20 +++----------------- .vscode/tasks.json | 16 ++-------------- va108xx-hal-rs | 2 +- vorago-reb1-rs | 2 +- 4 files changed, 7 insertions(+), 33 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 98a8eec..7582fd0 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -7,28 +7,14 @@ { "type": "cortex-debug", "request": "launch", - "name": "Debug PAC Blinky", + "name": "Debug LED Blinky", "servertype": "jlink", "gdbPath": "/usr/bin/gdb-multiarch", "cwd": "${workspaceRoot}", "device": "VA10820", "svdFile": "./va108xx-rs/svd/va108xx-base.svd.patched", - "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/svd/va108xx-base.svd.patched", - "preLaunchTask": "rust: cargo build hal blinky", - "executable": "${workspaceFolder}/target/thumbv6m-none-eabi/debug/examples/blinky-hal", + "preLaunchTask": "rust: cargo build led blinky", + "executable": "${workspaceFolder}/target/thumbv6m-none-eabi/debug/examples/blinky-leds", "interface": "jtag", "runToMain": true, }, diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 155c4d9..a085b9d 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -16,23 +16,11 @@ } }, { - "label": "rust: cargo build pac blinky", + "label": "rust: cargo build led blinky", "type": "shell", "command": "~/.cargo/bin/cargo", // note: full path to the cargo "args": [ - "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", + "build", "-p", "vorago-reb1", "--example", "blinky-leds", ], "group": { "kind": "build", diff --git a/va108xx-hal-rs b/va108xx-hal-rs index fd0def7..669fc1a 160000 --- a/va108xx-hal-rs +++ b/va108xx-hal-rs @@ -1 +1 @@ -Subproject commit fd0def7212b43feab7ee23527b39463ee5d08105 +Subproject commit 669fc1a104d4c3f8f860d1cb9e4439026a8be4c8 diff --git a/vorago-reb1-rs b/vorago-reb1-rs index c064788..2956bf6 160000 --- a/vorago-reb1-rs +++ b/vorago-reb1-rs @@ -1 +1 @@ -Subproject commit c064788861f014eb33a7288d4b914488e9782d13 +Subproject commit 2956bf6444a8f8d191cd17b8c33a4bf513c23ec9