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

Merge #826

Browse Source 
826: Bump bxcan version r=chemicstry a=chemicstry



Co-authored-by: chemicstry <chemicstry@gmail.com>
This commit is contained in:
bors[bot] 2022-06-22 23:48:45 +00:00 committed by GitHub
commit 84628d36cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
embassy-stm32/Cargo.toml
View File

@ -58,7 +58,7 @@ bare-metal = "1.0.0"
atomic-polyfill = "0.1.5"
stm32-metapac = { version = "0.1.0", path = "../stm32-metapac", features = ["rt"] }
vcell = "0.1.3"
bxcan = "0.6.2"
bxcan = "0.7.0"
nb = "1.0.0"
stm32-fmc = "0.2.4"
seq-macro = "0.3.0"
@ -71,7 +71,7 @@ quote = "1.0.15"
stm32-metapac = { version = "0.1.0", path = "../stm32-metapac", default-features = false, features = ["metadata"]}
[features]
defmt = ["dep:defmt", "embassy/defmt", "embedded-io?/defmt", "embassy-usb?/defmt"]
defmt = ["dep:defmt", "bxcan/unstable-defmt", "embassy/defmt", "embedded-io?/defmt", "embassy-usb?/defmt"]
sdmmc-rs = ["embedded-sdmmc"]
net = ["embassy-net" ]
memory-x = ["stm32-metapac/memory-x"]

4
examples/stm32f4/src/bin/can.rs
View File

@ -5,7 +5,7 @@
use cortex_m_rt::entry;
use defmt::*;
use embassy_stm32::can::bxcan::filter::Mask32;
use embassy_stm32::can::bxcan::{Frame, StandardId};
use embassy_stm32::can::bxcan::{Fifo, Frame, StandardId};
use embassy_stm32::can::Can;
use embassy_stm32::gpio::{Input, Pull};
use {defmt_rtt as _, panic_probe as _};
@ -25,7 +25,7 @@ fn main() -> ! {
let mut can = Can::new(p.CAN1, p.PA11, p.PA12);
can.modify_filters().enable_bank(0, Mask32::accept_all());
can.modify_filters().enable_bank(0, Fifo::Fifo0, Mask32::accept_all());
can.modify_config()
.set_bit_timing(0x001c0003) // http://www.bittiming.can-wiki.info/