beautify

Author: burrbull

src/can.rs

@@ -46,8 +46,8 @@ pub mod can1 {
 
     remap! {
         pac::CAN1: [
-            PA12, PA11 => 0;
-            PB9, PB8 => 2;
+            Tx: PA12, Rx: PA11 => 0;
+            Tx: PB9,  Rx: PB8  => 2;
         ]
     }
 }
@@ -58,14 +58,14 @@ pub mod can2 {
 
     remap! {
         pac::CAN2: [
-            PB6, PB5 => 0;
-            PB13, PB12 => 1;
+            Tx: PB6,  Rx: PB5  => 0;
+            Tx: PB13, Rx: PB12 => 1;
         ]
     }
 }
 
 macro_rules! remap {
-    ($PER:ty: [$($TX:ident, $RX:ident => $remap:literal;)+]) => {
+    ($PER:ty: [$(Tx: $TX:ident, Rx: $RX:ident => $remap:literal;)+]) => {
         pub enum Tx {
             $(
                 $TX(gpio::$TX<Alternate>),

src/i2c.rs

@@ -105,8 +105,8 @@ pub mod i2c1 {
 
     remap! {
         pac::I2C1: [
-            PB6, PB7 => MAPR: 0;
-            PB8, PB9 => MAPR: 1;
+            Scl: PB6, Sda: PB7 => MAPR: 0;
+            Scl: PB8, Sda: PB9 => MAPR: 1;
         ]
     }
 }
@@ -115,14 +115,14 @@ pub mod i2c2 {
 
     remap! {
         pac::I2C2: [
-            PB10, PB11;
+            Scl: PB10, Sda: PB11;
         ]
     }
 }
 
 macro_rules! remap {
     ($PER:ty: [
-        $($SCL:ident, $SDA:ident $( => $MAPR:ident: $remap:literal)?;)+
+        $(Scl: $SCL:ident, Sda: $SDA:ident $( => $MAPR:ident: $remap:literal)?;)+
     ]) => {
         pub enum Scl {
             $(

src/serial.rs

@@ -101,8 +101,8 @@ pub mod usart1 {
 
     remap! {
         pac::USART1: [
-            PA9, PA10 => 0;
-            PB6, PB7  => 1;
+            Tx: PA9, Rx: PA10 => 0;
+            Tx: PB6, Rx: PB7  => 1;
         ]
     }
 }
@@ -112,8 +112,8 @@ pub mod usart2 {
 
     remap! {
         pac::USART2: [
-            PA2, PA3 => 0;
-            PD5, PD6 => 1;
+            Tx: PA2, Rx: PA3 => 0;
+            Tx: PD5, Rx: PD6 => 1;
         ]
     }
 }
@@ -123,15 +123,15 @@ pub mod usart3 {
 
     remap! {
         pac::USART3: [
-            PB10, PB11 => 0;
-            PC10, PC11 => 1;
-            PD8, PD9 => 3;
+            Tx: PB10, Rx: PB11 => 0;
+            Tx: PC10, Rx: PC11 => 1;
+            Tx: PD8,  Rx: PD9  => 3;
         ]
     }
 }
 
 macro_rules! remap {
-    ($PER:ty: [$($TX:ident, $RX:ident => $remap:literal;)+]) => {
+    ($PER:ty: [$(Tx: $TX:ident, Rx: $RX:ident => $remap:literal;)+]) => {
         pub enum Tx<Otype> {
             $(
                 $TX(gpio::$TX<Alternate<Otype>>),

src/spi.rs

@@ -124,8 +124,8 @@ pub mod spi1 {
 
     remap! {
         pac::SPI1: [
-            PA5, PA6, PA7 => MAPR: 0;
-            PB3, PB4, PB5  => MAPR: 1;
+            Sck: PA5, Miso: PA6, Mosi: PA7 => MAPR: 0;
+            Sck: PB3, Miso: PB4, Mosi: PB5 => MAPR: 1;
         ]
     }
 }
@@ -135,7 +135,7 @@ pub mod spi2 {
 
     remap! {
         pac::SPI2: [
-            PB13, PB14, PB15;
+            Sck: PB13, Miso: PB14, Mosi: PB15;
         ]
     }
 }
@@ -146,21 +146,21 @@ pub mod spi3 {
     #[cfg(not(feature = "connectivity"))]
     remap! {
         pac::SPI3: [
-            PB3, PB4, PB5;
+            Sck: PB3, Miso: PB4, Mosi: PB5;
         ]
     }
     #[cfg(feature = "connectivity")]
     remap! {
         pac::SPI3: [
-            PB3, PB4, PB5 => MAPR: 0;
-            PC10, PC11, PC12  => MAPR: 1;
+            Sck: PB3,  Miso: PB4,  Mosi: PB5  => MAPR: 0;
+            Sck: PC10, Miso: PC11, Mosi: PC12 => MAPR: 1;
         ]
     }
 }
 
 macro_rules! remap {
     ($PER:ty: [
-        $($SCK:ident, $MISO:ident, $MOSI:ident $( => $MAPR:ident: $remap:literal)?;)+
+        $(Sck: $SCK:ident, Miso: $MISO:ident, Mosi: $MOSI:ident $( => $MAPR:ident: $remap:literal)?;)+
     ]) => {
         pub enum Sck {
             $(