max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to defmt 3.0ish.

Browse Source 
Lots of gitrevs deps.
This commit is contained in:
Bob McWhirter
2021-11-15 11:08:51 -05:00
parent 4e0a0f27fe
commit c2da498263
14 changed files with 37 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
embassy-stm32/Cargo.toml
View File

@ -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"]

2
embassy-stm32/src/can/bxcan.rs
View File

@ -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(),
}
}
}