Rework examples for RM0468 devices

Author: richardeoin

Cargo.toml

@@ -131,15 +131,15 @@ required-features = ["rt"]
 
 [[example]]
 name = "rtic_timers"
-required-features = ["rt"]
+required-features = ["rt", "rm0433"]
 
 [[example]]
 name = "vos0"
 required-features = ["revision_v", "rm0433"]
 
 [[example]]
 name = "fmc"
-required-features = ["fmc"]
+required-features = ["fmc", "rm0399"]
 
 [[example]]
 name = "qspi"

examples/fmc.rs

@@ -1,4 +1,7 @@
 //! FMC Example
+//!
+//! Tested on a STM32H747I-DISCO
+
 #![no_main]
 #![no_std]
 

examples/prec_kernel_clocks.rs

@@ -6,7 +6,7 @@
 mod utilities;
 
 use cortex_m_rt::entry;
-use stm32h7xx_hal::rcc::{rec, rec::I2c123ClkSel, ResetEnable};
+use stm32h7xx_hal::rcc::{rec, rec::Spi123ClkSel, ResetEnable};
 use stm32h7xx_hal::{pac, prelude::*};
 
 fn enable_fdcan(rec: rec::Fdcan) {
@@ -34,8 +34,8 @@ fn main() -> ! {
         .pll3_r_ck(4.mhz())
         .freeze(pwrcfg, &dp.SYSCFG);
 
-    // Set group kernel clock to PLL3 R CK. Needs mutable ccdr
-    ccdr.peripheral.kernel_i2c123_clk_mux(I2c123ClkSel::PLL3_R);
+    // Set group kernel clock to PLL3 P CK. Needs mutable ccdr
+    ccdr.peripheral.kernel_spi123_clk_mux(Spi123ClkSel::PLL3_P);
 
     // (now ccdr can be immutable)
 

examples/rtic.rs

@@ -8,7 +8,7 @@ extern crate rtic;
 use stm32h7xx_hal::hal::digital::v2::ToggleableOutputPin;
 
 use rtic::app;
-use stm32h7xx_hal::gpio::{gpioc::PC13, gpioi::PI13};
+use stm32h7xx_hal::gpio::gpioc::{PC13, PC3};
 use stm32h7xx_hal::gpio::{Edge, ExtiPin, Floating, Input};
 use stm32h7xx_hal::gpio::{Output, PushPull};
 use stm32h7xx_hal::prelude::*;
@@ -23,7 +23,7 @@ use panic_halt as _;
 const APP: () = {
     struct Resources {
         button: PC13<Input<Floating>>,
-        led: PI13<Output<PushPull>>,
+        led: PC3<Output<PushPull>>,
     }
 
     #[init]
@@ -37,7 +37,6 @@ const APP: () = {
 
         // GPIO
         let gpioc = ctx.device.GPIOC.split(ccdr.peripheral.GPIOC);
-        let gpioi = ctx.device.GPIOI.split(ccdr.peripheral.GPIOI);
 
         // Button
         let mut button = gpioc.pc13.into_floating_input();
@@ -47,7 +46,7 @@ const APP: () = {
 
         init::LateResources {
             button,
-            led: gpioi.pi13.into_push_pull_output(),
+            led: gpioc.pc3.into_push_pull_output(),
         }
     }
 

examples/rtic_low_power.rs

@@ -25,7 +25,7 @@ extern crate rtic;
 use stm32h7xx_hal::hal::digital::v2::{OutputPin, ToggleableOutputPin};
 
 use rtic::app;
-use stm32h7xx_hal::gpio::gpioi::{PI12, PI13, PI14};
+use stm32h7xx_hal::gpio::gpioc::{PC2, PC3, PC4};
 use stm32h7xx_hal::gpio::{Edge, ExtiPin, Output, PushPull};
 use stm32h7xx_hal::prelude::*;
 use stm32h7xx_hal::rcc::LowPowerMode;
@@ -35,9 +35,9 @@ use stm32h7xx_hal::timer::{Enabled, Event, LpTimer, Timer};
 #[app(device = stm32h7xx_hal::stm32, peripherals = true)]
 const APP: () = {
     struct Resources {
-        led1: PI12<Output<PushPull>>,
-        led2: PI13<Output<PushPull>>,
-        led3: PI14<Output<PushPull>>,
+        led1: PC2<Output<PushPull>>,
+        led2: PC3<Output<PushPull>>,
+        led3: PC4<Output<PushPull>>,
         timer1: Timer<TIM1>,
         timer2: Timer<TIM2>,
         timer3: LpTimer<LPTIM3, Enabled>,
@@ -96,7 +96,6 @@ const APP: () = {
 
         // GPIO
         let gpioc = ctx.device.GPIOC.split(ccdr.peripheral.GPIOC);
-        let gpioi = ctx.device.GPIOI.split(ccdr.peripheral.GPIOI);
 
         // Enter CStop mode
         let mut scb = ctx.core.SCB;
@@ -110,9 +109,9 @@ const APP: () = {
         wakeup.enable_interrupt(&mut exti);
 
         // LEDs
-        let mut led1 = gpioi.pi12.into_push_pull_output();
-        let mut led2 = gpioi.pi13.into_push_pull_output();
-        let mut led3 = gpioi.pi14.into_push_pull_output();
+        let mut led1 = gpioc.pc2.into_push_pull_output();
+        let mut led2 = gpioc.pc3.into_push_pull_output();
+        let mut led3 = gpioc.pc4.into_push_pull_output();
 
         led1.set_high().ok();
         led2.set_high().ok();

examples/watchdog.rs

@@ -33,6 +33,10 @@ fn main() -> ! {
     #[cfg(all(feature = "rm0399", feature = "cm4"))]
     let mut watchdog = SystemWindowWatchdog::new(dp.WWDG2, &ccdr);
 
+    // RM0468
+    #[cfg(all(feature = "rm0468"))]
+    let mut watchdog = SystemWindowWatchdog::new(dp.WWDG1, &ccdr);
+
     info!("");
     info!("stm32h7xx-hal example - Watchdog");
     info!("");

src/lib.rs

@@ -177,7 +177,7 @@ pub mod qei;
 #[cfg(all(
     feature = "device-selected",
     feature = "quadspi",
-    not(feature = "rm0455")
+    not(any(feature = "rm0455", feature = "rm0468"))
 ))]
 pub mod qspi;
 #[cfg(feature = "device-selected")]

src/prelude.rs

@@ -15,7 +15,10 @@ pub use crate::i2c::I2cExt as _stm32h7xx_hal_i2c_I2cExt;
 pub use crate::pwm::PwmAdvExt as _stm32_hal_pwm_PwmAdvExt;
 pub use crate::pwm::PwmExt as _stm32_hal_pwm_PwmExt;
 pub use crate::pwr::PwrExt as _stm32h7xx_hal_pwr_PwrExt;
-#[cfg(all(feature = "quadspi", not(feature = "rm0455")))]
+#[cfg(all(
+    feature = "quadspi",
+    not(any(feature = "rm0455", feature = "rm0468"))
+))]
 pub use crate::qspi::QspiExt as _stm32h7xx_hal_qspi_QspiExt;
 pub use crate::rcc::RccExt as _stm32h7xx_hal_rcc_RccExt;
 pub use crate::rng::RngCore as _stm32h7xx_hal_rng_RngCore;