nordic-dev.net/embassy
2
0
Fork 0
mirror of https://github.com/embassy-rs/embassy.git synced 2024-11-21 22:32:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cargo format

Browse Source
This commit is contained in:
Joël Schulz-Ansres 2024-05-15 14:12:44 +02:00
parent db56c4fe6f
commit cc6998be30
2 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
embassy-stm32/src/gpio.rs
View File

@ -680,7 +680,6 @@ pub(crate) trait SealedPin {
self.block().ospeedr().modify(|w| w.set_ospeedr(pin, speed.into()));
}
/// Get the pull-up configuration.
#[inline]
fn pull(&self) -> Pull {
@ -692,12 +691,14 @@ pub(crate) trait SealedPin {
let crlh = if n < 8 { 0 } else { 1 };
match r.cr(crlh).cnf(n % 8) {
vals::CnfIn::FLOATING => Pull::None,
_ => if r.bsrr().read().bs(n % 8) {
Pull::Up
} else if r.bsrr().read().br(n % 8) {
Pull::Down
} else {
Pull::None
_ => {
if r.bsrr().read().bs(n % 8) {
Pull::Up
} else if r.bsrr().read().br(n % 8) {
Pull::Down
} else {
Pull::None
}
}
}
}

27
embassy-stm32/src/spi/mod.rs
View File

@ -283,11 +283,12 @@ impl<'d, T: Instance, M: PeriMode> Spi<'d, T, M> {
let miso_pullup = match &self.miso {
None => false,
Some(pin) =>
if pin.pull() == Pull::Up {
true
} else {
false
Some(pin) => {
if pin.pull() == Pull::Up {
true
} else {
false
}
}
};
@ -426,11 +427,15 @@ impl<'d, T: Instance> Spi<'d, T, Blocking> {
peri,
new_pin!(sck, AFType::OutputPushPull, Speed::VeryHigh, config.sck_pull_mode()),
new_pin!(mosi, AFType::OutputPushPull, Speed::VeryHigh),
new_pin!(miso, AFType::Input, Speed::Input,
new_pin!(
miso,
AFType::Input,
Speed::Input,
match config.miso_pullup {
true => Pull::Up,
false => Pull::None,
}),
}
),
None,
None,
config,
@ -448,11 +453,15 @@ impl<'d, T: Instance> Spi<'d, T, Blocking> {
peri,
new_pin!(sck, AFType::OutputPushPull, Speed::VeryHigh, config.sck_pull_mode()),
None,
new_pin!(miso, AFType::Input, Speed::Input,
new_pin!(
miso,
AFType::Input,
Speed::Input,
match config.miso_pullup {
true => Pull::Up,
false => Pull::None,
}),
}
),
None,
None,
config,