Make defmt optional with new `anyfmt` crate

4 files changed, 17 insertions, 12 deletions

diff --git a/embassy-nrf/Cargo.toml b/embassy-nrf/Cargo.toml
index 0019cbfb9..6cf23aa79 100644
--- a/embassy-nrf/Cargo.toml
+++ b/embassy-nrf/Cargo.toml
@@ -5,12 +5,11 @@ authors = ["Dario Nieuwenhuis <[email protected]>"]
 edition = "2018"
 
 [features]
-defmt-default = []
-defmt-trace = []
-defmt-debug = []
-defmt-info = []
-defmt-warn = []
-defmt-error = []
+defmt-trace = [ ]
+defmt-debug = [ ]
+defmt-info = [ ]
+defmt-warn = [ ]
+defmt-error = [ ]
 
 52810 = ["nrf52810-pac", "nrf52810-hal"]
 52811 = ["nrf52811-pac"] #, "nrf52811-hal"]
@@ -21,14 +20,17 @@ defmt-error = []
 
 [dependencies]
 embassy = { version = "0.1.0", path = "../embassy" }
+
+anyfmt = { version = "0.1.0", path = "../anyfmt" }
+defmt = { version = "0.1.0", optional = true }
+
 cortex-m-rt = "0.6.12"
 cortex-m        = { version = "0.6.3" }
 embedded-hal    = { version = "0.2.4" }
 bare-metal = { version = "0.2.0", features = ["const-fn"] }
-defmt = "0.1.0"
 
 nrf52810-pac  = { version = "0.9.0", optional = true }
-nrf52811-pac  = { version = "0.9.0", optional = true }
+nrf52811-pac  = { version = "0.9.1", optional = true }
 nrf52832-pac  = { version = "0.9.0", optional = true }
 nrf52833-pac  = { version = "0.9.0", optional = true }
 nrf52840-pac  = { version = "0.9.0", optional = true }
diff --git a/embassy-nrf/src/gpiote.rs b/embassy-nrf/src/gpiote.rs
index 0b9a33b3a..c18db2626 100644
--- a/embassy-nrf/src/gpiote.rs
+++ b/embassy-nrf/src/gpiote.rs
@@ -1,6 +1,6 @@
+use anyfmt::*;
 use core::cell::Cell;
 use core::ptr;
-use defmt::trace;
 use embassy::util::Signal;
 
 use crate::hal::gpio::{Input, Level, Output, Pin, Port};
@@ -34,7 +34,8 @@ pub enum TaskOutPolarity {
     Toggle,
 }
 
-#[derive(defmt::Format)]
+#[derive(Debug, Copy, Clone, Eq, PartialEq)]
+#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub enum NewChannelError {
     NoFreeChannels,
 }
diff --git a/embassy-nrf/src/interrupt.rs b/embassy-nrf/src/interrupt.rs
index 581adff74..8918b13ee 100644
--- a/embassy-nrf/src/interrupt.rs
+++ b/embassy-nrf/src/interrupt.rs
@@ -12,7 +12,8 @@ pub use crate::pac::Interrupt;
 pub use crate::pac::Interrupt::*; // needed for cortex-m-rt #[interrupt]
 pub use bare_metal::{CriticalSection, Mutex};
 
-#[derive(defmt::Format, Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+#[derive(Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 #[repr(u8)]
 pub enum Priority {
     Level0 = 0,
diff --git a/embassy-nrf/src/uarte.rs b/embassy-nrf/src/uarte.rs
index 575405b57..13b06397d 100644
--- a/embassy-nrf/src/uarte.rs
+++ b/embassy-nrf/src/uarte.rs
@@ -28,7 +28,8 @@ pub use uarte0::{baudrate::BAUDRATE_A as Baudrate, config::PARITY_A as Parity};
 use embassy::io::{AsyncBufRead, AsyncWrite, Result};
 use embassy::util::WakerStore;
 
-use defmt::trace;
+use anyfmt::panic;
+use anyfmt::*;
 
 //use crate::trace;