From 9983b4b07ad0762ad7672e5b494bcc334e0c346a Mon Sep 17 00:00:00 2001 From: Bob Adams <2567445+BobAdamsEE@users.noreply.github.com> Date: Mon, 5 May 2025 10:27:37 -0400 Subject: [PATCH 1/6] Update README.md `cargo-embed` is now a part of `probe-rs`. --- boards/atsamv71_xult/README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/boards/atsamv71_xult/README.md b/boards/atsamv71_xult/README.md index 0ce82e96..7e8d8b41 100644 --- a/boards/atsamv71_xult/README.md +++ b/boards/atsamv71_xult/README.md @@ -5,7 +5,12 @@ The examples are written in [RTIC](https://rtic.rs). ## Prerequisites * Install the cross-compilation toolchain: `rustup target add thumbv7em-none-eabihf`. -* Install [cargo-embed](https://github.com/probe-rs/cargo-embed): `cargo install cargo-embed`. +* Install [probe-rs](https://probe.rs/) (formerly cargo-embed): + + On Windows `irm https://github.com/probe-rs/probe-rs/releases/latest/download/probe-rs-tools-installer.ps1 | iex` + + On Linux `curl --proto '=https' --tlsv1.2 -LsSf https://github.com/probe-rs/probe-rs/releases/latest/download/probe-rs-tools-installer.sh | sh` + ## Flashing an example First, the General-Purpose Non-Volatile-Memory (GPNVM) boot bit must be set in order to map the flashed firmware to address `0x0`; From c9c5c75b72b58338d1efc7209bdac9ded9b2e609 Mon Sep 17 00:00:00 2001 From: Bob Adams <2567445+BobAdamsEE@users.noreply.github.com> Date: Mon, 5 May 2025 10:33:06 -0400 Subject: [PATCH 2/6] Update CHANGELOG.md Updating per suggestion in contribution guide --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 098fbcf6..b08e4894 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Changelog ## [Unreleased] +- Fixed documentation in boards\atsamv71_xult to refer to probe-rs instead of cargo-embed ## [v0.4.6] 2025-03-31 From 6a4818a2280f66bc60f5702bae271642ae2591e2 Mon Sep 17 00:00:00 2001 From: Bob Adams <2567445+BobAdamsEE@users.noreply.github.com> Date: Tue, 6 May 2025 08:18:07 -0400 Subject: [PATCH 3/6] Update Embed.toml Fixed errors that cause cargo embed to not work including show_timestamps as a general default.rtt setting (now per up_channel), halt_afterwards in the default.flashing section, and the channels parameter of default.rtt was split into up_channels and down_channels. --- boards/atsamv71_xult/Embed.toml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/boards/atsamv71_xult/Embed.toml b/boards/atsamv71_xult/Embed.toml index 88ed897d..d075a499 100644 --- a/boards/atsamv71_xult/Embed.toml +++ b/boards/atsamv71_xult/Embed.toml @@ -6,9 +6,6 @@ protocol = "Swd" [default.flashing] # Whether or not the target should be flashed. enabled = true -# Whether or not the target should be halted after reset. -# DEPRECATED, moved to reset section -halt_afterwards = false # Whether or not bytes erased but not rewritten with data from the ELF # should be restored with their contents before erasing. restore_unwritten_bytes = false @@ -56,14 +53,14 @@ enabled = true # String - Directly show output from the target # Defmt - Format output on the host, see https://defmt.ferrous-systems.com/ # BinaryLE - Display as raw hex -channels = [ - { up = 0, down = 0, name = "idle", format = "String" }, - #{ up = 1, name = "log", up_mode = "BlockIfFull", format = "String" }, +up_channels = [ + { channel = 0, format = "String", show_timestamps = true }, +] +down_channels = [ + { channel = 0, mode = "BlockIfFull" }, ] # The duration in ms for which the logger should retry to attach to RTT. timeout = 3000 -# Whether timestamps in the RTTUI are enabled -show_timestamps = true # Whether to save rtt history buffer on exit. log_enabled = true # Where to save rtt history buffer relative to manifest path. @@ -73,4 +70,4 @@ log_path = "./logs" # Whether or not a GDB server should be opened after flashing. enabled = false # The connection string in host:port format wher the GDB server will open a socket. -gdb_connection_string = "127.0.0.1:3333" \ No newline at end of file +gdb_connection_string = "127.0.0.1:3333" From 0a3ec56daedc019621b99a229045859634203eeb Mon Sep 17 00:00:00 2001 From: Bob Adams <2567445+BobAdamsEE@users.noreply.github.com> Date: Tue, 6 May 2025 08:20:00 -0400 Subject: [PATCH 4/6] Update CHANGELOG.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove windows style of paths Co-authored-by: Michał Fita <4925040+michalfita@users.noreply.github.com> --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b08e4894..0ff67125 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Changelog ## [Unreleased] -- Fixed documentation in boards\atsamv71_xult to refer to probe-rs instead of cargo-embed +- Fixed documentation in `boards/atsamv71_xult` to refer to `probe-rs` instead of `cargo-embed` ## [v0.4.6] 2025-03-31 From caf696f8741252db92768478a4936d18d1cb718c Mon Sep 17 00:00:00 2001 From: Bob Adams <2567445+BobAdamsEE@users.noreply.github.com> Date: Tue, 6 May 2025 08:20:22 -0400 Subject: [PATCH 5/6] Update boards/atsamv71_xult/README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Michał Fita <4925040+michalfita@users.noreply.github.com> --- boards/atsamv71_xult/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boards/atsamv71_xult/README.md b/boards/atsamv71_xult/README.md index 7e8d8b41..fb156816 100644 --- a/boards/atsamv71_xult/README.md +++ b/boards/atsamv71_xult/README.md @@ -5,7 +5,7 @@ The examples are written in [RTIC](https://rtic.rs). ## Prerequisites * Install the cross-compilation toolchain: `rustup target add thumbv7em-none-eabihf`. -* Install [probe-rs](https://probe.rs/) (formerly cargo-embed): +* Install [`probe-rs`](https://probe.rs/) (formerly `cargo-embed`): On Windows `irm https://github.com/probe-rs/probe-rs/releases/latest/download/probe-rs-tools-installer.ps1 | iex` From 991a557781dec047aa1c44c811952300273f2815 Mon Sep 17 00:00:00 2001 From: Bob Adams <2567445+BobAdamsEE@users.noreply.github.com> Date: Tue, 6 May 2025 08:25:46 -0400 Subject: [PATCH 6/6] Update README.md Per recommendation removed curl | sh notes - users can reference current documentation from probe-rs site directly --- boards/atsamv71_xult/README.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/boards/atsamv71_xult/README.md b/boards/atsamv71_xult/README.md index fb156816..e0f8e070 100644 --- a/boards/atsamv71_xult/README.md +++ b/boards/atsamv71_xult/README.md @@ -5,12 +5,7 @@ The examples are written in [RTIC](https://rtic.rs). ## Prerequisites * Install the cross-compilation toolchain: `rustup target add thumbv7em-none-eabihf`. -* Install [`probe-rs`](https://probe.rs/) (formerly `cargo-embed`): - - On Windows `irm https://github.com/probe-rs/probe-rs/releases/latest/download/probe-rs-tools-installer.ps1 | iex` - - On Linux `curl --proto '=https' --tlsv1.2 -LsSf https://github.com/probe-rs/probe-rs/releases/latest/download/probe-rs-tools-installer.sh | sh` - +* Install [`probe-rs`](https://probe.rs/) (formerly `cargo-embed`) ## Flashing an example First, the General-Purpose Non-Volatile-Memory (GPNVM) boot bit must be set in order to map the flashed firmware to address `0x0`;