From 46110c0d320ffa55f6d65514ebd8791d957ac999 Mon Sep 17 00:00:00 2001
From: Jan Niehusmann <jan@gondor.com>
Date: Mon, 25 Jul 2022 19:32:49 +0000
Subject: [PATCH] Update examples to defmt 0.3

Current version of probe-run is 0.3.3, which uses defmt 0.3.2.

With a firmware using defmt 0.2, this causes the following error
message:

```
Error: defmt wire format version mismatch: firmware is using 0.2, `probe-run` supports 3
suggestion: `cargo install` a different version of `probe-run` that supports defmt 0.2
```

Therefore, upgrade defmt dependency, and also fix the linker script
in .cargo/config.
---
 .cargo/config                          | 1 +
 boards/arduino_nano_connect/Cargo.toml | 2 +-
 boards/pimoroni-badger2040/Cargo.toml  | 4 ++--
 boards/pimoroni-plasma-2040/Cargo.toml | 4 ++--
 boards/pimoroni-tiny2040/Cargo.toml    | 4 ++--
 boards/rp-pico/Cargo.toml              | 4 ++--
 boards/vcc-gnd-yd-rp2040/Cargo.toml    | 4 ++--
 7 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.cargo/config b/.cargo/config
index ed10a10..4f2cc68 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -31,6 +31,7 @@ rustflags = [
     "-C", "link-arg=-Tlink.x",
     "-C", "inline-threshold=5",
     "-C", "no-vectorize-loops",
+    "-C", "link-arg=-Tdefmt.x",
 ]
 
 # This runner will make a UF2 file and then copy it to a mounted RP2040 in USB
diff --git a/boards/arduino_nano_connect/Cargo.toml b/boards/arduino_nano_connect/Cargo.toml
index 8c8452d..8ecbbc9 100644
--- a/boards/arduino_nano_connect/Cargo.toml
+++ b/boards/arduino_nano_connect/Cargo.toml
@@ -16,7 +16,7 @@ rp2040-boot2 = { version = "0.2.0", optional = true }
 rp2040-hal = { path = "../../rp2040-hal", version = "0.5.0" }
 cortex-m-rt = { version = "0.7.0", optional = true }
 embedded-hal = { version = "0.2.4", features = ["unproven"] }
-panic-probe = { version = "0.2.0", features = ["print-defmt"] }
+panic-probe = { version = "0.3.0", features = ["print-defmt"] }
 embedded-time = "0.12.0"
 
 [dev-dependencies]
diff --git a/boards/pimoroni-badger2040/Cargo.toml b/boards/pimoroni-badger2040/Cargo.toml
index 3cbc237..2cba52b 100644
--- a/boards/pimoroni-badger2040/Cargo.toml
+++ b/boards/pimoroni-badger2040/Cargo.toml
@@ -23,8 +23,8 @@ panic-halt= "0.2.0"
 nb = "1.0"
 embedded-graphics = "0.7.1"
 
-defmt = "0.2.0"
-defmt-rtt = "0.2.0"
+defmt = "0.3.0"
+defmt-rtt = "0.3.0"
 
 [features]
 default = ["boot2", "rt"]
diff --git a/boards/pimoroni-plasma-2040/Cargo.toml b/boards/pimoroni-plasma-2040/Cargo.toml
index f40bf31..33278b5 100644
--- a/boards/pimoroni-plasma-2040/Cargo.toml
+++ b/boards/pimoroni-plasma-2040/Cargo.toml
@@ -23,8 +23,8 @@ embedded-hal ="0.2.5"
 smart-leds = "0.3.0"
 ws2812-pio = "0.3.0"
 
-defmt = "0.2.0"
-defmt-rtt = "0.2.0"
+defmt = "0.3.0"
+defmt-rtt = "0.3.0"
 
 [features]
 default = ["boot2", "rt"]
diff --git a/boards/pimoroni-tiny2040/Cargo.toml b/boards/pimoroni-tiny2040/Cargo.toml
index d8d4407..c743ea4 100644
--- a/boards/pimoroni-tiny2040/Cargo.toml
+++ b/boards/pimoroni-tiny2040/Cargo.toml
@@ -21,8 +21,8 @@ embedded-time = "0.12.0"
 panic-halt= "0.2.0"
 embedded-hal ="0.2.5"
 
-defmt = "0.2.0"
-defmt-rtt = "0.2.0"
+defmt = "0.3.0"
+defmt-rtt = "0.3.0"
 
 [features]
 default = ["boot2", "rt"]
diff --git a/boards/rp-pico/Cargo.toml b/boards/rp-pico/Cargo.toml
index 2637108..038066a 100644
--- a/boards/rp-pico/Cargo.toml
+++ b/boards/rp-pico/Cargo.toml
@@ -37,8 +37,8 @@ hd44780-driver = "0.4.0"
 pio = "0.2.0"
 pio-proc = "0.2.1"
 
-defmt = "0.2.0"
-defmt-rtt = "0.2.0"
+defmt = "0.3.0"
+defmt-rtt = "0.3.0"
 
 [features]
 default = ["boot2", "rt"]
diff --git a/boards/vcc-gnd-yd-rp2040/Cargo.toml b/boards/vcc-gnd-yd-rp2040/Cargo.toml
index 2e794d2..def470e 100644
--- a/boards/vcc-gnd-yd-rp2040/Cargo.toml
+++ b/boards/vcc-gnd-yd-rp2040/Cargo.toml
@@ -37,8 +37,8 @@ hd44780-driver = "0.4.0"
 pio = "0.2.0"
 pio-proc = "0.2.1"
 
-defmt = "0.2.0"
-defmt-rtt = "0.2.0"
+defmt = "0.3.0"
+defmt-rtt = "0.3.0"
 
 [features]
 default = ["boot2", "rt"]