Merge remote-tracking branch 'upstream/main' into merge_from_main

stm32-rs · Jan 12, 2025 · 6afd2d3 · 6afd2d3
2 parents 0e8cb64 + 6c83185
commit 6afd2d3
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 1,326 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,7 +19,7 @@ paste = "1.0"
 bitflags = "1.2"
 vcell = "0.1"
 static_assertions = "1.1"
-fugit = "0.3.5"
+fugit = "0.3.7"
 stm32-usbd = { version = "0.7.0", optional = true }
 fixed = { version = "1.28.0", optional = true }
 
@@ -94,7 +94,7 @@ stm32g4a1 = ["stm32g4/stm32g4a1"]
 log-itm = ["cortex-m-log/itm"]
 log-rtt = []
 log-semihost = ["cortex-m-log/semihosting"]
-defmt-logging = ["defmt"]
+defmt = ["dep:defmt", "fugit/defmt"]
 cordic = ["dep:fixed"]
 
 [profile.dev]