transfer all current feature gating to device specific features (#266)

* transfer all current feature gating to device specific features

MCU with missing PAC support is marked like
`// feature = "stm32l471",  // missing PAC support`

* fixup some of the gating

* gate CAN so L412/L422 can be part of CI

* These features aren't actually present

* USART3 not on these specific MCUs

* add all models to ci

* add common MCU feature lists to copy from

* remove r/s from ci

"support" is extremely minimal

Author: Crzyrndm

.github/workflows/ci.yml

@@ -1,6 +1,6 @@
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
 
 name: Continuous integration
@@ -9,15 +9,28 @@ jobs:
   ci:
     runs-on: ubuntu-latest
     strategy:
-      matrix:                   # All permutations of {rust, mcu}
+      matrix: # All permutations of {rust, mcu}
         rust:
           - stable
         mcu:
-          - stm32l4x1
-          - stm32l4x2
-          - stm32l4x3
-          - stm32l4x5
-          - stm32l4x6
+          - stm32l412
+          - stm32l422
+          - stm32l431
+          - stm32l432
+          - stm32l433
+          - stm32l442
+          - stm32l443
+          - stm32l451
+          - stm32l452
+          - stm32l462
+          - stm32l471
+          - stm32l475
+          - stm32l476
+          - stm32l486
+          - stm32l496
+          - stm32l4a6
+          #- stm32l4r9
+          #- stm32l4s9
 
     steps:
       - uses: actions/checkout@v2
@@ -27,12 +40,14 @@ jobs:
           toolchain: ${{ matrix.rust }}
           target: thumbv7em-none-eabihf
           override: true
-      - uses: actions-rs/cargo@v1
+      - name: build
+        uses: actions-rs/cargo@v1
         with:
           use-cross: true
           command: build
           args: --verbose --release --examples --target thumbv7em-none-eabihf --features rt,unproven,${{ matrix.mcu }}
-      - uses: actions-rs/cargo@v1
+      - name: test
+        uses: actions-rs/cargo@v1
         with:
           command: test
           args: --lib --target x86_64-unknown-linux-gnu --features rt,unproven,${{ matrix.mcu }}

.github/workflows/clippy.yml

@@ -19,4 +19,4 @@ jobs:
       - uses: actions-rs/clippy-check@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          args: --examples --target thumbv7em-none-eabihf --features=stm32l4x2,rt,unproven
+          args: --examples --target thumbv7em-none-eabihf --features=stm32l432,rt,unproven

Cargo.toml

@@ -57,18 +57,53 @@ features = ["cortex-m", "fs"]
 optional = true
 
 [package.metadata.docs.rs]
-features = ["rt", "stm32l4x2", "stm32-usbd"]
+features = ["rt", "stm32l432", "stm32-usbd"]
 
 [features]
 rt = ["stm32l4/rt"]
-stm32l4x1 = ["stm32l4/stm32l4x1"]
-stm32l4x2 = ["stm32l4/stm32l4x2"]
-stm32l4x3 = ["stm32l4/stm32l4x3"]
-stm32l4x5 = ["stm32l4/stm32l4x5"]
-stm32l4x6 = ["stm32l4/stm32l4x6"]
 unproven = ["embedded-hal/unproven"]
 otg_fs = ["synopsys-usb-otg"]
 
+# L4x1
+stm32l431 = [ "stm32l4/stm32l4x1" ]
+stm32l451 = [ "stm32l4/stm32l4x1" ]
+stm32l471 = [ "stm32l4/stm32l4x1" ]
+
+# L4x2
+stm32l412 = [ "stm32l4/stm32l4x2" ]
+stm32l422 = [ "stm32l4/stm32l4x2" ]
+stm32l432 = [ "stm32l4/stm32l4x2" ]
+stm32l442 = [ "stm32l4/stm32l4x2" ]
+stm32l452 = [ "stm32l4/stm32l4x2" ]
+stm32l462 = [ "stm32l4/stm32l4x2" ]
+
+# L4x3
+stm32l433 = [ "stm32l4/stm32l4x3" ]
+stm32l443 = [ "stm32l4/stm32l4x3" ]
+
+# L4x5
+stm32l475 = [ "stm32l4/stm32l4x5" ]
+
+# L4x6
+stm32l476 = [ "stm32l4/stm32l4x6" ]
+stm32l486 = [ "stm32l4/stm32l4x6" ]
+stm32l496 = [ "stm32l4/stm32l4x6" ]
+stm32l4a6 = [ "stm32l4/stm32l4x6" ]
+
+# L4+ series PAC support??
+#stm32l4p5 = [ "stm32l4/stm32l4x5" ]
+#stm32l4q5 = [ "stm32l4/stm32l4x5" ]
+#stm32l4r5 = [ "stm32l4/stm32l4x5" ]
+#stm32l4s5 = [ "stm32l4/stm32l4x5" ]
+
+# L4x7
+#stm32l4r7 = [ "stm32l4/stm32l4x7" ]
+#stm32l4s7 = [ "stm32l4/stm32l4x7" ]
+
+## L4x9
+stm32l4r9 = [ "stm32l4/stm32l4r9" ] # PAC has an L4r9 specific variation
+stm32l4s9 = [ "stm32l4/stm32l4r9" ]
+
 [dev-dependencies]
 panic-halt = "0.2.0"
 panic-semihosting = "0.5.0"
@@ -103,19 +138,19 @@ lto = true
 
 [[example]]
 name = "adc"
-required-features = ["rt", "stm32l4x3"]
+required-features = ["rt"]
 
 [[example]]
 name = "can-loopback"
-required-features = ["rt", "stm32l4x1"]
+required-features = ["rt", "stm32l433" ] # CAN peripheral on ever series except L41/L42, gate so CI will pass
 
 [[example]]
 name = "irq_button"
 required-features = ["rt"]
 
 [[example]]
 name = "qspi"
-required-features = ["rt", "stm32l4x5"]
+required-features = ["rt", "stm32l476"] # L433/43 have no QSPI peripheral and are highly likely to be used
 
 [[example]]
 name = "rng"
@@ -127,36 +162,36 @@ required-features = ["rt"]
 
 [[example]]
 name = "rtic_frame_serial_dma"
-required-features = ["rt", "stm32l4x2"]
+required-features = ["rt"]
 
 [[example]]
 name = "spi_dma_rxtx"
-required-features = ["rt", "stm32l4x2"]
+required-features = ["rt"]
 
 [[example]]
 name = "serial_echo_rtic"
-required-features = ["rt", "stm32l4x3"]
+required-features = ["rt"]
 
 [[example]]
 name = "timer"
 required-features = ["rt"]
 
 [[example]]
 name = "usb_serial"
-required-features = ["rt", "stm32l4x2", "stm32-usbd"]
+required-features = ["rt", "stm32-usbd"]
 
 [[example]]
 name = "otg_fs_serial"
-required-features = ["rt", "stm32l4x6", "otg_fs"]
+required-features = ["rt", "otg_fs"]
 
 [[example]]
 name = "i2c_write"
-required-features = ["stm32l4x1"]
+required-features = ["stm32l433"]
 
 [[example]]
 name = "lptim_rtic"
-required-features = ["rt", "stm32l4x2"]
+required-features = ["rt"]
 
 [[example]]
 name = "adc_dma"
-required-features = ["rt", "stm32l4x1"]
+required-features = ["rt"]

examples/timer.rs

@@ -39,7 +39,7 @@ fn main() -> ! {
     // let mut led = gpiob.pb3.into_push_pull_output(&mut gpiob.moder, &mut gpiob.otyper);
 
     unsafe { NVIC::unmask(hal::stm32::Interrupt::TIM7) };
-    let mut timer = Timer::tim7(dp.TIM7, 1.hz(), clocks, &mut rcc.apb1r1);
+    let mut timer = Timer::tim6(dp.TIM6, 1.hz(), clocks, &mut rcc.apb1r1);
     timer.listen(Event::TimeOut);
 
     loop {

src/can.rs

@@ -45,7 +45,8 @@ mod common_pins {
     }
 }
 
-#[cfg(feature = "stm32l4x1")]
+// L4x1
+#[cfg(any(feature = "stm32l431", feature = "stm32l451", feature = "stm32l471"))]
 mod pb13_pb12_af10 {
     use crate::gpio::{
         gpiob::{PB12, PB13},

src/gpio.rs

@@ -709,7 +709,23 @@ gpio!(GPIOE, gpioe, PEx, 'E', 4, [
     PE15: (pe15, 15, Input<Floating>, H8, exticr4),
 ]);
 
-#[cfg(any(feature = "stm32l4x5", feature = "stm32l4x6"))]
+#[cfg(any(
+    // feature = "stm32l471",  // missing PAC support for Port G
+    feature = "stm32l475",
+    feature = "stm32l476",
+    feature = "stm32l485",
+    feature = "stm32l486",
+    feature = "stm32l496",
+    feature = "stm32l4a6",
+    // feature = "stm32l4p5",
+    // feature = "stm32l4q5",
+    // feature = "stm32l4r5",
+    // feature = "stm32l4s5",
+    // feature = "stm32l4r7",
+    // feature = "stm32l4s7",
+    feature = "stm32l4r9",
+    feature = "stm32l4s9",
+))]
 gpio!(GPIOF, gpiof, PFx, 'F', 5, [
     PF0: (pf0, 0, Input<Floating>, L8, exticr1),
     PF1: (pf1, 1, Input<Floating>, L8, exticr1),
@@ -728,8 +744,23 @@ gpio!(GPIOF, gpiof, PFx, 'F', 5, [
     PF14: (pf14, 14, Input<Floating>, H8, exticr4),
     PF15: (pf15, 15, Input<Floating>, H8, exticr4),
 ]);
-
-#[cfg(any(feature = "stm32l4x5", feature = "stm32l4x6"))]
+#[cfg(any(
+    // feature = "stm32l471",  // missing PAC support for Port G
+    feature = "stm32l475",
+    feature = "stm32l476",
+    feature = "stm32l485",
+    feature = "stm32l486",
+    feature = "stm32l496",
+    feature = "stm32l4a6",
+    // feature = "stm32l4p5",
+    // feature = "stm32l4q5",
+    // feature = "stm32l4r5",
+    // feature = "stm32l4s5",
+    // feature = "stm32l4r7",
+    // feature = "stm32l4s7",
+    feature = "stm32l4r9",
+    feature = "stm32l4s9",
+))]
 gpio!(GPIOG, gpiog, PGx, 'G', 6, [
     PG0: (pg0, 0, Input<Floating>, L8, exticr1),
     PG1: (pg1, 1, Input<Floating>, L8, exticr1),
@@ -758,9 +789,41 @@ impl<const P: char> Gpio<P> {
             'C' => crate::pac::GPIOC::ptr() as _,
             'D' => crate::pac::GPIOD::ptr() as _,
             'E' => crate::pac::GPIOE::ptr() as _,
-            #[cfg(any(feature = "stm32l4x5", feature = "stm32l4x6"))]
+            #[cfg(any(
+                // feature = "stm32l471",  // missing PAC support for Port F
+                feature = "stm32l475",
+                feature = "stm32l476",
+                feature = "stm32l485",
+                feature = "stm32l486",
+                feature = "stm32l496",
+                feature = "stm32l4a6",
+                // feature = "stm32l4p5",
+                // feature = "stm32l4q5",
+                // feature = "stm32l4r5",
+                // feature = "stm32l4s5",
+                // feature = "stm32l4r7",
+                // feature = "stm32l4s7",
+                feature = "stm32l4r9",
+                feature = "stm32l4s9",
+            ))]
             'F' => crate::pac::GPIOF::ptr() as _,
-            #[cfg(any(feature = "stm32l4x5", feature = "stm32l4x6"))]
+            #[cfg(any(
+                // feature = "stm32l471",  // missing PAC support for Port G
+                feature = "stm32l475",
+                feature = "stm32l476",
+                feature = "stm32l485",
+                feature = "stm32l486",
+                feature = "stm32l496",
+                feature = "stm32l4a6",
+                // feature = "stm32l4p5",
+                // feature = "stm32l4q5",
+                // feature = "stm32l4r5",
+                // feature = "stm32l4s5",
+                // feature = "stm32l4r7",
+                // feature = "stm32l4s7",
+                feature = "stm32l4r9",
+                feature = "stm32l4s9",
+            ))]
             'G' => crate::pac::GPIOG::ptr() as _,
             _ => crate::pac::GPIOA::ptr(),
         }