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

gpiov1: Do not call set_speed for AFType::Input

Browse source 
Co-authored-by: Toby Fleming <tobywf@users.noreply.github.com>
This commit is contained in:
Joël Schulz-Andres 2024-05-24 13:46:55 +02:00
parent 8226904b34
commit bfc5929f50
2 changed files with 10 additions and 1 deletions
embassy-stm32/src
gpio.rsmacros.rs

5
embassy-stm32/src/gpio.rs
View file

@ -661,6 +661,11 @@ pub(crate) trait SealedPin {
self.set_as_analog(); self.set_as_analog();
} }
/// Sets the speed of the output pin.
///
/// This should never be called for AFType::Input on the STM32F1 series, since MODE and
/// CNF bits are not independent. If the CNF bits are altered afterwards as well, this
/// will put the pin into output mode.
#[inline] #[inline]
fn set_speed(&self, speed: Speed) { fn set_speed(&self, speed: Speed) {
let pin = self._pin() as usize; let pin = self._pin() as usize;

6
embassy-stm32/src/macros.rs
View file

@ -106,7 +106,11 @@ macro_rules! new_pin {
($name:ident, $aftype:expr, $speed:expr, $pull:expr) => {{ ($name:ident, $aftype:expr, $speed:expr, $pull:expr) => {{
let pin = $name.into_ref(); let pin = $name.into_ref();
pin.set_as_af_pull(pin.af_num(), $aftype, $pull); pin.set_as_af_pull(pin.af_num(), $aftype, $pull);
pin.set_speed($speed); // Do not call set_speed on AFType::Input, as MODE and CNF bits are not independent
// for gpio_v1
if $aftype != crate::gpio::low_level::AFType::Input {
pin.set_speed($speed);
}
Some(pin.map_into()) Some(pin.map_into())
}}; }};
} }