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

feature-gate dma write, make trigger not return a result

Browse Source
This commit is contained in:
JuliDi 2023-06-27 18:17:51 +02:00
parent e7bc84dda8
commit afec1b439b
No known key found for this signature in database
GPG Key ID: E1E90AE563D09D63
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
embassy-stm32/src/dac/mod.rs
View File

@ -153,11 +153,10 @@ pub trait DacChannel<T: Instance, Tx> {
} }
/// Perform a software trigger on `ch` /// Perform a software trigger on `ch`
fn trigger(&mut self) -> Result<(), Error> { fn trigger(&mut self) {
T::regs().swtrigr().write(|reg| { T::regs().swtrigr().write(|reg| {
reg.set_swtrig(Self::CHANNEL.index(), true); reg.set_swtrig(Self::CHANNEL.index(), true);
}); });
Ok(())
} }
/// Set a value to be output by the DAC on trigger. /// Set a value to be output by the DAC on trigger.
@ -230,6 +229,8 @@ impl<'d, T: Instance, Tx> DacCh1<'d, T, Tx> {
} }
/// Select a new trigger for this channel /// Select a new trigger for this channel
///
/// **Important**: This disables the channel!
pub fn select_trigger(&mut self, trigger: Ch1Trigger) -> Result<(), Error> { pub fn select_trigger(&mut self, trigger: Ch1Trigger) -> Result<(), Error> {
unwrap!(self.disable_channel()); unwrap!(self.disable_channel());
T::regs().cr().modify(|reg| { T::regs().cr().modify(|reg| {
@ -245,6 +246,7 @@ impl<'d, T: Instance, Tx> DacCh1<'d, T, Tx> {
/// Note that for performance reasons in circular mode the transfer complete interrupt is disabled. /// Note that for performance reasons in circular mode the transfer complete interrupt is disabled.
/// ///
/// **Important:** Channel 1 has to be configured for the DAC instance! /// **Important:** Channel 1 has to be configured for the DAC instance!
#[cfg(all(bdma, not(dma)))] // It currently only works with BDMA-only chips (DMA should theoretically work though)
pub async fn write(&mut self, data: ValueArray<'_>, circular: bool) -> Result<(), Error> pub async fn write(&mut self, data: ValueArray<'_>, circular: bool) -> Result<(), Error>
where where
Tx: DmaCh1<T>, Tx: DmaCh1<T>,
@ -355,6 +357,7 @@ impl<'d, T: Instance, Tx> DacCh2<'d, T, Tx> {
/// Note that for performance reasons in circular mode the transfer complete interrupt is disabled. /// Note that for performance reasons in circular mode the transfer complete interrupt is disabled.
/// ///
/// **Important:** Channel 2 has to be configured for the DAC instance! /// **Important:** Channel 2 has to be configured for the DAC instance!
#[cfg(all(bdma, not(dma)))] // It currently only works with BDMA-only chips (DMA should theoretically work though)
pub async fn write(&mut self, data: ValueArray<'_>, circular: bool) -> Result<(), Error> pub async fn write(&mut self, data: ValueArray<'_>, circular: bool) -> Result<(), Error>
where where
Tx: DmaCh2<T>, Tx: DmaCh2<T>,