From c2da49826345e82e7539fce3e96cce203253dc56 Mon Sep 17 00:00:00 2001
From: Bob McWhirter <bmcwhirt@redhat.com>
Date: Mon, 15 Nov 2021 11:08:51 -0500
Subject: [PATCH] Update to defmt 3.0ish. Lots of gitrevs deps.

---
 embassy-hal-common/Cargo.toml       |  7 +------
 embassy-lora/Cargo.toml             |  8 +-------
 embassy-net/Cargo.toml              | 11 +++--------
 embassy-nrf/Cargo.toml              |  8 +-------
 embassy-rp/Cargo.toml               |  8 +-------
 embassy-stm32/Cargo.toml            | 10 +++-------
 embassy-stm32/src/can/bxcan.rs      |  2 +-
 embassy-traits/Cargo.toml           |  2 +-
 embassy/Cargo.toml                  |  8 +-------
 examples/stm32h7/Cargo.toml         | 25 ++++++++-----------------
 examples/stm32l4/Cargo.toml         | 19 +++++--------------
 examples/stm32u5/.cargo/config.toml |  4 +++-
 examples/stm32u5/Cargo.toml         | 19 +++++--------------
 examples/stm32u5/src/bin/boot.rs    |  4 +++-
 14 files changed, 37 insertions(+), 98 deletions(-)

diff --git a/embassy-hal-common/Cargo.toml b/embassy-hal-common/Cargo.toml
index 575007070..2028b0e0c 100644
--- a/embassy-hal-common/Cargo.toml
+++ b/embassy-hal-common/Cargo.toml
@@ -5,16 +5,11 @@ authors = ["Dario Nieuwenhuis <dirbaio@dirbaio.net>"]
 edition = "2018"
 
 [features]
-defmt-trace = [ ]
-defmt-debug = [ ]
-defmt-info = [ ]
-defmt-warn = [ ]
-defmt-error = [ ]
 
 [dependencies]
 embassy = { version = "0.1.0", path = "../embassy" }
 
-defmt = { version = "0.2.3", optional = true }
+defmt = { version = "0.3", optional = true }
 log = { version = "0.4.14", optional = true }
 cortex-m = "0.7.3"
 usb-device = "0.2.8"
diff --git a/embassy-lora/Cargo.toml b/embassy-lora/Cargo.toml
index 00bd3b847..fa46d43f5 100644
--- a/embassy-lora/Cargo.toml
+++ b/embassy-lora/Cargo.toml
@@ -11,15 +11,9 @@ sx127x = []
 stm32wl = ["embassy-stm32", "embassy-stm32/subghz"]
 time = []
 
-defmt-trace = []
-defmt-debug = []
-defmt-info = []
-defmt-warn = []
-defmt-error = []
-
 [dependencies]
 
-defmt = { version = "0.2.3", optional = true }
+defmt = { version = "0.3", optional = true }
 log = { version = "0.4.14", optional = true }
 
 embassy = { version = "0.1.0", path = "../embassy", default-features = false }
diff --git a/embassy-net/Cargo.toml b/embassy-net/Cargo.toml
index 161a3946e..4b932ceb3 100644
--- a/embassy-net/Cargo.toml
+++ b/embassy-net/Cargo.toml
@@ -7,11 +7,6 @@ edition = "2018"
 [features]
 default = ["pool-4"]
 std = []
-defmt-trace = []
-defmt-debug = []
-defmt-info = []
-defmt-warn = []
-defmt-error = []
 
 tcp = ["smoltcp/socket-tcp"]
 dhcpv4 = ["medium-ethernet", "smoltcp/socket-dhcpv4"]
@@ -25,7 +20,7 @@ pool-32 = []
 
 [dependencies]
 
-defmt = { version = "0.2.3", optional = true }
+defmt = { version = "0.3", optional = true }
 log = { version = "0.4.14", optional = true }
 
 embassy             = { version = "0.1.0", path = "../embassy" }
