NaxdyOrg/embassy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change bool to Pull

Browse source
This commit is contained in:
Joël Schulz-Ansres 2024-05-23 23:52:18 +02:00
parent 0a5820e3ed
commit f285a545be
1 changed files with 6 additions and 28 deletions

34
embassy-stm32/src/spi/mod.rs
View file

@ -54,7 +54,7 @@ pub struct Config {
/// ///
/// There are some ICs that require a pull-up on the MISO pin for some applications. /// There are some ICs that require a pull-up on the MISO pin for some applications.
/// If you are unsure, you probably don't need this. /// If you are unsure, you probably don't need this.
pub miso_pullup: bool, pub miso_pullup: Pull,
} }
impl Default for Config { impl Default for Config {
@ -63,7 +63,7 @@ impl Default for Config {
mode: MODE_0, mode: MODE_0,
bit_order: BitOrder::MsbFirst, bit_order: BitOrder::MsbFirst,
frequency: Hertz(1_000_000), frequency: Hertz(1_000_000),
miso_pullup: false, miso_pullup: Pull::None,
} }
} }
} }
@ -280,14 +280,8 @@ impl<'d, M: PeriMode> Spi<'d, M> {
}; };
let miso_pullup = match &self.miso { let miso_pullup = match &self.miso {
None => false, None => Pull::None,
Some(pin) => { Some(pin) => pin.pull(),
if pin.pull() == Pull::Up {
true
} else {
false
}
}
}; };
#[cfg(any(spi_v1, spi_f1, spi_v2))] #[cfg(any(spi_v1, spi_f1, spi_v2))]
@ -424,15 +418,7 @@ impl<'d> Spi<'d, Blocking> {
peri, peri,
new_pin!(sck, AFType::OutputPushPull, Speed::VeryHigh, config.sck_pull_mode()), new_pin!(sck, AFType::OutputPushPull, Speed::VeryHigh, config.sck_pull_mode()),
new_pin!(mosi, AFType::OutputPushPull, Speed::VeryHigh), new_pin!(mosi, AFType::OutputPushPull, Speed::VeryHigh),
new_pin!( new_pin!(miso, AFType::Input, Speed::VeryHigh, config.miso_pullup),
miso,
AFType::Input,
Speed::VeryHigh,
match config.miso_pullup {
true => Pull::Up,
false => Pull::None,
}
),
None, None,
None, None,
config, config,
@ -450,15 +436,7 @@ impl<'d> Spi<'d, Blocking> {
peri, peri,
new_pin!(sck, AFType::OutputPushPull, Speed::VeryHigh, config.sck_pull_mode()), new_pin!(sck, AFType::OutputPushPull, Speed::VeryHigh, config.sck_pull_mode()),
None, None,
new_pin!( new_pin!(miso, AFType::Input, Speed::VeryHigh, config.miso_pullup),
miso,
AFType::Input,
Speed::VeryHigh,
match config.miso_pullup {
true => Pull::Up,
false => Pull::None,
}
),
None, None,
None, None,
config, config,