updated launch files and submodules

This commit is contained in:
Robin Müller 2021-11-07 14:25:15 +01:00
parent 1729717358
commit f2d511967d
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
4 changed files with 60 additions and 8 deletions

34
.vscode/launch.json vendored
View File

@ -14,7 +14,7 @@
"device": "VA10820", "device": "VA10820",
"svdFile": "./va108xx-rs/svd/va108xx-base.svd.patched", "svdFile": "./va108xx-rs/svd/va108xx-base.svd.patched",
"preLaunchTask": "rust: cargo build pac blinky", "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", "interface": "jtag",
"runToMain": true, "runToMain": true,
}, },
@ -28,7 +28,7 @@
"device": "VA10820", "device": "VA10820",
"svdFile": "./va108xx-rs/svd/va108xx-base.svd.patched", "svdFile": "./va108xx-rs/svd/va108xx-base.svd.patched",
"preLaunchTask": "rust: cargo build hal blinky", "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", "interface": "jtag",
"runToMain": true, "runToMain": true,
}, },
@ -56,7 +56,35 @@
"device": "VA10820", "device": "VA10820",
"svdFile": "./va108xx-rs/svd/va108xx-base.svd.patched", "svdFile": "./va108xx-rs/svd/va108xx-base.svd.patched",
"preLaunchTask": "rust: cargo build rtt", "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", "interface": "jtag",
"runToMain": true, "runToMain": true,
}, },

30
.vscode/tasks.json vendored
View File

@ -20,7 +20,7 @@
"type": "shell", "type": "shell",
"command": "~/.cargo/bin/cargo", // note: full path to the cargo "command": "~/.cargo/bin/cargo", // note: full path to the cargo
"args": [ "args": [
"build", "-p", "vorago-reb1", "--example", "blinky_pac", "build", "-p", "vorago-reb1", "--example", "blinky-pac",
], ],
"group": { "group": {
"kind": "build", "kind": "build",
@ -32,7 +32,7 @@
"type": "shell", "type": "shell",
"command": "~/.cargo/bin/cargo", // note: full path to the cargo "command": "~/.cargo/bin/cargo", // note: full path to the cargo
"args": [ "args": [
"build", "-p", "vorago-reb1", "--example", "blinky_hal", "build", "-p", "vorago-reb1", "--example", "blinky-hal",
], ],
"group": { "group": {
"kind": "build", "kind": "build",
@ -56,7 +56,31 @@
"type": "shell", "type": "shell",
"command": "~/.cargo/bin/cargo", // note: full path to the cargo "command": "~/.cargo/bin/cargo", // note: full path to the cargo
"args": [ "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": { "group": {
"kind": "build", "kind": "build",

@ -1 +1 @@
Subproject commit 6c79b15edba39df889f2b90bd541822ade3ff83f Subproject commit fd0def7212b43feab7ee23527b39463ee5d08105

@ -1 +1 @@
Subproject commit 0fee30f02a9d19af50873290f20cf45b83294955 Subproject commit c064788861f014eb33a7288d4b914488e9782d13