Switch from elf2uf2-rs to picotool

README.md

@@ -116,9 +116,12 @@ rustup target install thumbv6m-none-eabi
 cargo install flip-link
 # Installs the probe-rs tools, including probe-rs run, our recommended default runner
 cargo install --locked probe-rs-tools
-# If you want to use elf2uf2-rs instead, do...
-cargo install --locked elf2uf2-rs
 ```
+
+If you want to use picotool instead, install a [picotool binary][] for your system.
+
+[picotool binary]: https://github.com/raspberrypi/pico-sdk-tools/releases
+
 If you get the error ``binary `cargo-embed` already exists`` during installation of probe-rs, run `cargo uninstall cargo-embed` to uninstall your older version of cargo-embed before trying again.
 
 </details>
@@ -218,8 +221,8 @@ Some of the options for your `runner` are listed below:
 
   *Step 1* - Install `cargo-embed`. This is part of the [`probe-rs`](https://crates.io/crates/probe-rs) tools:
 
-  ```console
-  $ cargo install --locked probe-rs-tools
+  ```sh
+  cargo install --locked probe-rs-tools
   ```
 
   *Step 2* - Update settings in [Embed.toml](./Embed.toml)  
@@ -229,16 +232,16 @@ Some of the options for your `runner` are listed below:
   *Step 3* - Use the command `cargo embed`, which will compile the code, flash the device
   and start running the configuration specified in Embed.toml
 
-  ```console
-  $ cargo embed --release
+  ```sh
+  cargo embed --release
   ```
 
 * **probe-rs-debugger**
   *Step 1* - Install Visual Studio Code from https://code.visualstudio.com/
 
   *Step 2* - Install `probe-rs`
-  ```console
-  $ cargo install --locked probe-rs-tools
+  ```sh
+  cargo install --locked probe-rs-tools
   ```
 
   *Step 3* - Open this project in VSCode
@@ -247,51 +250,31 @@ Some of the options for your `runner` are listed below:
 
   *Step 5* - Launch a debug session by choosing `Run`>`Start Debugging` (or press F5)
 
-* **Loading a UF2 over USB**  
-  *Step 1* - Install [`elf2uf2-rs`](https://github.com/JoNil/elf2uf2-rs):
-
-  ```console
-  $ cargo install elf2uf2-rs --locked
-  ```
+* **Loading over USB with Picotool**  
+  *Step 1* - Install a [picotool binary][] for your system.
 
   *Step 2* - Modify `.cargo/config` to change the default runner
 
   ```toml
   [target.`cfg(all(target-arch = "arm", target_os = "none"))`]
-  runner = "elf2uf2-rs -d"
+  runner = "picotool load --update --verify --execute -t elf"
   ```
 
   The all-Arm wildcard `'cfg(all(target_arch = "arm", target_os = "none"))'` is used
   by default in the template files, but may also be replaced by
   `thumbv6m-none-eabi`.
 
   *Step 3* - Boot your RP2040 into "USB Bootloader mode", typically by rebooting
-  whilst holding some kind of "Boot Select" button. On Linux, you will also need
-  to 'mount' the device, like you would a USB Thumb Drive.
+  whilst holding some kind of "Boot Select" button.
 
   *Step 4* - Use `cargo run`, which will compile the code and start the
-  specified 'runner'. As the 'runner' is the `elf2uf2-rs` tool, it will build a UF2
-  file and copy it to your RP2040.
+  specified 'runner'. As the 'runner' is picotool, it will use the PICOBOOT
+  interface over USB to flash your RP2040.
 
-  ```console
-  $ cargo run --release
+  ```sh
+  cargo run --release
   ```
 
-* **Loading with picotool**  
-  As ELF files produced by compiling Rust code are completely compatible with ELF
-  files produced by compiling C or C++ code, you can also use the Raspberry Pi
-  tool [picotool](https://github.com/raspberrypi/picotool). The only thing to be
-  aware of is that picotool expects your ELF files to have a `.elf` extension, and
-  by default Rust does not give the ELF files any extension. You can fix this by
-  simply renaming the file.
-
-  This means you can't easily use it as a cargo runner - yet.
-
-  Also of note is that the special
-  [pico-sdk](https://github.com/raspberrypi/pico-sdk) macros which hide
-  information in the ELF file in a way that `picotool info` can read it out, are
-  not supported in Rust. An alternative is TBC.
-
 </details>
 <!-- Notes on using rp2040_hal and rp2040_boot2 -->
 <details open="open">

cargo-generate.toml

@@ -7,7 +7,7 @@ pre = ["cargo-generate/remove_rprs.rhai"]
 [placeholders]
 flash_method = { prompt = "Which flashing method do you intend to use?", choices = [
   "probe-rs",
-  "elf2uf2-rs",
+  "picotool",
   "custom",
   "none"
 ], default = "probe-rs", type = "string" }

cargo-generate/config.toml

@@ -1,14 +1,14 @@
 [target.'cfg(all(target_arch = "arm", target_os = "none"))']
 # Choose a default "cargo run" tool (see README for more info)
 # - `probe-rs` provides flashing and defmt via a hardware debugger, and stack unwind on panic
-# - elf2uf2-rs loads firmware over USB when the rp2040 is in boot mode
+# - `picotool` loads firmware over USB when the rp2040 is in boot mode
 # runner = "probe-rs run --chip RP2040 --protocol swd"
-# runner = "elf2uf2-rs -d"
+# runner = "picotool load --update --verify --execute -t elf"
 {% case flash_method -%}
   {%- when "probe-rs" -%}
     runner = "probe-rs run --chip RP2040 --protocol swd"
-  {%- when "elf2uf2-rs" -%}
-    runner = "elf2uf2-rs -d"
+  {%- when "picotool" -%}
+    runner = "picotool load --update --verify --execute -t elf"
   {%- when "none" -%}
   {%- else -%}
     {%- if flash_method != "" -%}