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

Fixed owned split and implemented split_by_ref.

Browse Source
This commit is contained in:
Vincenzo Marturano 2024-10-25 12:54:06 +02:00
parent 874dbec5a4
commit 71fe8a7b90
1 changed files with 60 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
embassy-rp/src/pwm.rs
View File

@ -347,28 +347,32 @@ impl<'d> Pwm<'d> {
#[inline] #[inline]
/// Split Pwm driver to allow separate duty cycle control of each channel /// Split Pwm driver to allow separate duty cycle control of each channel
pub fn split(self) -> (Option<PwmOutput<'d>>, Option<PwmOutput<'d>>) { pub fn split(mut self) -> (Option<PwmOutput<'d>>, Option<PwmOutput<'d>>) {
(
let pwm_output_a = if let Some(pin_a) = self.pin_a { self.pin_a
Some(PwmOutput::new(PwmChannelPin::A(pin_a), self.slice.clone())) .take()
}else{ .map(|pin| PwmOutput::new(PwmChannelPin::A(pin), self.slice.clone(), true)),
None self.pin_b
}; .take()
.map(|pin| PwmOutput::new(PwmChannelPin::B(pin), self.slice.clone(), true)),
let pwm_output_b = if let Some(pin_b) = self.pin_b { )
Some(PwmOutput::new(PwmChannelPin::B(pin_b), self.slice.clone()))
}else {
None
};
(pwm_output_a,pwm_output_b)
} }
pub fn split_by_ref(&mut self) -> (Option<PwmOutput<'_>>, Option<PwmOutput<'_>>) {
(
self.pin_a
.as_mut()
.map(|pin| PwmOutput::new(PwmChannelPin::A(pin.reborrow()), self.slice.clone(), false)),
self.pin_b
.as_mut()
.map(|pin| PwmOutput::new(PwmChannelPin::B(pin.reborrow()), self.slice.clone(), false)),
)
}
} }
enum PwmChannelPin<'d> { enum PwmChannelPin<'d> {
A(PeripheralRef<'d, AnyPin>), A(PeripheralRef<'d, AnyPin>),
B(PeripheralRef<'d, AnyPin>) B(PeripheralRef<'d, AnyPin>),
} }
/// Single channel of Pwm driver. /// Single channel of Pwm driver.
@ -376,11 +380,47 @@ pub struct PwmOutput<'d> {
//pin that can be ether ChannelAPin or ChannelBPin //pin that can be ether ChannelAPin or ChannelBPin
channel_pin: PwmChannelPin<'d>, channel_pin: PwmChannelPin<'d>,
slice: usize, slice: usize,
is_owned: bool,
} }
impl<'d> PwmOutput<'d> { impl<'d> PwmOutput<'d> {
fn new(channel_pin: PwmChannelPin<'d>, slice: usize) -> Self { fn new(channel_pin: PwmChannelPin<'d>, slice: usize, is_owned: bool) -> Self {
Self { channel_pin ,slice } Self {
channel_pin,
slice,
is_owned,
}
}
}
impl<'d> Drop for PwmOutput<'d> {
fn drop(&mut self) {
if self.is_owned {
let p = pac::PWM.ch(self.slice);
match &self.channel_pin {
PwmChannelPin::A(pin) => {
p.cc().modify(|w| {
w.set_a(0);
});
pin.gpio().ctrl().write(|w| w.set_funcsel(31));
///Enable pin PULL-DOWN
pin.pad_ctrl().modify(|w| {
w.set_pde(true);
});
}
PwmChannelPin::B(pin) => {
p.cc().modify(|w| {
w.set_b(0);
});
pin.gpio().ctrl().write(|w| w.set_funcsel(31));
///Enable pin PULL-DOWN
pin.pad_ctrl().modify(|w| {
w.set_pde(true);
});
}
}
}
} }
} }