@@ -39,8 +34,8 @@ futures             = { version = "0.3.17", default-features = false, features =
 atomic-pool = "0.2.1"
 
 [dependencies.smoltcp]
-git = "https://github.com/smoltcp-rs/smoltcp"
-rev = "e4241510337e095b9d21136c5f58b2eaa1b78479"
+git = "https://github.com/bobmcwhirter/smoltcp"
+rev = "faf81d21daae16b650b16e59a8422a8283e8a302"
 default-features = false
 features = [
   "proto-ipv4",
diff --git a/embassy-nrf/Cargo.toml b/embassy-nrf/Cargo.toml
index 3ce174372..dae9f26ae 100644
--- a/embassy-nrf/Cargo.toml
+++ b/embassy-nrf/Cargo.toml
@@ -12,12 +12,6 @@ edition = "2018"
 # There are no plans to make this stable.
 unstable-pac = []
 
-defmt-trace = [ ]
-defmt-debug = [ ]
-defmt-info = [ ]
-defmt-warn = [ ]
-defmt-error = [ ]
-
 nrf52805 = ["nrf52805-pac", "_ppi"]
 nrf52810 = ["nrf52810-pac", "_ppi"]
 nrf52811 = ["nrf52811-pac", "_ppi"]
@@ -53,7 +47,7 @@ embassy = { version = "0.1.0", path = "../embassy" }
 embassy-macros = { version = "0.1.0", path = "../embassy-macros", features = ["nrf"]}
 embassy-hal-common = {version = "0.1.0", path = "../embassy-hal-common" }
 
-defmt = { version = "0.2.3", optional = true }
+defmt = { version = "0.3", optional = true }
 log = { version = "0.4.14", optional = true }
 cortex-m-rt = ">=0.6.15,<0.8"
 cortex-m = "0.7.3"
diff --git a/embassy-rp/Cargo.toml b/embassy-rp/Cargo.toml
index 21a19a632..be41f95eb 100644
--- a/embassy-rp/Cargo.toml
+++ b/embassy-rp/Cargo.toml
@@ -12,18 +12,12 @@ edition = "2018"
 # There are no plans to make this stable.
 unstable-pac = []
 
-defmt-trace = [ ]
-defmt-debug = [ ]
-defmt-info = [ ]
-defmt-warn = [ ]
-defmt-error = [ ]
-
 [dependencies]
 embassy = { version = "0.1.0", path = "../embassy", features = [ "time-tick-1mhz" ] }
 embassy-hal-common = {version = "0.1.0", path = "../embassy-hal-common" }
 embassy-macros = { version = "0.1.0", path = "../embassy-macros", features = ["rp"]}
 atomic-polyfill = "0.1.5"
-defmt = { version = "0.2.3", optional = true }
+defmt = { version = "0.3", optional = true }
 log = { version = "0.4.14", optional = true }
 cortex-m-rt = ">=0.6.15,<0.8"
 cortex-m = "0.7.3"
diff --git a/embassy-stm32/Cargo.toml b/embassy-stm32/Cargo.toml
index d6b0586c9..8ed25e110 100644
--- a/embassy-stm32/Cargo.toml
+++ b/embassy-stm32/Cargo.toml
@@ -12,7 +12,7 @@ embassy-hal-common = {version = "0.1.0", path = "../embassy-hal-common" }
 embassy-traits = {version = "0.1.0", path = "../embassy-traits" }
 embassy-net = { version = "0.1.0", path = "../embassy-net", default-features = false, optional = true }
 
-defmt = { version = "0.2.3", optional = true }
+defmt = { version = "0.3", optional = true }
 log = { version = "0.4.14", optional = true }
 cortex-m-rt = ">=0.6.15,<0.8"
 cortex-m = "0.7.3"
@@ -26,7 +26,8 @@ bare-metal = "1.0.0"
 atomic-polyfill = "0.1.5"
 stm32-metapac = { version = "0.1.0", path = "../stm32-metapac", features = ["rt"] }
 vcell = { version = "0.1.3", optional = true }
-bxcan = "0.5.1"
+bxcan = { git = "https://github.com/bobmcwhirter/bxcan.git", rev="8e011c6e1ecec318da5b8e13ac743ce34e969de9" }
+
 seq-macro = "0.2.2"
 
 cfg-if = "1.0.0"
@@ -37,11 +38,6 @@ serde = { version = "1.0.130", features = [ "derive" ] }
 serde_yaml = "0.8.21"
 
 [features]
-defmt-trace = [ ]
-defmt-debug = [ ]
-defmt-info = [ ]
-defmt-warn = [ ]
-defmt-error = [ ]
 sdmmc-rs = ["embedded-sdmmc"]
 net = ["embassy-net", "vcell"]
 memory-x = ["stm32-metapac/memory-x"]
diff --git a/embassy-stm32/src/can/bxcan.rs b/embassy-stm32/src/can/bxcan.rs
index 191fc42a1..cc057b092 100644
--- a/embassy-stm32/src/can/bxcan.rs
+++ b/embassy-stm32/src/can/bxcan.rs
@@ -35,7 +35,7 @@ impl<'d, T: Instance + bxcan::Instance> Can<'d, T> {
 
         Self {
             phantom: PhantomData,
-            can: bxcan::Can::new(peri),
+            can: bxcan::Can::builder(peri).enable(),
         }
     }
 }
diff --git a/embassy-traits/Cargo.toml b/embassy-traits/Cargo.toml
index 9e23453a8..c98b583e5 100644
--- a/embassy-traits/Cargo.toml
+++ b/embassy-traits/Cargo.toml
@@ -8,5 +8,5 @@ edition = "2018"
 std = []
 
 [dependencies]
-defmt = { version = "0.2.3", optional = true }
+defmt = { version = "0.3", optional = true }
 embedded-hal = { version = "0.2.6", features = ["unproven"] }
diff --git a/embassy/Cargo.toml b/embassy/Cargo.toml
index d531ce3f9..bbe657f40 100644
--- a/embassy/Cargo.toml
+++ b/embassy/Cargo.toml
@@ -23,16 +23,10 @@ time-tick-32768hz = ["time"]
 time-tick-1000hz = ["time"]
 time-tick-1mhz = ["time"]
 
-defmt-trace = []
-defmt-debug = []
-defmt-info = []
-defmt-warn = []
-defmt-error = []
-
 executor-agnostic = []
 
 [dependencies]
-defmt = { version = "0.2.3", optional = true }
+defmt = { version = "0.3", optional = true }
 log = { version = "0.4.14", optional = true }
 
 cortex-m = "0.7.3"
diff --git a/examples/stm32h7/Cargo.toml b/examples/stm32h7/Cargo.toml
index e83ee3585..6b51f2ab8 100644
--- a/examples/stm32h7/Cargo.toml
+++ b/examples/stm32h7/Cargo.toml
@@ -6,31 +6,22 @@ version = "0.1.0"
 resolver = "2"
 
 [features]
-default = [
-    "defmt-default",
-]
-defmt-default = []
-defmt-trace = []
-defmt-debug = []
-defmt-info = []
-defmt-warn = []
-defmt-error = []
 
 [dependencies]
-embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-trace"] }
+embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt"] }
 embassy-traits = { version = "0.1.0", path = "../../embassy-traits", features = ["defmt"] }
-embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "defmt-trace", "stm32h743zi", "net", "time-driver-tim2"] }
+embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "stm32h743zi", "net", "time-driver-tim2"] }
 embassy-hal-common = {version = "0.1.0", path = "../../embassy-hal-common" }
