Bind DMA channel for SPI and I2C

Author: JalonWong

examples/f103c8/src/main.rs

@@ -167,7 +167,7 @@ fn uart_interrupt_init<U: UartPeriphExt + 'static>(
 ) -> UartPollTask<impl embedded_io::Write + 'static, impl embedded_io::Read + 'static> {
     let (rx, mut rx_it) = rx.into_interrupt(64, SysTickTimeout::new(100));
     let (tx, mut tx_it) =
-        tx.into_interrupt(64, SysTickTimeout::new(0), SysTickTimeout::new(20_000));
+        tx.into_interrupt(32, SysTickTimeout::new(0), SysTickTimeout::new(32 * 200));
     interrupt_callback.set(mcu, move || {
         rx_it.handler();
         tx_it.handler();
@@ -189,7 +189,7 @@ fn uart_dma_init<'r, U: UartPeriphExt + 'static>(
         dma_tx,
         32,
         SysTickTimeout::new(0),
-        SysTickTimeout::new(20_000),
+        SysTickTimeout::new(32 * 200),
     );
     interrupt_callback.set(mcu, move || {
         tx_it.interrupt_reload();

scripts/generate_dma_table.py

@@ -20,8 +20,8 @@ def match_filter(filter: str, name: str) -> bool:
 }
 
 
-TEMPLATE = """
-impl DmaBind{func}<pac::{peri}> for {dma}::{ch} {{}}"""
+TEMPLATE = """impl DmaBind{func}<pac::{peri}> for {dma}::{ch} {{}}
+"""
 
 
 def write_item(dma: str, ch: str, func: str, w: Write) -> None:
@@ -32,6 +32,7 @@ def write_item(dma: str, ch: str, func: str, w: Write) -> None:
 
 
 def write_table(d: dict, filter: str, w: Write) -> None:
+    w.write("\n")
     for dma, ch_table in sorted(d.items()):
         for ch, func_list in sorted(ch_table.items()):
             for func in sorted(func_list):
@@ -78,6 +79,8 @@ def csv_to_code(csv_file: str, show: bool = False) -> None:
     )
 
     write_table(d, "UART", w)
+    write_table(d, "SPI", w)
+    write_table(d, "I2C", w)
 
     w.close()
     subprocess.run(["rustfmt", target_file])

src/dma.rs

@@ -1,6 +1,6 @@
 //! # Direct Memory Access
 
-use crate::{Steal, common::wrap_trait::*, pac, rcc::Rcc};
+use crate::{common::wrap_trait::*, pac, rcc::Rcc, Steal};
 
 pub use crate::common::dma::*;
 pub type DmaPriority = pac::dma1::ch::cr::PL;
@@ -227,3 +227,15 @@ impl DmaBindRx<pac::USART2> for dma1::C6 {}
 impl DmaBindTx<pac::USART2> for dma1::C7 {}
 impl DmaBindRx<pac::UART4> for dma2::C3 {}
 impl DmaBindTx<pac::UART4> for dma2::C5 {}
+
+impl DmaBindRx<pac::SPI1> for dma1::C2 {}
+impl DmaBindTx<pac::SPI1> for dma1::C3 {}
+impl DmaBindRx<pac::SPI2> for dma1::C4 {}
+impl DmaBindTx<pac::SPI2> for dma1::C5 {}
+impl DmaBindRx<pac::SPI3> for dma2::C1 {}
+impl DmaBindTx<pac::SPI3> for dma2::C2 {}
+
+impl DmaBindTx<pac::I2C2> for dma1::C4 {}
+impl DmaBindRx<pac::I2C2> for dma1::C5 {}
+impl DmaBindTx<pac::I2C1> for dma1::C6 {}
+impl DmaBindRx<pac::I2C1> for dma1::C7 {}