f4xx-hal like gpio

stm32-rs · Mar 30, 2022 · 893fb64 · 893fb64
1 parent 565b43c
commit 893fb64
Show file tree

Hide file tree

Showing 30 changed files with 1,885 additions and 1,457 deletions.
diff --git a/.clippy.toml b/.clippy.toml
@@ -1 +1 @@
-msrv = "1.54"
+msrv = "1.59"
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.54.0
+          toolchain: 1.59.0
           target: thumbv7em-none-eabihf
           override: true
           profile: minimal

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,7 +14,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
-No changes.
+- Use const generics for pins. The MSRV was bumped to 1.59 ([#316])
 
 ## [v0.9.0] - 2022-03-06
 
@@ -554,6 +554,7 @@ let clocks = rcc
 [defmt]: https://github.com/knurling-rs/defmt
 [filter]: https://defmt.ferrous-systems.com/filtering.html
 
+[#316]: https://github.com/stm32-rs/stm32f3xx-hal/pull/316
 [#314]: https://github.com/stm32-rs/stm32f3xx-hal/pull/314
 [#309]: https://github.com/stm32-rs/stm32f3xx-hal/pull/309
 [#308]: https://github.com/stm32-rs/stm32f3xx-hal/pull/308

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-edition = "2018"
+edition = "2021"
 authors = [
     "Dylan Frankland <[email protected]>",
     "Sh3Rm4n <[email protected]>",
@@ -19,7 +19,7 @@ exclude = [
     ".markdownlint.yml"
 ]
 resolver = "2"
-rust-version = "1.54"
+rust-version = "1.59"
 
 [workspace]
 members = [
@@ -39,7 +39,7 @@ cortex-m = "0.7.4"
 cortex-m-rt = "0.7"
 defmt = { version = ">=0.2.3, <0.4.0", optional = true }
 embedded-dma = "0.2.0"
-embedded-hal = { version = "0.2.5", features = ["unproven"] }
+embedded-hal = { version = "0.2.7", features = ["unproven"] }
 embedded-time = "0.12.0"
 nb = "1.0.0"
 paste = "1.0.5"

diff --git a/examples/can.rs b/examples/can.rs
@@ -43,10 +43,10 @@ fn main() -> ! {
     // Configure CAN RX and TX pins (AF9)
     let rx = gpioa
         .pa11
-        .into_af_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrh);
+        .into_alternate(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrh);
     let tx = gpioa
         .pa12
-        .into_af_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrh);
+        .into_alternate(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrh);
 
     // Initialize the CAN peripheral
     // Use loopback mode: No pins need to be assigned to peripheral.

diff --git a/examples/gpio_erased.rs b/examples/gpio_erased.rs
@@ -23,33 +23,29 @@ fn main() -> ! {
     let mut gpioc = dp.GPIOC.split(&mut rcc.ahb);
     let mut gpiod = dp.GPIOD.split(&mut rcc.ahb);
 
-    let mut pin_array: [gpio::PXx<Input>; 4] = [
+    let mut pin_array: [gpio::EPin<Input>; 4] = [
         gpiob
             .pb11
             .into_floating_input(&mut gpiob.moder, &mut gpiob.pupdr)
-            .downgrade()
-            .downgrade(),
+            .erase(),
         gpioc
             .pc4
             .into_floating_input(&mut gpioc.moder, &mut gpioc.pupdr)
-            .downgrade()
-            .downgrade(),
+            .erase(),
         gpiod
             .pd3
             .into_floating_input(&mut gpiod.moder, &mut gpiod.pupdr)
-            .downgrade()
-            .downgrade(),
+            .erase(),
         gpiod
             .pd2
             .into_floating_input(&mut gpiod.moder, &mut gpiod.pupdr)
-            .downgrade()
-            .downgrade(),
+            .erase(),
     ];
 
     hprintln!("Start scanning pin array").unwrap();
     loop {
         for pin in pin_array.iter_mut() {
-            hprintln!("Value is {}", pin.is_high().unwrap()).unwrap();
+            hprintln!("Value is {}", pin.is_high()).unwrap();
             asm::delay(1_000_000);
         }
     }

diff --git a/examples/gpio_interrupts.rs b/examples/gpio_interrupts.rs
@@ -35,7 +35,7 @@ fn main() -> ! {
         .pe9
         .into_push_pull_output(&mut gpioe.moder, &mut gpioe.otyper);
     // Turn the led on so we know the configuration step occurred.
-    led.toggle().expect("unable to toggle led in configuration");
+    led.toggle();
 
     // Move the ownership of the led to the global LED
     cortex_m::interrupt::free(|cs| *LED.borrow(cs).borrow_mut() = Some(led));
@@ -69,12 +69,7 @@ fn main() -> ! {
 fn EXTI0() {
     cortex_m::interrupt::free(|cs| {
         // Toggle the LED
-        LED.borrow(cs)
-            .borrow_mut()
-            .as_mut()
-            .unwrap()
-            .toggle()
-            .unwrap();
+        LED.borrow(cs).borrow_mut().as_mut().unwrap().toggle();
 
         // Clear the interrupt pending bit so we don't infinitely call this routine
         BUTTON

diff --git a/examples/i2c_scanner.rs b/examples/i2c_scanner.rs
@@ -28,16 +28,14 @@ fn main() -> ! {
     let mut gpiob = dp.GPIOB.split(&mut rcc.ahb);
 
     // Configure I2C1
-    let mut scl =
-        gpiob
-            .pb6
-            .into_af_open_drain(&mut gpiob.moder, &mut gpiob.otyper, &mut gpiob.afrl);
-    let mut sda =
-        gpiob
-            .pb7
-            .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 scl = gpiob
+        .pb6
+        .into_alternate_open_drain(&mut gpiob.moder, &mut gpiob.otyper, &mut gpiob.afrl)
+        .internal_pull_up(&mut gpiob.pupdr, true);
+    let sda = gpiob
+        .pb7
+        .into_alternate_open_drain(&mut gpiob.moder, &mut gpiob.otyper, &mut gpiob.afrl)
+        .internal_pull_up(&mut gpiob.pupdr, true);
     let mut i2c = hal::i2c::I2c::new(
         dp.I2C1,
         (scl, sda),

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_af_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrl);
+        .into_alternate(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrl);
     let pa6 = gpioa
         .pa6
-        .into_af_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrl);
+        .into_alternate(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrl);
     let pa7 = gpioa
         .pa7
-        .into_af_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrl);
+        .into_alternate(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrl);
 
     let mut gpiob = dp.GPIOB.split(&mut rcc.ahb);
     let pb0 = gpiob
         .pb0
-        .into_af_push_pull(&mut gpiob.moder, &mut gpiob.otyper, &mut gpiob.afrl);
+        .into_alternate(&mut gpiob.moder, &mut gpiob.otyper, &mut gpiob.afrl);
     let pb1 = gpiob
         .pb1
-        .into_af_push_pull(&mut gpiob.moder, &mut gpiob.otyper, &mut gpiob.afrl);
+        .into_alternate(&mut gpiob.moder, &mut gpiob.otyper, &mut gpiob.afrl);
     let pb4 = gpiob
         .pb4
-        .into_af_push_pull(&mut gpiob.moder, &mut gpiob.otyper, &mut gpiob.afrl);
+        .into_alternate(&mut gpiob.moder, &mut gpiob.otyper, &mut gpiob.afrl);
     let pb5 = gpiob
         .pb5
-        .into_af_push_pull(&mut gpiob.moder, &mut gpiob.otyper, &mut gpiob.afrl);
+        .into_alternate(&mut gpiob.moder, &mut gpiob.otyper, &mut gpiob.afrl);
     let pb8 = gpiob
         .pb8
-        .into_af_push_pull(&mut gpiob.moder, &mut gpiob.otyper, &mut gpiob.afrh);
+        .into_alternate(&mut gpiob.moder, &mut gpiob.otyper, &mut gpiob.afrh);
     let pb10 = gpiob
         .pb10
-        .into_af_push_pull(&mut gpiob.moder, &mut gpiob.otyper, &mut gpiob.afrh);
+        .into_alternate(&mut gpiob.moder, &mut gpiob.otyper, &mut gpiob.afrh);
 
     let mut gpioc = dp.GPIOC.split(&mut rcc.ahb);
     let pc10 = gpioc
         .pc10
-        .into_af_push_pull(&mut gpioc.moder, &mut gpioc.otyper, &mut gpioc.afrh);
+        .into_alternate(&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_af_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrh),
+            .into_alternate(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrh),
         gpioa
             .pa10
-            .into_af_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrh),
+            .into_alternate(&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
@@ -58,27 +58,27 @@ mod app {
         let mut dir: DirType = gpioe
             .pe13
             .into_push_pull_output(&mut gpioe.moder, &mut gpioe.otyper);
-        dir.set_low().unwrap();
+        dir.set_low();
 
         // SERIAL
         let mut gpioa = cx.device.GPIOA.split(&mut rcc.ahb);
-        let mut pins = (
+        let pins = (
             gpioa
                 // Tx pin
                 .pa9
                 // 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_af_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrh),
+                .into_alternate(&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_af_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrh),
+                .into_alternate(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrh)
+                .internal_pull_up(&mut gpioa.pupdr, true),
         );
-        pins.1.internal_pull_up(&mut gpioa.pupdr, true);
         let mut serial: SerialType =
             Serial::new(cx.device.USART1, pins, 19200.Bd(), clocks, &mut rcc.apb2);
         serial.configure_interrupt(Event::ReceiveDataRegisterNotEmpty, Toggle::On);
@@ -99,7 +99,7 @@ mod app {
         let dir = cx.local.dir;
 
         if serial.is_event_triggered(Event::ReceiveDataRegisterNotEmpty) {
-            dir.set_high().unwrap();
+            dir.set_high();
             serial.configure_interrupt(Event::ReceiveDataRegisterNotEmpty, Toggle::Off);
             match serial.read() {
                 Ok(byte) => {
@@ -116,7 +116,7 @@ mod app {
         // and other functions enabled by the "enumset" feature.
         let events = serial.triggered_events();
         if events.contains(Event::TransmissionComplete) {
-            dir.set_low().unwrap();
+            dir.set_low();
             let interrupts = {
                 let mut interrupts = enumset::EnumSet::new();
                 interrupts.insert(Event::ReceiveDataRegisterNotEmpty);

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_af_push_pull(&mut gpioc.moder, &mut gpioc.otyper, &mut gpioc.afrh);
+        .into_alternate(&mut gpioc.moder, &mut gpioc.otyper, &mut gpioc.afrh);
     let miso = gpioc
         .pc11
-        .into_af_push_pull(&mut gpioc.moder, &mut gpioc.otyper, &mut gpioc.afrh);
+        .into_alternate(&mut gpioc.moder, &mut gpioc.otyper, &mut gpioc.afrh);
     let mosi = gpioc
         .pc12
-        .into_af_push_pull(&mut gpioc.moder, &mut gpioc.otyper, &mut gpioc.afrh);
+        .into_alternate(&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/toggle.rs b/examples/toggle.rs
@@ -25,18 +25,18 @@ fn main() -> ! {
         .pe13
         .into_push_pull_output(&mut gpioe.moder, &mut gpioe.otyper);
 
-    led.set_low().unwrap();
+    led.set_low();
 
     loop {
-        led.toggle().unwrap();
+        led.toggle();
         cortex_m::asm::delay(8_000_000);
         // Toggle by hand.
         // Uses `StatefulOutputPin` instead of `ToggleableOutputPin`.
         // Logically it is the same.
-        if led.is_set_low().unwrap() {
-            led.set_high().unwrap();
+        if led.is_set_low() {
+            led.set_high();
         } else {
-            led.set_low().unwrap();
+            led.set_low();
         }
         cortex_m::asm::delay(8_000_000);
     }

diff --git a/examples/usb_serial.rs b/examples/usb_serial.rs
@@ -39,7 +39,7 @@ fn main() -> ! {
     let mut led = gpioe
         .pe13
         .into_push_pull_output(&mut gpioe.moder, &mut gpioe.otyper);
-    led.set_low().ok(); // Turn off
+    led.set_low(); // Turn off
 
     let mut gpioa = dp.GPIOA.split(&mut rcc.ahb);
 
@@ -50,13 +50,13 @@ fn main() -> ! {
     let mut usb_dp = gpioa
         .pa12
         .into_push_pull_output(&mut gpioa.moder, &mut gpioa.otyper);
-    usb_dp.set_low().ok();
+    usb_dp.set_low();
     delay(clocks.sysclk().0 / 100);
 
     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);
+        .into_alternate(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrh);
+    let usb_dp = usb_dp.into_alternate(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrh);
 
     let usb = Peripheral {
         usb: dp.USB,
@@ -83,7 +83,7 @@ fn main() -> ! {
 
         match serial.read(&mut buf) {
             Ok(count) if count > 0 => {
-                led.set_high().ok(); // Turn on
+                led.set_high(); // Turn on
 
                 // Echo back in upper case
                 for c in buf[0..count].iter_mut() {
@@ -105,6 +105,6 @@ fn main() -> ! {
             _ => {}
         }
 
-        led.set_low().ok(); // Turn off
+        led.set_low(); // Turn off
     }
 }