F4 GPIO

Author: burrbull

.vscode/settings.json

@@ -1,8 +1,6 @@
 {
   "rust-analyzer.check.allTargets": false,
-  "rust-analyzer.check.extraArgs": [
-    "--examples",
-  ],
+  "rust-analyzer.check.extraArgs": ["--examples"],
   "rust-analyzer.cargo.target": "thumbv7em-none-eabihf",
   "rust-analyzer.cargo.features": [
     "stm32g484",

Cargo.toml

@@ -3,7 +3,7 @@ authors = ["Vitaly Domnikov <[email protected]>"]
 categories = ["embedded", "hardware-support", "no-std"]
 description = "Peripheral access API for STM32G4 series microcontrollers"
 documentation = "https://docs.rs/stm32g4xx-hal"
-edition = "2018"
+edition = "2021"
 keywords = ["arm", "cortex-m", "stm32g4xx", "hal"]
 license = "MIT/Apache-2.0"
 name = "stm32g4xx-hal"
@@ -80,12 +80,226 @@ rt = ["stm32g4/rt"]
 usb = ["dep:stm32-usbd"]
 stm32g431 = ["stm32g4/stm32g431", "cat2"]
 stm32g441 = ["stm32g4/stm32g441", "cat2"]
-stm32g473 = ["stm32g4/stm32g473", "cat3", "adc3", "adc4", "adc5"]
-stm32g474 = ["stm32g4/stm32g474", "cat3", "adc3", "adc4", "adc5"]
-stm32g483 = ["stm32g4/stm32g483", "cat3", "adc3", "adc4", "adc5"]
-stm32g484 = ["stm32g4/stm32g484", "cat3", "adc3", "adc4", "adc5"]
-stm32g491 = ["stm32g4/stm32g491", "cat4", "adc3"]
-stm32g4a1 = ["stm32g4/stm32g4a1", "cat4", "adc3"]
+stm32g473 = ["stm32g4/stm32g473", "cat3"]
+stm32g474 = ["stm32g4/stm32g474", "cat3"]
+stm32g483 = ["stm32g4/stm32g483", "cat3"]
+stm32g484 = ["stm32g4/stm32g484", "cat3"]
+stm32g491 = ["stm32g4/stm32g491", "cat4"]
+stm32g4a1 = ["stm32g4/stm32g4a1", "cat4"]
+
+gpio-g43x = [
+    "comp1",
+    "comp2",
+    "comp3",
+    "comp4",
+    "crs",
+    "fdcan1",
+    "gpioa",
+    "gpiob",
+    "gpioc",
+    "gpiod",
+    "gpioe",
+    "gpiof",
+    "gpiog",
+    "i2c1",
+    "i2c2",
+    "i2c3",
+    "i2s",
+    "i2s2",
+    "i2s3",
+    "ir",
+    "lptim1",
+    "lpuart1",
+    "rcc",
+    "rtc",
+    "sai1",
+    "spi1",
+    "spi2",
+    "spi3",
+    "sys",
+    "tim1",
+    "tim15",
+    "tim16",
+    "tim17",
+    "tim2",
+    "tim3",
+    "tim4",
+    "tim8",
+    "uart4",
+    "ucpd1",
+    "usart1",
+    "usart2",
+    "usart3",
+]
+gpio-g47x = [
+    "adc3",
+    "adc4",
+    "adc5",
+    "comp1",
+    "comp2",
+    "comp3",
+    "comp4",
+    "comp5",
+    "comp6",
+    "comp7",
+    "crs",
+    "fdcan1",
+    "fdcan2",
+    "fdcan3",
+    "fmc",
+    "gpioa",
+    "gpiob",
+    "gpioc",
+    "gpiod",
+    "gpioe",
+    "gpiof",
+    "gpiog",
+    "hrtim1",
+    "i2c1",
+    "i2c2",
+    "i2c3",
+    "i2c4",
+    "i2s",
+    "i2s2",
+    "i2s3",
+    "ir",
+    "lptim1",
+    "lpuart1",
+    "quadspi1",
+    "rcc",
+    "rtc",
+    "sai1",
+    "spi1",
+    "spi2",
+    "spi3",
+    "spi4",
+    "sys",
+    "tim1",
+    "tim15",
+    "tim16",
+    "tim17",
+    "tim2",
+    "tim20",
+    "tim3",
+    "tim4",
+    "tim5",
+    "tim8",
+    "uart4",
+    "uart5",
+    "ucpd1",
+    "usart1",
+    "usart2",
+    "usart3",
+]
+gpio-g49x = [
+    "adc3",
+    "comp1",
+    "comp2",
+    "comp3",
+    "comp4",
+    "crs",
+    "fdcan1",
+    "fdcan2",
+    "gpioa",
+    "gpiob",
+    "gpioc",
+    "gpiod",
+    "gpioe",
+    "gpiof",
+    "gpiog",
+    "i2c1",
+    "i2c2",
+    "i2c3",
+    "i2s",
+    "i2s2",
+    "i2s3",
+    "ir",
+    "lptim1",
+    "lpuart1",
+    "quadspi1",
+    "rcc",
+    "rtc",
+    "sai1",
+    "spi1",
+    "spi2",
+    "spi3",
+    "sys",
+    "tim1",
+    "tim15",
+    "tim16",
+    "tim17",
+    "tim2",
+    "tim20",
+    "tim3",
+    "tim4",
+    "tim8",
+    "uart4",
+    "uart5",
+    "ucpd1",
+    "usart1",
+    "usart2",
+    "usart3",
+]
+
+adc3 = []
+adc4 = []
+adc5 = []
+comp1 = []
+comp2 = []
+comp3 = []
+comp4 = []
+comp5 = []
+comp6 = []
+comp7 = []
+crs = []
+fdcan1 = []
+fdcan2 = []
+fdcan3 = []
+fmc = []
+gpioa = []
+gpiob = []
+gpioc = []
+gpiod = []
+gpioe = []
+gpiof = []
+gpiog = []
+hrtim1 = []
+i2c1 = []
+i2c2 = []
+i2c3 = []
+i2c4 = []
+i2s = []
+i2s2 = []
+i2s3 = []
+ir = []
+lptim1 = []
+lpuart1 = []
+quadspi1 = []
+rcc = []
+rtc = []
+sai1 = []
+spi1 = []
+spi2 = []
+spi3 = []
+spi4 = []
+sys = []
+tim1 = []
+tim15 = []
+tim16 = []
+tim17 = []
+tim2 = []
+tim20 = []
+tim3 = []
+tim4 = []
+tim5 = []
+tim8 = []
+uart4 = []
+uart5 = []
+ucpd1 = []
+usart1 = []
+usart2 = []
+usart3 = []
+
 log-itm = ["cortex-m-log/itm"]
 log-rtt = []
 log-semihost = ["cortex-m-log/semihosting"]
@@ -98,14 +312,11 @@ defmt = [
     "embedded-io/defmt-03",
 ]
 cordic = ["dep:fixed"]
-adc3 = []
-adc4 = []
-adc5 = []
 
 # Device category
-cat2 = []
-cat3 = []
-cat4 = []
+cat2 = ["gpio-g43x"]
+cat3 = ["gpio-g47x"]
+cat4 = ["gpio-g49x"]
 
 can = ["dep:fdcan"]
 

examples/button.rs

@@ -3,7 +3,7 @@
 
 use stm32g4xx_hal::{
     //delay::{DelayExt, SYSTDelayExt},
-    gpio::{self, ExtiPin, GpioExt, Input, PullDown, SignalEdge},
+    gpio::{self, ExtiPin, GpioExt, Input, SignalEdge},
     rcc::RccExt,
     stm32,
     stm32::{interrupt, Interrupt},
@@ -15,7 +15,7 @@ use core::sync::atomic::{AtomicBool, Ordering};
 use cortex_m::{asm::wfi, interrupt::Mutex};
 use cortex_m_rt::entry;
 
-type ButtonPin = gpio::PC13<Input<PullDown>>;
+type ButtonPin = gpio::PC13<Input>;
 
 // Make LED pin globally available
 static G_BUTTON: Mutex<RefCell<Option<ButtonPin>>> = Mutex::new(RefCell::new(None));

examples/i2c.rs

@@ -3,7 +3,6 @@
 #![no_main]
 #![no_std]
 
-use hal::i2c::Config;
 use hal::prelude::*;
 use hal::stm32;
 use hal::time::RateExtU32;
@@ -23,12 +22,13 @@ fn main() -> ! {
     let mut rcc = dp.RCC.constrain();
     let gpiob = dp.GPIOB.split(&mut rcc);
 
-    let sda = gpiob.pb9.into_alternate_open_drain();
-    let scl = gpiob.pb8.into_alternate_open_drain();
+    let sda = gpiob.pb9;
+    let scl = gpiob.pb8;
 
-    let mut i2c = dp.I2C1.i2c(sda, scl, Config::new(40.kHz()), &mut rcc);
+    let mut i2c = dp.I2C1.i2c(sda, scl, 40.kHz(), &mut rcc);
     // Alternatively, it is possible to specify the exact timing as follows (see the documentation
     // of with_timing() for an explanation of the constant):
+    //use hal::i2c::Config;
     //let mut i2c = dp
     //  .I2C1
     //   .i2c(sda, scl, Config::with_timing(0x3042_0f13), &mut rcc);

examples/spi-dma.rs

@@ -6,7 +6,6 @@
 
 use crate::hal::{
     delay::DelayFromCountDownTimer,
-    gpio::{AF5, PA5, PA6, PA7},
     prelude::*,
     pwr::PwrExt,
     rcc::Config,
@@ -40,9 +39,9 @@ fn main() -> ! {
     let mut delay_tim2 = DelayFromCountDownTimer::new(timer2.start_count_down(100.millis()));
 
     let gpioa = dp.GPIOA.split(&mut rcc);
-    let sclk: PA5<AF5> = gpioa.pa5.into_alternate();
-    let miso: PA6<AF5> = gpioa.pa6.into_alternate();
-    let mosi: PA7<AF5> = gpioa.pa7.into_alternate();
+    let sclk = gpioa.pa5;
+    let miso = gpioa.pa6;
+    let mosi = gpioa.pa7;
 
     let spi = dp
         .SPI1

examples/spi-sd.rs

@@ -34,7 +34,7 @@ fn main() -> ! {
     let gpiof = dp.GPIOF.split(&mut rcc);
 
     let cs = {
-        let mut cs = gpiof.pf8.into_push_pull_output();
+        let mut cs = gpiof.pf0.into_push_pull_output();
         cs.set_high();
         cs
     };

src/comparator.rs

@@ -621,7 +621,6 @@ output_pin! {
     COMP1: PA6,  8,
     COMP1: PA11, 8,
     COMP1: PB8,  8,
-    COMP1: PF4,  2,
 
     COMP2: PA2,  8,
     COMP2: PA7,  8,
@@ -637,13 +636,10 @@ output_pin! {
     COMP4: PB14, 8,
 }
 
-#[cfg(any(
-    feature = "stm32g473",
-    feature = "stm32g483",
-    feature = "stm32g474",
-    feature = "stm32g484",
-))]
+#[cfg(feature = "gpio-g47x")]
 output_pin! {
+    COMP1: PF4,  2,
+
     COMP5: PA9,  8,
     COMP5: PC7,  7,
 

src/delay.rs

@@ -119,17 +119,12 @@ impl DelayMs<u8> for SystDelay {
 }
 
 pub trait DelayExt {
-    fn delay<T>(&mut self, delay: T)
-    where
-        T: Into<MicroSecond>;
+    fn delay(&mut self, delay: MicroSecond);
 }
 
 impl DelayExt for SystDelay {
-    fn delay<T>(&mut self, delay: T)
-    where
-        T: Into<MicroSecond>,
-    {
-        self.0.delay_us(delay.into().ticks())
+    fn delay(&mut self, delay: MicroSecond) {
+        self.0.delay_us(delay.ticks())
     }
 }