Fix examples.

stm32-rs · May 15, 2022 · f00caf6 · f00caf6
1 parent 48d4f93
commit f00caf6
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/examples/rtic_frame_serial_dma.rs b/examples/rtic_frame_serial_dma.rs
@@ -24,8 +24,14 @@ use heapless::{
 use panic_halt as _;
 use rtic::app;
 use stm32l4xx_hal as hal;
-use stm32l4xx_hal::dma::{RxDma, TxDma};
-use stm32l4xx_hal::serial::{Rx, Tx};
+use stm32l4xx_hal::{
+    dma::{RxDma, TxDma},
+    gpio::{self, Alternate, PushPull},
+    serial::{Rx, Tx},
+};
+
+type TxPin = gpio::PA2<Alternate<PushPull, 7>>;
+type RxPin = gpio::PA3<Alternate<PushPull, 7>>;
 
 // The pool gives out `Box<DMAFrame>`s that can hold 8 bytes
 pool!(
@@ -36,8 +42,10 @@ pool!(
 #[app(device = stm32l4xx_hal::stm32, peripherals = true)]
 const APP: () = {
     struct Resources {
-        frame_reader: FrameReader<Box<SerialDMAPool>, RxDma<Rx<USART2>, dma::dma1::C6>, 8>,
-        frame_sender: FrameSender<Box<SerialDMAPool>, TxDma<Tx<USART2>, dma::dma1::C7>, 8>,
+        frame_reader:
+            FrameReader<Box<SerialDMAPool>, RxDma<Rx<USART2, (TxPin, RxPin)>, dma::dma1::C6>, 8>,
+        frame_sender:
+            FrameSender<Box<SerialDMAPool>, TxDma<Tx<USART2, (TxPin, RxPin)>, dma::dma1::C7>, 8>,
     }
 
     #[init]

diff --git a/examples/serial_echo_rtic.rs b/examples/serial_echo_rtic.rs
@@ -7,16 +7,20 @@ use heapless::{consts::U8, spsc};
 use nb::block;
 use rtt_target::{rprint, rprintln};
 use stm32l4xx_hal::{
+    gpio::{self, Alternate, PushPull},
     pac::{self, USART2},
     prelude::*,
     serial::{self, Config, Serial},
 };
 
+type TxPin = gpio::PA2<Alternate<PushPull, 7>>;
+type RxPin = gpio::PA3<Alternate<PushPull, 7>>;
+
 #[rtic::app(device = stm32l4xx_hal::pac)]
 const APP: () = {
     struct Resources {
-        rx: serial::Rx<USART2>,
-        tx: serial::Tx<USART2>,
+        rx: serial::Rx<USART2, (TxPin, RxPin)>,
+        tx: serial::Tx<USART2, (TxPin, RxPin)>,
 
         rx_prod: spsc::Producer<'static, u8, U8>,
         rx_cons: spsc::Consumer<'static, u8, U8>,