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

remove duplication

Browse Source
This commit is contained in:
Karun 2024-08-19 11:27:18 -04:00
parent 446169b2c1
commit fcf9b3239e
1 changed files with 16 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
embassy-stm32/src/usart/mod.rs
View File

@ -14,7 +14,7 @@ use embassy_sync::waitqueue::AtomicWaker;
use futures_util::future::{select, Either}; use futures_util::future::{select, Either};
use crate::dma::ChannelAndRequest; use crate::dma::ChannelAndRequest;
use crate::gpio::{AfType, AnyPin, OutputType, Pull, SealedPin as _, Speed}; use crate::gpio::{self, AfType, AnyPin, OutputType, Pull, SealedPin as _, Speed};
use crate::interrupt::typelevel::Interrupt as _; use crate::interrupt::typelevel::Interrupt as _;
use crate::interrupt::{self, Interrupt, InterruptExt}; use crate::interrupt::{self, Interrupt, InterruptExt};
use crate::mode::{Async, Blocking, Mode}; use crate::mode::{Async, Blocking, Mode};
@ -224,6 +224,17 @@ pub enum HalfDuplexConfig {
OpenDrainInternal, OpenDrainInternal,
} }
impl HalfDuplexConfig {
pub fn af_type(self) -> gpio::AfType {
match self {
HalfDuplexConfig::PushPull => AfType::output(OutputType::PushPull, Speed::Medium),
HalfDuplexConfig::OpenDrainExternal => AfType::output(OutputType::OpenDrain, Speed::Medium),
#[cfg(not(gpio_v1))]
HalfDuplexConfig::OpenDrainInternal => AfType::output_pull(OutputType::OpenDrain, Speed::Medium, Pull::Up),
}
}
}
/// Serial error /// Serial error
#[derive(Debug, Eq, PartialEq, Copy, Clone)] #[derive(Debug, Eq, PartialEq, Copy, Clone)]
#[cfg_attr(feature = "defmt", derive(defmt::Format))] #[cfg_attr(feature = "defmt", derive(defmt::Format))]
@ -1066,21 +1077,7 @@ impl<'d> Uart<'d, Async> {
Self::new_inner( Self::new_inner(
peri, peri,
None, None,
new_pin!( new_pin!(tx, half_duplex.af_type()),
tx,
match half_duplex {
HalfDuplexConfig::PushPull => {
AfType::output(OutputType::PushPull, Speed::Medium)
}
HalfDuplexConfig::OpenDrainExternal => {
AfType::output(OutputType::OpenDrain, Speed::Medium)
}
#[cfg(not(gpio_v1))]
HalfDuplexConfig::OpenDrainInternal => {
AfType::output_pull(OutputType::OpenDrain, Speed::Medium, Pull::Up)
}
}
),
None, None,
None, None,
None, None,
@ -1117,21 +1114,7 @@ impl<'d> Uart<'d, Async> {
peri, peri,
None, None,
None, None,
new_pin!( new_pin!(rx, half_duplex.af_type()),
rx,
match half_duplex {
HalfDuplexConfig::PushPull => {
AfType::output(OutputType::PushPull, Speed::Medium)
}
HalfDuplexConfig::OpenDrainExternal => {
AfType::output(OutputType::OpenDrain, Speed::Medium)
}
#[cfg(not(gpio_v1))]
HalfDuplexConfig::OpenDrainInternal => {
AfType::output_pull(OutputType::OpenDrain, Speed::Medium, Pull::Up)
}
}
),
None, None,
None, None,
new_dma!(tx_dma), new_dma!(tx_dma),
@ -1247,21 +1230,7 @@ impl<'d> Uart<'d, Blocking> {
Self::new_inner( Self::new_inner(
peri, peri,
None, None,
new_pin!( new_pin!(tx, half_duplex.af_type()),
tx,
match half_duplex {
HalfDuplexConfig::PushPull => {
AfType::output(OutputType::PushPull, Speed::Medium)
}
HalfDuplexConfig::OpenDrainExternal => {
AfType::output(OutputType::OpenDrain, Speed::Medium)
}
#[cfg(not(gpio_v1))]
HalfDuplexConfig::OpenDrainInternal => {
AfType::output_pull(OutputType::OpenDrain, Speed::Medium, Pull::Up)
}
}
),
None, None,
None, None,
None, None,
@ -1295,21 +1264,7 @@ impl<'d> Uart<'d, Blocking> {
peri, peri,
None, None,
None, None,
new_pin!( new_pin!(rx, half_duplex.af_type()),
rx,
match half_duplex {
HalfDuplexConfig::PushPull => {
AfType::output(OutputType::PushPull, Speed::Medium)
}
HalfDuplexConfig::OpenDrainExternal => {
AfType::output(OutputType::OpenDrain, Speed::Medium)
}
#[cfg(not(gpio_v1))]
HalfDuplexConfig::OpenDrainInternal => {
AfType::output_pull(OutputType::OpenDrain, Speed::Medium, Pull::Up)
}
}
),
None, None,
None, None,
None, None,