From f2d511967d4710dc29b3cce2e184b9d59253b32e Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Sun, 7 Nov 2021 14:25:15 +0100
Subject: [PATCH] updated launch files and submodules

---
 .vscode/launch.json | 34 +++++++++++++++++++++++++++++++---
 .vscode/tasks.json  | 30 +++++++++++++++++++++++++++---
 va108xx-hal-rs      |  2 +-
 vorago-reb1-rs      |  2 +-
 4 files changed, 60 insertions(+), 8 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index c54a4a5..98a8eec 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -14,7 +14,7 @@
             "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",
+            "executable": "${workspaceFolder}/target/thumbv6m-none-eabi/debug/examples/blinky-pac",
             "interface": "jtag",
             "runToMain": true,
         },
@@ -28,7 +28,7 @@
             "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",
+            "executable": "${workspaceFolder}/target/thumbv6m-none-eabi/debug/examples/blinky-hal",
             "interface": "jtag",
             "runToMain": true,
         },
@@ -56,7 +56,35 @@
             "device": "VA10820",
             "svdFile": "./va108xx-rs/svd/va108xx-base.svd.patched",
             "preLaunchTask": "rust: cargo build rtt",
-            "executable": "${workspaceFolder}/target/thumbv6m-none-eabi/debug/examples/rtt_log",
+            "executable": "${workspaceFolder}/target/thumbv6m-none-eabi/debug/examples/rtt-log",
+            "interface": "jtag",
+            "runToMain": true,
+        },
+        {
+            "type": "cortex-debug",
+            "request": "launch",
+            "name": "Debug Blinky Button IRQ",
+            "servertype": "jlink",
+            "gdbPath": "/usr/bin/gdb-multiarch",
+            "cwd": "${workspaceRoot}",
+            "device": "VA10820",
+            "svdFile": "./va108xx-rs/svd/va108xx-base.svd.patched",
+            "preLaunchTask": "rust: cargo build button blinky",
+            "executable": "${workspaceFolder}/target/thumbv6m-none-eabi/debug/examples/blinky-button-irq",
+            "interface": "jtag",
+            "runToMain": true,
+        },
+        {
+            "type": "cortex-debug",
+            "request": "launch",
+            "name": "Debug Timer MS Ticks",
+            "servertype": "jlink",
+            "gdbPath": "/usr/bin/gdb-multiarch",
+            "cwd": "${workspaceRoot}",
+            "device": "VA10820",
+            "svdFile": "./va108xx-rs/svd/va108xx-base.svd.patched",
+            "preLaunchTask": "rust: cargo build systick",
+            "executable": "${workspaceFolder}/target/thumbv6m-none-eabi/debug/examples/timer-ticks-pac",
             "interface": "jtag",
             "runToMain": true,
         },
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index c13e42e..155c4d9 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -20,7 +20,7 @@
             "type": "shell",
             "command": "~/.cargo/bin/cargo", // note: full path to the cargo
             "args": [
-                "build", "-p", "vorago-reb1", "--example", "blinky_pac",
+                "build", "-p", "vorago-reb1", "--example", "blinky-pac",
             ],
             "group": {
                 "kind": "build",
@@ -32,7 +32,7 @@
             "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-hal",
             ],
             "group": {
                 "kind": "build",
@@ -56,7 +56,31 @@
             "type": "shell",
             "command": "~/.cargo/bin/cargo", // note: full path to the cargo
             "args": [
-                "build", "-p", "vorago-reb1", "--example", "rtt_log",
+                "build", "-p", "vorago-reb1", "--example", "rtt-log",
+            ],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        },
+        {
+            "label": "rust: cargo build button blinky",
+            "type": "shell",
+            "command": "~/.cargo/bin/cargo", // note: full path to the cargo
+            "args": [
+                "build", "-p", "vorago-reb1", "--example", "blinky-button-irq",
+            ],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        },
+        {
+            "label": "rust: cargo build systick",
+            "type": "shell",
+            "command": "~/.cargo/bin/cargo", // note: full path to the cargo
+            "args": [
+                "build", "-p", "vorago-reb1", "--example", "timer-ticks-pac",
             ],
             "group": {
                 "kind": "build",
diff --git a/va108xx-hal-rs b/va108xx-hal-rs
index 6c79b15..fd0def7 160000
--- a/va108xx-hal-rs
+++ b/va108xx-hal-rs
@@ -1 +1 @@
-Subproject commit 6c79b15edba39df889f2b90bd541822ade3ff83f
+Subproject commit fd0def7212b43feab7ee23527b39463ee5d08105
diff --git a/vorago-reb1-rs b/vorago-reb1-rs
index 0fee30f..c064788 160000
--- a/vorago-reb1-rs
+++ b/vorago-reb1-rs
@@ -1 +1 @@
-Subproject commit 0fee30f02a9d19af50873290f20cf45b83294955
+Subproject commit c064788861f014eb33a7288d4b914488e9782d13