From 2ddb19cb6b8ba1b075b79854d0c520f6a084ab94 Mon Sep 17 00:00:00 2001 From: 9names <60134748+9names@users.noreply.github.com> Date: Mon, 14 Oct 2024 22:59:34 +1100 Subject: [PATCH 1/3] Fix URL for probe-rs docs --- .vscode/launch.json | 2 +- cargo-generate/launch.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index eee0bb2..e2c267c 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -1,4 +1,4 @@ -// The format of this file is specified in https://probe.rs/docs/tools/vscode/#start-a-debug-session-with-minimum-configuration +// The format of this file is specified in https://probe.rs/docs/tools/debugger/#start-a-debug-session-with-minimum-configuration { "version": "0.2.0", "configurations": [ diff --git a/cargo-generate/launch.json b/cargo-generate/launch.json index fe333b3..9dec934 100644 --- a/cargo-generate/launch.json +++ b/cargo-generate/launch.json @@ -1,4 +1,4 @@ -// The format of this file is specified in https://probe.rs/docs/tools/vscode/#start-a-debug-session-with-minimum-configuration +// The format of this file is specified in https://probe.rs/docs/tools/debugger/#start-a-debug-session-with-minimum-configuration { "version": "0.2.0", "configurations": [ From 35f64bef80dcf054a49e27a37397307922836858 Mon Sep 17 00:00:00 2001 From: 9names <60134748+9names@users.noreply.github.com> Date: Mon, 14 Oct 2024 23:02:15 +1100 Subject: [PATCH 2/3] Remove settings no longer used by probe-rs debugger --- .vscode/launch.json | 11 ++--------- cargo-generate/launch.json | 11 ++--------- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index e2c267c..7fef737 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -18,24 +18,17 @@ ], "flashingConfig": { "flashingEnabled": true, - "resetAfterFlashing": true, - "haltAfterReset": true, + "haltAfterReset": true }, "coreConfigs": [ { "coreIndex": 0, "programBinary": "target/thumbv6m-none-eabi/debug/rp2040-project-template", - "chip": "RP2040", + "rttEnabled": true // Uncomment this if you've downloaded the SVD from // https://github.com/raspberrypi/pico-sdk/raw/1.3.1/src/rp2040/hardware_regs/rp2040.svd // and placed it in the .vscode directory // "svdFile": "./.vscode/rp2040.svd", - "rttEnabled": true, - "options": { - "env": { - "DEFMT_LOG": "debug" - } - }, } ], "consoleLogLevel": "Info", //Error, Warn, Info, Debug, Trace diff --git a/cargo-generate/launch.json b/cargo-generate/launch.json index 9dec934..5490f09 100644 --- a/cargo-generate/launch.json +++ b/cargo-generate/launch.json @@ -18,24 +18,17 @@ ], "flashingConfig": { "flashingEnabled": true, - "resetAfterFlashing": true, - "haltAfterReset": true, + "haltAfterReset": true }, "coreConfigs": [ { "coreIndex": 0, "programBinary": "target/thumbv6m-none-eabi/debug/{{project-name}}", - "chip": "RP2040", + "rttEnabled": true // Uncomment this if you've downloaded the SVD from // https://github.com/raspberrypi/pico-sdk/raw/1.3.1/src/rp2040/hardware_regs/rp2040.svd // and placed it in the .vscode directory // "svdFile": "./.vscode/rp2040.svd", - "rttEnabled": true, - "options": { - "env": { - "DEFMT_LOG": "debug" - } - }, } ], "consoleLogLevel": "Info", //Error, Warn, Info, Debug, Trace From 92be2f741f93cb29bff37586fec3653c6214f1a1 Mon Sep 17 00:00:00 2001 From: 9names <60134748+9names@users.noreply.github.com> Date: Mon, 14 Oct 2024 23:03:20 +1100 Subject: [PATCH 3/3] Default to not enabling haltAfterReset --- .vscode/launch.json | 2 +- cargo-generate/launch.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 7fef737..6b0db0b 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -18,7 +18,7 @@ ], "flashingConfig": { "flashingEnabled": true, - "haltAfterReset": true + "haltAfterReset": false }, "coreConfigs": [ { diff --git a/cargo-generate/launch.json b/cargo-generate/launch.json index 5490f09..0c14e9b 100644 --- a/cargo-generate/launch.json +++ b/cargo-generate/launch.json @@ -18,7 +18,7 @@ ], "flashingConfig": { "flashingEnabled": true, - "haltAfterReset": true + "haltAfterReset": false }, "coreConfigs": [ {