diff --git a/.gitignore b/.gitignore index 51c87c3..ddafde6 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ Cargo.lock **/*.rs.bk /.vscode/.cortex-debug.* + +/.vscode/settings.json diff --git a/.vscode/launch.json b/.vscode/launch.json index 5c383b6..74c7a56 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -7,13 +7,26 @@ { "type": "cortex-debug", "request": "launch", - "name": "Debug LED Blinky", + "name": "Debug LED Blinky PAC", // The user should start the J-Link server themselves for now. This is because the // Cortex-Debug will issue a reset command, which is problematic even with // a valid JLinkScript file "servertype": "external", "gdbTarget": "localhost:2331", - "gdbPath": "/usr/bin/gdb-multiarch", + "cwd": "${workspaceRoot}", + "device": "Cortex-M4", + "svdFile": "${workspaceFolder}/va416xx/svd/va416xx-base.svd", + "preLaunchTask": "rust: cargo build led blinky pac", + "executable": "${workspaceFolder}/target/thumbv7em-none-eabihf/debug/examples/blinky-pac", + "interface": "swd", + "runToMain": true, + }, + { + "type": "cortex-debug", + "request": "launch", + "name": "Debug LED Blinky", + "servertype": "external", + "gdbTarget": "localhost:2331", "cwd": "${workspaceRoot}", "device": "Cortex-M4", "svdFile": "${workspaceFolder}/va416xx/svd/va416xx-base.svd", diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 0984685..45e18ad 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -3,6 +3,18 @@ // for the documentation about the tasks.json format "version": "2.0.0", "tasks": [ + { + "label": "rust: cargo build led blinky pac", + "type": "shell", + "command": "~/.cargo/bin/cargo", // note: full path to the cargo + "args": [ + "build", "-p", "va416xx-hal", "--example", "blinky-pac" + ], + "group": { + "kind": "build", + "isDefault": true + } + }, { "label": "rust: cargo build led blinky", "type": "shell", diff --git a/va416xx-hal b/va416xx-hal index ffae4b2..97f9a3a 160000 --- a/va416xx-hal +++ b/va416xx-hal @@ -1 +1 @@ -Subproject commit ffae4b2e0b6ef022e825e0e7577561ec7add0c9c +Subproject commit 97f9a3a36240cf86c8a60317e02a77dd4f046787 diff --git a/vorago-peb1 b/vorago-peb1 index f8487e9..be6b886 160000 --- a/vorago-peb1 +++ b/vorago-peb1 @@ -1 +1 @@ -Subproject commit f8487e9c5015e99ba152c35f50ff37f75494c9cf +Subproject commit be6b8868b43748921dc46b81d57bfbd5578bf1f2