PushPull/Floating by default

Author: burrbull

examples/can-echo.rs

@@ -10,7 +10,7 @@ use panic_halt as _;
 use bxcan::filter::Mask32;
 use cortex_m_rt::entry;
 use nb::block;
-use stm32f1xx_hal::{gpio::Floating, pac, prelude::*};
+use stm32f1xx_hal::{pac, prelude::*};
 
 #[entry]
 fn main() -> ! {
@@ -31,7 +31,7 @@ fn main() -> ! {
         let rx = gpioa.pa11;
         let tx = gpioa.pa12;
 
-        let can = dp.CAN1.can::<Floating>(
+        let can = dp.CAN1.can(
             #[cfg(not(feature = "connectivity"))]
             dp.USB,
             (tx, rx, &mut afio.mapr),
@@ -51,9 +51,7 @@ fn main() -> ! {
     #[cfg(feature = "connectivity")]
     let _can2 = {
         let gpiob = dp.GPIOB.split();
-        let can = dp
-            .CAN2
-            .can::<Floating>((gpiob.pb6, gpiob.pb5, &mut afio.mapr));
+        let can = dp.CAN2.can((gpiob.pb6, gpiob.pb5, &mut afio.mapr));
 
         // APB1 (PCLK1): 8MHz, Bit rate: 125kBit/s, Sample Point 87.5%
         // Value was calculated with http://www.bittiming.can-wiki.info/

examples/serial_9bits.rs

@@ -13,10 +13,9 @@ use cortex_m_rt::entry;
 use nb::block;
 use panic_halt as _;
 use stm32f1xx_hal::{
-    gpio::{Floating, PushPull},
     pac,
     prelude::*,
-    serial::{self, Config, Error, Serial},
+    serial::{self, Config, Error},
 };
 
 // The address of the slave device.
@@ -119,8 +118,10 @@ fn main() -> ! {
 
     // Set up the usart device. Take ownership over the USART register and tx/rx pins. The rest of
     // the registers are used to enable and configure the device.
-    let serial = Serial::<_, PushPull, Floating>::new(
-        p.USART3,
+    //
+    //let serial = Serial::<_, PushPull, Floating>::new(p.USART3,
+    // or shorter
+    let serial = p.USART3.serial(
         (tx_pin, rx_pin, &mut afio.mapr),
         Config::default()
             .baudrate(9600.bps())

examples/spi-slave.rs

@@ -20,7 +20,6 @@ pub const MODE: Mode = Mode {
 };
 
 use stm32f1xx_hal::{
-    gpio::Floating,
     pac::{self, interrupt, Peripherals, SPI2},
     prelude::*,
     spi::{Event, SpiSlave},
@@ -49,7 +48,7 @@ fn main() -> ! {
 
     let spi1 = dp
         .SPI1
-        .spi::<Floating>((sck, miso, mosi, &mut afio.mapr), MODE, 10.kHz(), &clocks);
+        .spi((sck, miso, mosi, &mut afio.mapr), MODE, 10.kHz(), &clocks);
 
     // SPI2
     // Convert pins before SPI initialization

src/can.rs

@@ -122,34 +122,34 @@ macro_rules! remap {
 use remap;
 
 pub trait CanExt: Sized + Instance {
-    fn can<PULL>(
+    fn can(
         self,
         #[cfg(not(feature = "connectivity"))] usb: pac::USB,
-        pins: impl Into<Self::Pins<PULL>>,
-    ) -> Can<Self, PULL>;
-    fn can_loopback<PULL>(
+        pins: impl Into<Self::Pins<Floating>>,
+    ) -> Can<Self, Floating>;
+    fn can_loopback(
         self,
         #[cfg(not(feature = "connectivity"))] usb: pac::USB,
-    ) -> Can<Self, PULL>;
+    ) -> Can<Self, Floating>;
 }
 
 impl<CAN: Instance> CanExt for CAN {
-    fn can<PULL>(
+    fn can(
         self,
         #[cfg(not(feature = "connectivity"))] usb: pac::USB,
-        pins: impl Into<Self::Pins<PULL>>,
-    ) -> Can<Self, PULL> {
+        pins: impl Into<Self::Pins<Floating>>,
+    ) -> Can<Self, Floating> {
         Can::new(
             self,
             #[cfg(not(feature = "connectivity"))]
             usb,
             pins,
         )
     }
-    fn can_loopback<PULL>(
+    fn can_loopback(
         self,
         #[cfg(not(feature = "connectivity"))] usb: pac::USB,
-    ) -> Can<Self, PULL> {
+    ) -> Can<Self, Floating> {
         Can::new_loopback(
             self,
             #[cfg(not(feature = "connectivity"))]

src/serial.rs

@@ -179,21 +179,21 @@ macro_rules! remap {
 use remap;
 
 pub trait SerialExt: Sized + Instance {
-    fn serial<Otype, PULL>(
+    fn serial(
         self,
-        pins: impl Into<Self::Pins<Otype, PULL>>,
+        pins: impl Into<Self::Pins<PushPull, Floating>>,
         config: impl Into<Config>,
         clocks: &Clocks,
-    ) -> Serial<Self, Otype, PULL>;
+    ) -> Serial<Self, PushPull, Floating>;
 }
 
 impl<USART: Instance> SerialExt for USART {
-    fn serial<Otype, PULL>(
+    fn serial(
         self,
-        pins: impl Into<Self::Pins<Otype, PULL>>,
+        pins: impl Into<Self::Pins<PushPull, Floating>>,
         config: impl Into<Config>,
         clocks: &Clocks,
-    ) -> Serial<Self, Otype, PULL> {
+    ) -> Serial<Self> {
         Serial::new(self, pins, config, clocks)
     }
 }

src/spi.rs

@@ -292,51 +292,51 @@ macro_rules! remap {
 use remap;
 
 pub trait SpiExt: Sized + Instance {
-    fn spi<PULL>(
+    fn spi(
         self,
-        pins: impl Into<Self::MasterPins<PULL>>,
+        pins: impl Into<Self::MasterPins<Floating>>,
         mode: Mode,
         freq: Hertz,
         clocks: &Clocks,
-    ) -> Spi<Self, u8, PULL>;
-    fn spi_u16<PULL>(
+    ) -> Spi<Self, u8, Floating>;
+    fn spi_u16(
         self,
-        pins: impl Into<Self::MasterPins<PULL>>,
+        pins: impl Into<Self::MasterPins<Floating>>,
         mode: Mode,
         freq: Hertz,
         clocks: &Clocks,
-    ) -> Spi<Self, u16, PULL> {
+    ) -> Spi<Self, u16> {
         Self::spi(self, pins, mode, freq, clocks).frame_size_16bit()
     }
-    fn spi_slave<Otype, PULL>(
+    fn spi_slave(
         self,
-        pins: impl Into<Self::SlavePins<Otype, PULL>>,
+        pins: impl Into<Self::SlavePins<PushPull, Floating>>,
         mode: Mode,
-    ) -> SpiSlave<Self, u8, Otype, PULL>;
-    fn spi_slave_u16<Otype, PULL>(
+    ) -> SpiSlave<Self, u8, PushPull, Floating>;
+    fn spi_slave_u16(
         self,
-        pins: impl Into<Self::SlavePins<Otype, PULL>>,
+        pins: impl Into<Self::SlavePins<PushPull, Floating>>,
         mode: Mode,
-    ) -> SpiSlave<Self, u16, Otype, PULL> {
+    ) -> SpiSlave<Self, u16, PushPull, Floating> {
         Self::spi_slave(self, pins, mode).frame_size_16bit()
     }
 }
 
 impl<SPI: Instance> SpiExt for SPI {
-    fn spi<PULL>(
+    fn spi(
         self,
-        pins: impl Into<Self::MasterPins<PULL>>,
+        pins: impl Into<Self::MasterPins<Floating>>,
         mode: Mode,
         freq: Hertz,
         clocks: &Clocks,
-    ) -> Spi<Self, u8, PULL> {
+    ) -> Spi<Self, u8, Floating> {
         Spi::new(self, pins, mode, freq, clocks)
     }
-    fn spi_slave<Otype, PULL>(
+    fn spi_slave(
         self,
-        pins: impl Into<Self::SlavePins<Otype, PULL>>,
+        pins: impl Into<Self::SlavePins<PushPull, Floating>>,
         mode: Mode,
-    ) -> SpiSlave<Self, u8, Otype, PULL> {
+    ) -> SpiSlave<Self, u8, PushPull, Floating> {
         SpiSlave::new(self, pins, mode)
     }
 }