Merge pull request #25 from ijager/full_serial

Support different USART feature sets (Full and Basic) and add FIFO and RTO options

Author: andresv

examples/color_sensor.rs

@@ -56,7 +56,7 @@ const APP: () = {
         s2: PA9<Output<PushPull>>,
         s3: PA7<Output<PushPull>>,
         led: PA5<Output<PushPull>>,
-        uart: Serial<stm32::USART2>,
+        uart: Serial<stm32::USART2, serial::FullConfig>,
         timer: Timer<stm32::TIM16>,
         log_timer: Timer<stm32::TIM17>,
     }
@@ -94,7 +94,7 @@ const APP: () = {
         let uart = ctx
             .device
             .USART2
-            .usart(tx, rx, serial::Config::default(), &mut rcc)
+            .usart(tx, rx, serial::FullConfig::default(), &mut rcc)
             .unwrap();
 
         init::LateResources {

examples/sdcard.rs

@@ -33,7 +33,7 @@ fn main() -> ! {
 
     let mut uart = dp
         .USART2
-        .usart(gpioa.pa2, gpioa.pa3, serial::Config::default(), &mut rcc)
+        .usart(gpioa.pa2, gpioa.pa3, serial::FullConfig::default(), &mut rcc)
         .unwrap();
 
     let sdmmc_spi = dp.SPI1.spi(

examples/uart-fifo.rs

@@ -0,0 +1,58 @@
+// #![deny(warnings)]
+#![deny(unsafe_code)]
+#![no_main]
+#![no_std]
+
+extern crate cortex_m_rt as rt;
+extern crate panic_halt;
+extern crate stm32g0xx_hal as hal;
+
+use core::fmt::Write;
+
+use hal::prelude::*;
+use hal::serial::*;
+use hal::stm32;
+use rt::entry;
+
+#[entry]
+fn main() -> ! {
+    let dp = stm32::Peripherals::take().expect("cannot take peripherals");
+    let mut rcc = dp.RCC.constrain();
+    let gpioa = dp.GPIOA.split(&mut rcc);
+
+    let mut usart1 = dp.USART1.usart(
+        gpioa.pa9,
+        gpioa.pa10,
+        FullConfig::default().baudrate(115200.bps())
+                                    .fifo_enable()
+                                    .rx_fifo_enable_interrupt()
+                                    .rx_fifo_threshold(FifoThreshold::FIFO_4_BYTES),
+        &mut rcc).unwrap();
+
+
+    writeln!(usart1, "Hello USART1\r\n").unwrap();
+
+    let (mut tx1, mut rx1) = usart1.split();
+
+
+    let mut cnt = 0;
+    loop {
+        if rx1.fifo_threshold_reached() {
+            loop {
+                match rx1.read() {
+                    Err(nb::Error::WouldBlock) => {
+                        // no more data available in fifo
+                        break;
+                    },
+                    Err(nb::Error::Other(_err)) => {
+                        // Handle other error Overrun, Framing, Noise or Parity
+                    },
+                    Ok(byte) => {
+                        writeln!(tx1, "{}: {}\n", cnt, byte).unwrap();
+                        cnt += 1;
+                    },
+                }
+            }
+        }
+    }
+}

examples/uart.rs

@@ -5,14 +5,13 @@
 
 extern crate cortex_m;
 extern crate cortex_m_rt as rt;
-extern crate nb;
 extern crate panic_halt;
 extern crate stm32g0xx_hal as hal;
 
 use core::fmt::Write;
 
 use hal::prelude::*;
-use hal::serial::Config;
+use hal::serial::FullConfig;
 use hal::stm32;
 use nb::block;
 use rt::entry;
@@ -24,7 +23,7 @@ fn main() -> ! {
     let gpioa = dp.GPIOA.split(&mut rcc);
     let mut usart = dp
         .USART2
-        .usart(gpioa.pa2, gpioa.pa3, Config::default(), &mut rcc)
+        .usart(gpioa.pa2, gpioa.pa3, FullConfig::default(), &mut rcc)
         .unwrap();
 
     writeln!(usart, "Hello\r").unwrap();