From a770fc77c907c50fd2c4a7f6ce934eb45974ae55 Mon Sep 17 00:00:00 2001
From: Bob McWhirter <bmcwhirt@redhat.com>
Date: Mon, 15 Nov 2021 11:19:19 -0500
Subject: Adjust all examples to defmt 0.3.

---
 examples/nrf/Cargo.toml | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

(limited to 'examples/nrf')

diff --git a/examples/nrf/Cargo.toml b/examples/nrf/Cargo.toml
index b89aa513f..f7c0f85e6 100644
--- a/examples/nrf/Cargo.toml
+++ b/examples/nrf/Cargo.toml
@@ -4,30 +4,19 @@ edition = "2018"
 name = "embassy-nrf-examples"
 version = "0.1.0"
 
-[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-traits = { version = "0.1.0", path = "../../embassy-traits", features = ["defmt"] }
-embassy-nrf = { version = "0.1.0", path = "../../embassy-nrf", features = ["defmt", "defmt-trace", "nrf52840", "time-driver-rtc1", "gpiote"] }
+embassy-nrf = { version = "0.1.0", path = "../../embassy-nrf", features = ["defmt", "nrf52840", "time-driver-rtc1", "gpiote"] }
 
-defmt = "0.2.3"
-defmt-rtt = "0.2.0"
+defmt = "0.3"
+defmt-rtt = "0.3"
 
 cortex-m = { version = "0.7.3", features = ["inline-asm"] }
 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"] }
 rand = { version = "0.8.4", default-features = false }
 embedded-storage = "0.2.0"
-- 
cgit 


From 23fdca9e527de92b981b04b5f3d671749b62acb5 Mon Sep 17 00:00:00 2001
From: Bob McWhirter <bmcwhirt@redhat.com>
Date: Mon, 15 Nov 2021 11:33:44 -0500
Subject: Remove extraneous defmt-trace feature.

---
 examples/nrf/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'examples/nrf')

diff --git a/examples/nrf/Cargo.toml b/examples/nrf/Cargo.toml
index f7c0f85e6..5b4662b4c 100644
--- a/examples/nrf/Cargo.toml
+++ b/examples/nrf/Cargo.toml
@@ -6,7 +6,7 @@ version = "0.1.0"
 
 
 [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-nrf = { version = "0.1.0", path = "../../embassy-nrf", features = ["defmt", "nrf52840", "time-driver-rtc1", "gpiote"] }
 
-- 
cgit