-embassy-net = { path = "../../embassy-net", default-features = false, features = ["defmt-debug", "defmt", "tcp", "medium-ethernet", "pool-16"] }
+embassy-net = { path = "../../embassy-net", default-features = false, features = ["defmt", "tcp", "medium-ethernet", "pool-16"] }
 embassy-macros = { path = "../../embassy-macros" }
 
-defmt = "0.2.3"
-defmt-rtt = "0.2.0"
+defmt = "0.3"
+defmt-rtt = "0.3"
 
 cortex-m = "0.7.3"
 cortex-m-rt = "0.7.0"
 embedded-hal = "0.2.6"
-panic-probe = { version = "0.2.0", features = ["print-defmt"] }
+panic-probe = { version = "0.3", features = ["print-defmt"] }
 futures = { version = "0.3.17", default-features = false, features = ["async-await"] }
 rtt-target = { version = "0.3.1", features = ["cortex-m"] }
 heapless = { version = "0.7.5", default-features = false }
@@ -40,8 +31,8 @@ critical-section = "0.2.5"
 micromath = "2.0.0"
 
 [dependencies.smoltcp]
-git = "https://github.com/smoltcp-rs/smoltcp"
-rev = "e4241510337e095b9d21136c5f58b2eaa1b78479"
+git = "https://github.com/bobmcwhirter/smoltcp"
+rev = "faf81d21daae16b650b16e59a8422a8283e8a302"
 default-features = false
 features = [
   "proto-ipv4",
diff --git a/examples/stm32l4/Cargo.toml b/examples/stm32l4/Cargo.toml
index 26d4cae48..c6862b211 100644
--- a/examples/stm32l4/Cargo.toml
+++ b/examples/stm32l4/Cargo.toml
@@ -6,29 +6,20 @@ version = "0.1.0"
 resolver = "2"
 
 [features]
-default = [
-    "defmt-default",
-]
-defmt-default = []
-defmt-trace = []
-defmt-debug = []
-defmt-info = []
-defmt-warn = []
-defmt-error = []
 
 [dependencies]
-embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-trace"] }
+embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt" ] }
 embassy-traits = { version = "0.1.0", path = "../../embassy-traits", features = ["defmt"] }
-embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "defmt-trace", "unstable-pac", "stm32l4s5vi", "time-driver-tim2"]  }
+embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "unstable-pac", "stm32l4s5vi", "time-driver-tim2"]  }
 embassy-hal-common = {version = "0.1.0", path = "../../embassy-hal-common" }
 
