Merge pull request #308 from burrbull/intoaf

Sh3Rm4n · web-flow · commit e069b0ed2790 · 2022-01-20T07:45:05.000+01:00
generic IntoAf
diff --git a/.clippy.toml b/.clippy.toml
@@ -1 +1 @@
-msrv = "1.52"
+msrv = "1.54"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -57,7 +57,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.52.0
+          toolchain: 1.54.0
           target: thumbv7em-none-eabihf
           override: true
           profile: minimal
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 
+- The MSRV was bumped to 1.54 ([#308])
+- Generic `into_af_push_pull<A>` and `into_af_open_drain<A>` ([#308])
 - `BusClock` and `BusTimerClock` traits ([#302])
 - `RccBus`, `Enable`, `Reset` traits and implementations for peripherals ([#299])
 - Support cortex-m-rt `v0.7.0` but still allow `v0.6.13` ([#283])
@@ -508,6 +510,7 @@ let clocks = rcc
 [defmt]: https://github.com/knurling-rs/defmt
 [filter]: https://defmt.ferrous-systems.com/filtering.html
 
+[#308]: https://github.com/stm32-rs/stm32f3xx-hal/pull/308
 [#304]: https://github.com/stm32-rs/stm32f3xx-hal/pull/304
 [#302]: https://github.com/stm32-rs/stm32f3xx-hal/pull/302
 [#299]: https://github.com/stm32-rs/stm32f3xx-hal/pull/299
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,7 +19,7 @@ exclude = [
     ".markdownlint.yml"
 ]
 resolver = "2"
-rust-version = "1.52"
+rust-version = "1.54"
 
 [workspace]
 members = [
@@ -35,7 +35,7 @@ rustc-args = ["--cfg", "docsrs"]
 
 [dependencies]
 cfg-if = "1.0.0"
-cortex-m = "0.7.2"
+cortex-m = "0.7.4"
 cortex-m-rt = "0.7"
 defmt = { version = ">=0.2.3, <0.4.0", optional = true }
 embedded-dma = "0.1.2"
@@ -55,18 +55,17 @@ enumset = { version = "1.0.6", optional = true}
 bare-metal = "0.2.5"
 
 [dev-dependencies]
-cortex-m = "0.7.2"
 cortex-m-semihosting = "0.3.7"
 defmt-rtt = "0.3.0"
 defmt-test = "0.3.0"
 panic-probe = "0.3.0"
 panic-semihosting = "0.5.6"
 usbd-serial = "0.1.1"
 usb-device = "0.2.8"
-cortex-m-rtic = "=0.6.0-rc.4, <0.6.0-rc.5"
-systick-monotonic = "0.1.0-rc.2"
+cortex-m-rtic = "1.0"
+systick-monotonic = "1.0"
 panic-rtt-target = { version = "0.1", features = ["cortex-m"] }
-rtt-target = { version = "0.3.0", features = ["cortex-m"] }
+rtt-target = { version = "0.3.1", features = ["cortex-m"] }
 
 [build-dependencies]
 slice-group-by = "0.2.6"
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 [![Crate](https://img.shields.io/crates/v/stm32f3xx-hal.svg)](https://crates.io/crates/stm32f3xx-hal)
 [![Docs](https://docs.rs/stm32f3xx-hal/badge.svg)](https://docs.rs/stm32f3xx-hal)
 [![Crates.io](https://img.shields.io/crates/d/stm32f3xx-hal.svg)](https://crates.io/crates/stm32f3xx-hal)
-![Minimum Supported Rust Version](https://img.shields.io/badge/rustc-1.52+-blue.svg)
+![Minimum Supported Rust Version](https://img.shields.io/badge/rustc-1.54+-blue.svg)
 
 `stm32f3xx-hal` contains a multi device hardware abstraction on top of the
 peripheral access API for the STMicro STM32F3 series microcontrollers. The
@@ -139,7 +139,7 @@ See the [examples folder](examples) for more example programs.
 
 ## Minimum Supported Rust Version (MSRV)
 
-This crate is guaranteed to compile on stable Rust 1.52.0 and up. It *might*
+This crate is guaranteed to compile on stable Rust 1.54.0 and up. It *might*
 compile with older versions but that may change in any new patch release.
 
 <!-- This should not prevent anyone to use newer features. -->
diff --git a/examples/can.rs b/examples/can.rs
@@ -43,21 +43,20 @@ fn main() -> ! {
     // Configure CAN RX and TX pins (AF9)
     let rx = gpioa
         .pa11
-        .into_af9_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrh);
+        .into_af_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrh);
     let tx = gpioa
         .pa12
-        .into_af9_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrh);
+        .into_af_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrh);
 
     // Initialize the CAN peripheral
-    let mut can = Can::new(dp.CAN, tx, rx, &mut rcc.apb1);
-
     // Use loopback mode: No pins need to be assigned to peripheral.
     // APB1 (PCLK1): 64MHz, Bit rate: 500kBit/s, Sample Point 87.5%
     // Value was calculated with http://www.bittiming.can-wiki.info/
-    can.modify_config()
+    let mut can = bxcan::Can::builder(Can::new(dp.CAN, tx, rx, &mut rcc.apb1))
         .set_bit_timing(0x001c_0003)
         .set_loopback(false)
-        .set_silent(false);
+        .set_silent(false)
+        .leave_disabled();
 
     let mut filters = can.modify_filters();
 
@@ -67,7 +66,7 @@ fn main() -> ! {
     drop(filters);
 
     // Sync to the bus and start normal operation.
-    block!(can.enable()).ok();
+    block!(can.enable_non_blocking()).ok();
 
     let mut led0 = gpiob
         .pb15
diff --git a/examples/i2c_scanner.rs b/examples/i2c_scanner.rs
@@ -31,11 +31,11 @@ fn main() -> ! {
     let mut scl =
         gpiob
             .pb6
-            .into_af4_open_drain(&mut gpiob.moder, &mut gpiob.otyper, &mut gpiob.afrl);
+            .into_af_open_drain(&mut gpiob.moder, &mut gpiob.otyper, &mut gpiob.afrl);
     let mut sda =
         gpiob
             .pb7
-            .into_af4_open_drain(&mut gpiob.moder, &mut gpiob.otyper, &mut gpiob.afrl);
+            .into_af_open_drain(&mut gpiob.moder, &mut gpiob.otyper, &mut gpiob.afrl);
     scl.internal_pull_up(&mut gpiob.pupdr, true);
     sda.internal_pull_up(&mut gpiob.pupdr, true);
     let mut i2c = hal::i2c::I2c::new(
diff --git a/examples/pwm.rs b/examples/pwm.rs
@@ -34,38 +34,38 @@ fn main() -> ! {
     let mut gpioa = dp.GPIOA.split(&mut rcc.ahb);
     let pa4 = gpioa
         .pa4
-        .into_af2_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrl);
+        .into_af_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrl);
     let pa6 = gpioa
         .pa6
-        .into_af2_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrl);
+        .into_af_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrl);
     let pa7 = gpioa
         .pa7
-        .into_af2_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrl);
+        .into_af_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrl);
 
     let mut gpiob = dp.GPIOB.split(&mut rcc.ahb);
     let pb0 = gpiob
         .pb0
-        .into_af2_push_pull(&mut gpiob.moder, &mut gpiob.otyper, &mut gpiob.afrl);
+        .into_af_push_pull(&mut gpiob.moder, &mut gpiob.otyper, &mut gpiob.afrl);
     let pb1 = gpiob
         .pb1
-        .into_af2_push_pull(&mut gpiob.moder, &mut gpiob.otyper, &mut gpiob.afrl);
+        .into_af_push_pull(&mut gpiob.moder, &mut gpiob.otyper, &mut gpiob.afrl);
     let pb4 = gpiob
         .pb4
-        .into_af2_push_pull(&mut gpiob.moder, &mut gpiob.otyper, &mut gpiob.afrl);
+        .into_af_push_pull(&mut gpiob.moder, &mut gpiob.otyper, &mut gpiob.afrl);
     let pb5 = gpiob
         .pb5
-        .into_af2_push_pull(&mut gpiob.moder, &mut gpiob.otyper, &mut gpiob.afrl);
+        .into_af_push_pull(&mut gpiob.moder, &mut gpiob.otyper, &mut gpiob.afrl);
     let pb8 = gpiob
         .pb8
-        .into_af1_push_pull(&mut gpiob.moder, &mut gpiob.otyper, &mut gpiob.afrh);
+        .into_af_push_pull(&mut gpiob.moder, &mut gpiob.otyper, &mut gpiob.afrh);
     let pb10 = gpiob
         .pb10
-        .into_af1_push_pull(&mut gpiob.moder, &mut gpiob.otyper, &mut gpiob.afrh);
+        .into_af_push_pull(&mut gpiob.moder, &mut gpiob.otyper, &mut gpiob.afrh);
 
     let mut gpioc = dp.GPIOC.split(&mut rcc.ahb);
     let pc10 = gpioc
         .pc10
-        .into_af4_push_pull(&mut gpioc.moder, &mut gpioc.otyper, &mut gpioc.afrh);
+        .into_af_push_pull(&mut gpioc.moder, &mut gpioc.otyper, &mut gpioc.afrh);
 
     // TIM3
     //
diff --git a/examples/serial_dma.rs b/examples/serial_dma.rs
@@ -35,10 +35,10 @@ fn main() -> ! {
     let pins = (
         gpioa
             .pa9
-            .into_af7_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrh),
+            .into_af_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrh),
         gpioa
             .pa10
-            .into_af7_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrh),
+            .into_af_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrh),
     );
     let serial = Serial::new(dp.USART1, pins, 9600.Bd(), clocks, &mut rcc.apb2);
     let (tx, rx) = serial.split();
diff --git a/examples/serial_echo_rtic.rs b/examples/serial_echo_rtic.rs
@@ -69,14 +69,14 @@ mod app {
                 // configure this pin to make use of its `USART1_TX` alternative function
                 // (AF mapping taken from table 14 "Alternate functions for port A" of the datasheet at
                 //  https://www.st.com/en/microcontrollers-microprocessors/stm32f303vc.html)
-                .into_af7_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrh),
+                .into_af_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrh),
             gpioa
                 // Rx pin
                 .pa10
                 // configure this pin to make use of its `USART1_RX` alternative function
                 // (AF mapping taken from table 14 "Alternate functions for port A" of the datasheet at
                 //  https://www.st.com/en/microcontrollers-microprocessors/stm32f303vc.html)
-                .into_af7_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrh),
+                .into_af_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrh),
         );
         pins.1.internal_pull_up(&mut gpioa.pupdr, true);
         let mut serial: SerialType =
diff --git a/examples/spi.rs b/examples/spi.rs
@@ -32,13 +32,13 @@ fn main() -> ! {
     // Configure pins for SPI
     let sck = gpioc
         .pc10
-        .into_af6_push_pull(&mut gpioc.moder, &mut gpioc.otyper, &mut gpioc.afrh);
+        .into_af_push_pull(&mut gpioc.moder, &mut gpioc.otyper, &mut gpioc.afrh);
     let miso = gpioc
         .pc11
-        .into_af6_push_pull(&mut gpioc.moder, &mut gpioc.otyper, &mut gpioc.afrh);
+        .into_af_push_pull(&mut gpioc.moder, &mut gpioc.otyper, &mut gpioc.afrh);
     let mosi = gpioc
         .pc12
-        .into_af6_push_pull(&mut gpioc.moder, &mut gpioc.otyper, &mut gpioc.afrh);
+        .into_af_push_pull(&mut gpioc.moder, &mut gpioc.otyper, &mut gpioc.afrh);
 
     let mut spi = Spi::new(dp.SPI3, (sck, miso, mosi), 3.MHz(), clocks, &mut rcc.apb1);
 
diff --git a/examples/usb_serial.rs b/examples/usb_serial.rs
@@ -53,11 +53,10 @@ fn main() -> ! {
     usb_dp.set_low().ok();
     delay(clocks.sysclk().0 / 100);
 
-    let usb_dm =
-        gpioa
-            .pa11
-            .into_af14_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrh);
-    let usb_dp = usb_dp.into_af14_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrh);
+    let usb_dm = gpioa
+        .pa11
+        .into_af_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrh);
+    let usb_dp = usb_dp.into_af_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrh);
 
     let usb = Peripheral {
         usb: dp.USB,
diff --git a/src/can.rs b/src/can.rs
@@ -55,11 +55,11 @@ where
     Rx: RxPin,
 {
     /// Create a new `bxcan::CAN` instance.
-    pub fn new(can: pac::CAN, tx: Tx, rx: Rx, apb1: &mut APB1) -> bxcan::Can<Self> {
+    pub fn new(can: pac::CAN, tx: Tx, rx: Rx, apb1: &mut APB1) -> Self {
         pac::CAN::enable(apb1);
         pac::CAN::reset(apb1);
 
-        bxcan::Can::builder(Can { can, tx, rx }).enable()
+        Can { can, tx, rx }
     }
 
     /// Releases the CAN peripheral and associated pins
diff --git a/src/gpio.rs b/src/gpio.rs
diff --git a/src/timer.rs b/src/timer.rs
