Merge pull request #29 from robyoung/rewrite-serial_port-as-macro

Rewrite serial_port as a macro

Author: therealprof

examples/i2c_hal_printmagserial.rs

@@ -48,14 +48,7 @@ fn main() -> ! {
             let _ = i2c.write(0xE, &[0x11, 0x7f]);
 
             /* Initialise serial port on the micro:bit */
-            //let (mut tx, _) = microbit::serial_port(gpio, p.UART0, BAUD115200);
-
-            /* Configure RX and TX pins accordingly */
-            let tx = gpio.pin24.into_push_pull_output().into();
-            let rx = gpio.pin25.into_floating_input().into();
-
-            /* Set up serial port using the prepared pins */
-            let (mut tx, _) = serial::Serial::uart0(p.UART0, tx, rx, BAUD115200).split();
+            let (mut tx, _) = microbit::serial_port!(gpio, p.UART0, BAUD115200);
 
             let _ = write!(&mut tx, "\n\rWelcome to the magnetometer reader!\n\r");
 

src/lib.rs

@@ -7,23 +7,20 @@ pub use nb::*;
 
 pub use crate::hal::nrf51::*;
 
-use crate::hal::gpio::gpio::Parts;
-use crate::hal::serial::*;
-
 pub mod display;
 pub mod led;
 
-// FIXME: Rewrite as macro to prevent problems consuming parts of gpio
-pub fn serial_port(
-    gpio: Parts,
-    uart: hal::nrf51::UART0,
-    speed: BAUDRATE_A,
-) -> (Tx<hal::nrf51::UART0>, Rx<hal::nrf51::UART0>) {
-    /* Configure RX and TX pins accordingly */
-    let tx = gpio.pin24.into_push_pull_output().into();
-    let rx = gpio.pin25.into_floating_input().into();
+#[macro_export]
+macro_rules! serial_port {
+    ( $gpio:expr, $uart:expr, $speed:expr ) => {{
+        use nrf51_hal::serial::Serial;
+
+        /* Configure RX and TX pins accordingly */
+        let tx = $gpio.pin24.into_push_pull_output().into();
+        let rx = $gpio.pin25.into_floating_input().into();
 
-    /* Set up serial port using the prepared pins */
-    let serial = Serial::uart0(uart, tx, rx, speed);
-    serial.split()
+        /* Set up serial port using the prepared pins */
+        let serial = Serial::uart0($uart, tx, rx, $speed);
+        serial.split()
+    }};
 }