jmm/bluepill-rust-blinky
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

remove DMXIdle struct

Browse source
This commit is contained in:
Jörn-Michael Miehe 2024-03-21 23:35:46 +00:00
parent dd8dfeacd6
commit 75002d4bdc
1 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
bluepill-rs/src/dmx.rs
View file

@ -5,13 +5,8 @@ type _TxDma = dma::TxDma<serial::Tx<pac::USART1>, dma::dma1::C4>;
type _DMXUniverse<const DMX_LEN: usize> = &'static mut [u8; DMX_LEN]; type _DMXUniverse<const DMX_LEN: usize> = &'static mut [u8; DMX_LEN];
type _DMXTransfer<const DMX_LEN: usize> = dma::Transfer<dma::R, _DMXUniverse<DMX_LEN>, _TxDma>; type _DMXTransfer<const DMX_LEN: usize> = dma::Transfer<dma::R, _DMXUniverse<DMX_LEN>, _TxDma>;
pub struct DMXIdle<const DMX_LEN: usize> {
tx: Option<_TxDma>,
txbuffer: Option<_DMXUniverse<DMX_LEN>>,
}
pub enum DMX<const DMX_LEN: usize = 512> { pub enum DMX<const DMX_LEN: usize = 512> {
Idle(DMXIdle<DMX_LEN>), Idle(Option<_TxDma>, Option<_DMXUniverse<DMX_LEN>>),
Busy(Option<_DMXTransfer<DMX_LEN>>), Busy(Option<_DMXTransfer<DMX_LEN>>),
} }
@ -26,10 +21,7 @@ impl<const DMX_LEN: usize> DMX<DMX_LEN> {
{ {
serial.reconfigure(250_000.bps(), &clocks).unwrap(); serial.reconfigure(250_000.bps(), &clocks).unwrap();
Self::Idle(DMXIdle { Self::Idle(Some(serial.tx.with_dma(channel)), None)
tx: Some(serial.tx.with_dma(channel)),
txbuffer: None,
})
} }
pub fn send(&mut self, data: &[u8; DMX_LEN]) { pub fn send(&mut self, data: &[u8; DMX_LEN]) {
@ -37,15 +29,15 @@ impl<const DMX_LEN: usize> DMX<DMX_LEN> {
self.wait(); self.wait();
} }
let Self::Idle(idle) = self else { let Self::Idle(tx, txbuffer) = self else {
panic!("Broken DMX State!") panic!("Broken DMX State!")
}; };
let txbuffer = idle.txbuffer.take().unwrap_or_else(|| { let txbuffer = txbuffer.take().unwrap_or_else(|| {
let foo = singleton!(: [u8; 512] = [0u8; 512]).unwrap(); let foo = singleton!(: [u8; 512] = [0u8; 512]).unwrap();
(&mut foo[..DMX_LEN]).try_into().unwrap() (&mut foo[..DMX_LEN]).try_into().unwrap()
}); });
let tx = idle.tx.take().unwrap(); let tx = tx.take().unwrap();
txbuffer.copy_from_slice(data); txbuffer.copy_from_slice(data);
*self = Self::Busy(Some(tx.write(txbuffer))); *self = Self::Busy(Some(tx.write(txbuffer)));
@ -57,9 +49,6 @@ impl<const DMX_LEN: usize> DMX<DMX_LEN> {
let xfer = xfer.take().unwrap(); let xfer = xfer.take().unwrap();
let (txbuffer, tx) = xfer.wait(); let (txbuffer, tx) = xfer.wait();
*self = Self::Idle(DMXIdle { *self = Self::Idle(Some(tx), Some(txbuffer));
tx: Some(tx),
txbuffer: Some(txbuffer),
});
} }
} }