-defmt = "0.2.3"
-defmt-rtt = "0.2.0"
+defmt = "0.3"
+defmt-rtt = "0.3"
 
 cortex-m = "0.7.3"
 cortex-m-rt = "0.7.0"
 embedded-hal = "0.2.6"
-panic-probe = { version = "0.2.0", features = ["print-defmt"] }
+panic-probe = { version = "0.3", features = ["print-defmt"] }
 futures = { version = "0.3.17", default-features = false, features = ["async-await"] }
 rtt-target = { version = "0.3.1", features = ["cortex-m"] }
 heapless = { version = "0.7.5", default-features = false }
diff --git a/examples/stm32u5/.cargo/config.toml b/examples/stm32u5/.cargo/config.toml
index 9f5e14801..826fd33f3 100644
--- a/examples/stm32u5/.cargo/config.toml
+++ b/examples/stm32u5/.cargo/config.toml
@@ -1,7 +1,9 @@
 [target.'cfg(all(target_arch = "arm", target_os = "none"))']
 # replace STM32F429ZITx with your chip as listed in `probe-run --list-chips`
 #runner = "probe-run --chip STM32U585AIIx"
-runner = "/Users/bob/outboard-repos/probe-run/target/debug/probe-run-rp --chip STM32U585AIIx"
+#runner = "/Users/bob/outboard-repos/probe-run/target/debug/probe-run-rp --chip STM32U585AIIx"
+#runner = "/Users/bob/repos/probe-run/target/debug/probe-run --chip STM32U585AIIx"
+runner = "probe-run --chip STM32U585AIIx"
 
 [build]
 target = "thumbv7em-none-eabi"
diff --git a/examples/stm32u5/Cargo.toml b/examples/stm32u5/Cargo.toml
index e84e1992f..a0138e1a5 100644
--- a/examples/stm32u5/Cargo.toml
+++ b/examples/stm32u5/Cargo.toml
@@ -6,29 +6,20 @@ version = "0.1.0"
 resolver = "2"
 
 [features]
-default = [
-    "defmt-default",
-]
-defmt-default = []
-defmt-trace = []
-defmt-debug = []
-defmt-info = []
-defmt-warn = []
-defmt-error = []
 
 [dependencies]
-embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-trace"] }
+embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt"] }
 embassy-traits = { version = "0.1.0", path = "../../embassy-traits", features = ["defmt"] }
-embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "defmt-trace", "unstable-pac", "stm32u585ai", "memory-x" ]  }
+embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "unstable-pac", "stm32u585ai", "memory-x" ]  }
 embassy-hal-common = {version = "0.1.0", path = "../../embassy-hal-common" }
 
-defmt = "0.2"
-defmt-rtt = "0.2"
+defmt = "0.3"
+defmt-rtt = "0.3"
 
 cortex-m = "0.7.3"
 cortex-m-rt = "0.7.0"
 embedded-hal = "0.2.6"
-panic-probe = { version = "0.2.0", features = ["print-defmt"] }
+panic-probe = { version = "0.3", features = ["print-defmt"] }
 futures = { version = "0.3.17", default-features = false, features = ["async-await"] }
 rtt-target = { version = "0.3.1", features = ["cortex-m"] }
 heapless = { version = "0.7.5", default-features = false }
diff --git a/examples/stm32u5/src/bin/boot.rs b/examples/stm32u5/src/bin/boot.rs
index 91eff735d..23cfc3061 100644
--- a/examples/stm32u5/src/bin/boot.rs
+++ b/examples/stm32u5/src/bin/boot.rs
@@ -12,5 +12,7 @@ use embassy_stm32 as _;
 fn main() -> ! {
     info!("Hello World!");
 
-    loop {}
+    loop {
+        //defmt::info!("loop!");
+    }
 }