fixing bug in defmt, deriving bitfild defmt did not work so is done m…

…anually
maebli · Jan 28, 2025 · ab574fc · ab574fc
1 parent 16adc61
commit ab574fc
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "m-bus-parser"
-version = "0.0.21"
+version = "0.0.22"
 edition = "2021"
 description = "A library for parsing M-Bus frames"
 license = "MIT"

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -18,5 +18,5 @@ keywords = ["m-bus", "parser", "parse", "cli"]
 
 
 [dependencies]
-m-bus-parser = { path = "..", version = "0.0.21", features = ["std", "serde"] }
+m-bus-parser = { path = "..", version = "0.0.22", features = ["std", "serde"] }
 clap = { version = "4.5.4", features = ["derive"] }
diff --git a/examples/cortex-m/Cargo.toml b/examples/cortex-m/Cargo.toml
@@ -10,7 +10,7 @@ cortex-m = "0.7.7"
 cortex-m-rt = "0.7.3"
 cortex-m-semihosting = "0.5.0"
 panic-halt = "0.2.0"
-m-bus-parser = { path = "../../", version = "0.0.21" }
+m-bus-parser = { path = "../../", version = "0.0.22" }
 # Uncomment for the panic example.
 # panic-itm = "0.4.1"
 

diff --git a/python/Cargo.toml b/python/Cargo.toml
@@ -6,7 +6,7 @@ homepage = "https://maebli.github.io/"
 repository = "https://github.com/maebli/m-bus-parser"
 
 [dependencies]
-m-bus-parser = { path = "..", version = "0.0.21", features = ["std", "serde"] }
+m-bus-parser = { path = "..", version = "0.0.22", features = ["std", "serde"] }
 serde_json = "1.0"
 pyo3 = { version = "0.23.1", features = ["extension-module","generate-import-lib"] }
 hex = "0.4.2"

diff --git a/src/user_data/mod.rs b/src/user_data/mod.rs
@@ -79,7 +79,6 @@ bitflags::bitflags! {
     #[repr(transparent)]
     #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
     #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-    #[cfg_attr(feature = "defmt", derive(defmt::Format))]
     pub struct StatusField: u8 {
         const COUNTER_BINARY_SIGNED     = 0b0000_0001;
         const COUNTER_FIXED_DATE        = 0b0000_0010;
@@ -92,6 +91,14 @@ bitflags::bitflags! {
     }
 }
 
+#[cfg(feature = "defmt")]
+impl defmt::Format for StatusField {
+    fn format(&self, f: defmt::Formatter) {
+        defmt::write!(f, "{:?}", self);
+    }
+}
+
+
 #[cfg(feature = "std")]
 impl fmt::Display for StatusField {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {