diff --git a/.gitmodules b/.gitmodules index 3ab3126..102e48e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "va108xx-rs"] path = va108xx-rs - url = https://egit.irs.uni-stuttgart.de/rust/va108xx-rs + url = https://egit.irs.uni-stuttgart.de/rust/va108xx [submodule "vorago-reb1-rs"] path = vorago-reb1-rs url = https://github.com/robamu-org/vorago-reb1-rs.git diff --git a/.vscode/launch.json b/.vscode/launch.json index c42596e..5b4cfda 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -144,5 +144,19 @@ "interface": "jtag", "runToMain": true, }, + { + "type": "cortex-debug", + "request": "launch", + "name": "Debug Cascade", + "servertype": "jlink", + "gdbPath": "/usr/bin/gdb-multiarch", + "cwd": "${workspaceRoot}", + "device": "VA10820", + "svdFile": "./va108xx-rs/svd/va108xx-base.svd.patched", + "preLaunchTask": "rust: cargo build cascade", + "executable": "${workspaceFolder}/target/thumbv6m-none-eabi/debug/examples/cascade", + "interface": "jtag", + "runToMain": true, + }, ] } \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 50e438b..3acd2d3 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -89,6 +89,18 @@ "isDefault": true } }, + { + "label": "rust: cargo build cascade", + "type": "shell", + "command": "~/.cargo/bin/cargo", // note: full path to the cargo + "args": [ + "build", "-p", "va108xx-hal", "--example", "cascade", "--features", "rt" + ], + "group": { + "kind": "build", + "isDefault": true + } + }, { "label": "rust: cargo build led blinky", diff --git a/va108xx-hal-rs b/va108xx-hal-rs index 5c00459..470346a 160000 --- a/va108xx-hal-rs +++ b/va108xx-hal-rs @@ -1 +1 @@ -Subproject commit 5c00459f238356cc51369956bdd20a760b41c41d +Subproject commit 470346a019aa4b678c55ff9a75ac19fd20713332 diff --git a/va108xx-rs b/va108xx-rs index ed22f9a..6a8c58b 160000 --- a/va108xx-rs +++ b/va108xx-rs @@ -1 +1 @@ -Subproject commit ed22f9a76ff7fb01dae9a2e5025a84a032386cab +Subproject commit 6a8c58bfce5860e3200ef2d49be3772fc5ebe7b9 diff --git a/vorago-reb1-rs b/vorago-reb1-rs index 7237b9b..1b2e973 160000 --- a/vorago-reb1-rs +++ b/vorago-reb1-rs @@ -1 +1 @@ -Subproject commit 7237b9b4ce7b5eec7e0b773f5d68f7b1d306dbb1 +Subproject commit 1b2e9734701f018f3f3e1a576518146adef96050