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

pwm store and deconfigure pins

Browse Source
This commit is contained in:
Jacob Rosenthal
2021-11-10 11:02:43 -07:00
parent 03f2c593d6
commit 65843c033e
1 changed files with 51 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
embassy-nrf/src/pwm.rs
View File

@@ -7,7 +7,7 @@ use embassy::util::Unborrow;
use embassy_hal_common::unborrow; use embassy_hal_common::unborrow;
use crate::gpio::sealed::Pin as _; use crate::gpio::sealed::Pin as _;
use crate::gpio::OptionalPin as GpioOptionalPin; use crate::gpio::{AnyPin, OptionalPin as GpioOptionalPin, Pin};
use crate::interrupt::Interrupt; use crate::interrupt::Interrupt;
use crate::pac; use crate::pac;
use crate::util::slice_in_ram_or; use crate::util::slice_in_ram_or;
@@ -15,10 +15,18 @@ use crate::util::slice_in_ram_or;
/// Interface to the PWM peripheral /// Interface to the PWM peripheral
pub struct SimplePwm<'d, T: Instance> { pub struct SimplePwm<'d, T: Instance> {
phantom: PhantomData<&'d mut T>, phantom: PhantomData<&'d mut T>,
ch0: Option<AnyPin>,
ch1: Option<AnyPin>,
ch2: Option<AnyPin>,
ch3: Option<AnyPin>,
} }
pub struct SequencePwm<'d, T: Instance> { pub struct SequencePwm<'d, T: Instance> {
phantom: PhantomData<&'d mut T>, phantom: PhantomData<&'d mut T>,
ch0: Option<AnyPin>,
ch1: Option<AnyPin>,
ch2: Option<AnyPin>,
ch3: Option<AnyPin>,
} }
#[derive(Debug, Clone, Copy, PartialEq, Eq)] #[derive(Debug, Clone, Copy, PartialEq, Eq)]
@@ -130,6 +138,10 @@ impl<'d, T: Instance> SequencePwm<'d, T> {
Ok(Self { Ok(Self {
phantom: PhantomData, phantom: PhantomData,
ch0: ch0.degrade_optional(),
ch1: ch1.degrade_optional(),
ch2: ch2.degrade_optional(),
ch3: ch3.degrade_optional(),
}) })
} }
@@ -206,9 +218,24 @@ impl<'a, T: Instance> Drop for SequencePwm<'a, T> {
self.stop(); self.stop();
self.disable(); self.disable();
info!("pwm drop: done"); if let Some(pin) = &self.ch0 {
pin.set_low();
pin.conf().write(|w| w);
}
if let Some(pin) = &self.ch1 {
pin.set_low();
pin.conf().write(|w| w);
}
if let Some(pin) = &self.ch2 {
pin.set_low();
pin.conf().write(|w| w);
}
if let Some(pin) = &self.ch3 {
pin.set_low();
pin.conf().write(|w| w);
}
// TODO: disable pins info!("pwm drop: done");
} }
} }
@@ -360,6 +387,10 @@ impl<'d, T: Instance> SimplePwm<'d, T> {
Self { Self {
phantom: PhantomData, phantom: PhantomData,
ch0: ch0.degrade_optional(),
ch1: ch1.degrade_optional(),
ch2: ch2.degrade_optional(),
ch3: ch3.degrade_optional(),
} }
} }
@@ -374,7 +405,6 @@ impl<'d, T: Instance> SimplePwm<'d, T> {
r.tasks_stop.write(|w| unsafe { w.bits(0x01) }); r.tasks_stop.write(|w| unsafe { w.bits(0x01) });
} }
// todo should this do.. something useful
/// Enables the PWM generator. /// Enables the PWM generator.
#[inline(always)] #[inline(always)]
pub fn enable(&self) { pub fn enable(&self) {
@@ -382,7 +412,6 @@ impl<'d, T: Instance> SimplePwm<'d, T> {
r.enable.write(|w| w.enable().enabled()); r.enable.write(|w| w.enable().enabled());
} }
// todo should this stop the task? or should you just use set_duty to 0?
/// Disables the PWM generator. /// Disables the PWM generator.
#[inline(always)] #[inline(always)]
pub fn disable(&self) { pub fn disable(&self) {
@@ -461,9 +490,24 @@ impl<'a, T: Instance> Drop for SimplePwm<'a, T> {
self.stop(); self.stop();
self.disable(); self.disable();
info!("pwm drop: done"); if let Some(pin) = &self.ch0 {
pin.set_low();
pin.conf().write(|w| w);
}
if let Some(pin) = &self.ch1 {
pin.set_low();
pin.conf().write(|w| w);
}
if let Some(pin) = &self.ch2 {
pin.set_low();
pin.conf().write(|w| w);
}
if let Some(pin) = &self.ch3 {
pin.set_low();
pin.conf().write(|w| w);
}
// TODO: disable pins info!("pwm drop: done");
} }
} }