2 files changed, 67 insertions, 41 deletions

diff --git a/examples/mcxa/src/bin/clkout.rs b/examples/mcxa/src/bin/clkout.rs
index 1e52912d3..c0e8c330d 100644
--- a/examples/mcxa/src/bin/clkout.rs
+++ b/examples/mcxa/src/bin/clkout.rs
@@ -4,6 +4,7 @@
 use embassy_executor::Spawner;
 use embassy_mcxa::clkout::{ClockOut, ClockOutSel, Config, Div4};
 use embassy_mcxa::clocks::PoweredClock;
+use embassy_mcxa::clocks::config::{SoscConfig, SoscMode, SpllConfig, SpllMode, SpllSource};
 use embassy_mcxa::gpio::{DriveStrength, Level, Output, SlewRate};
 use embassy_time::Timer;
 use {defmt_rtt as _, embassy_mcxa as hal, panic_probe as _};
@@ -11,58 +12,81 @@ use {defmt_rtt as _, embassy_mcxa as hal, panic_probe as _};
 /// Demonstrate CLKOUT, using Pin P4.2
 #[embassy_executor::main]
 async fn main(_spawner: Spawner) {
-    let p = hal::init(hal::config::Config::default());
+    let mut cfg = hal::config::Config::default();
+    cfg.clock_cfg.sosc = Some(SoscConfig {
+        mode: SoscMode::CrystalOscillator,
+        frequency: 8_000_000,
+        power: PoweredClock::NormalEnabledDeepSleepDisabled,
+    });
+    cfg.clock_cfg.spll = Some(SpllConfig {
+        source: SpllSource::Sirc,
+        // 12MHz
+        // 12 x 32 => 384MHz
+        // 384 / (16 x 2) => 12.0MHz
+        mode: SpllMode::Mode1b {
+            m_mult: 32,
+            p_div: 16,
+            bypass_p2_div: false,
+        },
+        power: PoweredClock::NormalEnabledDeepSleepDisabled,
+        pll1_clk_div: None,
+    });
+
+    let p = hal::init(cfg);
+
     let mut pin = p.P4_2;
     let mut clkout = p.CLKOUT;
 
-    loop {
-        defmt::info!("Set Low...");
-        let mut output = Output::new(pin.reborrow(), Level::Low, DriveStrength::Normal, SlewRate::Slow);
-        Timer::after_millis(500).await;
+    const K16_CONFIG: Config = Config {
+        sel: ClockOutSel::Clk16K,
+        div: Div4::no_div(),
+        level: PoweredClock::NormalEnabledDeepSleepDisabled,
+    };
+    const M4_CONFIG: Config = Config {
+        sel: ClockOutSel::Fro12M,
+        div: const { Div4::from_divisor(3).unwrap() },
+        level: PoweredClock::NormalEnabledDeepSleepDisabled,
+    };
+    const K512_CONFIG: Config = Config {
+        sel: ClockOutSel::ClkIn,
+        div: const { Div4::from_divisor(16).unwrap() },
+        level: PoweredClock::NormalEnabledDeepSleepDisabled,
+    };
+    const M1_CONFIG: Config = Config {
+        sel: ClockOutSel::Pll1Clk,
+        div: const { Div4::from_divisor(12).unwrap() },
+        level: PoweredClock::NormalEnabledDeepSleepDisabled,
+    };
 
+    #[rustfmt::skip]
+    let configs = [
+        ("16K -> /1 = 16K",  K16_CONFIG),
+        ("12M -> /3 = 4M",   M4_CONFIG),
+        ("8M -> /16 = 512K", K512_CONFIG),
+        ("12M-> /12 = 1M",   M1_CONFIG),
+    ];
+
+    loop {
         defmt::info!("Set High...");
-        output.set_high();
-        Timer::after_millis(400).await;
+        let mut output = Output::new(pin.reborrow(), Level::High, DriveStrength::Normal, SlewRate::Slow);
+        Timer::after_millis(250).await;
 
         defmt::info!("Set Low...");
         output.set_low();
-        Timer::after_millis(500).await;
+        Timer::after_millis(750).await;
 
-        defmt::info!("16k...");
-        // Run Clock Out with the 16K clock
-        let _clock_out = ClockOut::new(
-            clkout.reborrow(),
-            pin.reborrow(),
-            Config {
-                sel: ClockOutSel::Clk16K,
-                div: Div4::no_div(),
-                level: PoweredClock::NormalEnabledDeepSleepDisabled,
-            },
-        )
-        .unwrap();
+        for (name, conf) in configs.iter() {
+            defmt::info!("Running {=str}", name);
 
-        Timer::after_millis(3000).await;
-
-        defmt::info!("Set Low...");
-        drop(_clock_out);
+            let _clock_out = ClockOut::new(clkout.reborrow(), pin.reborrow(), *conf).unwrap();
 
-        let _output = Output::new(pin.reborrow(), Level::Low, DriveStrength::Normal, SlewRate::Slow);
-        Timer::after_millis(500).await;
+            Timer::after_millis(3000).await;
 
-        // Run Clock Out with the 12M clock, divided by 3
-        defmt::info!("4M...");
-        let _clock_out = ClockOut::new(
-            clkout.reborrow(),
-            pin.reborrow(),
-            Config {
-                sel: ClockOutSel::Fro12M,
-                div: const { Div4::from_divisor(3).unwrap() },
-                level: PoweredClock::NormalEnabledDeepSleepDisabled,
-            },
-        )
-        .unwrap();
+            defmt::info!("Set Low...");
+            drop(_clock_out);
 
-        // Let it run for 3 seconds...
-        Timer::after_millis(3000).await;
+            let _output = Output::new(pin.reborrow(), Level::Low, DriveStrength::Normal, SlewRate::Slow);
+            Timer::after_millis(500).await;
+        }
     }
 }
diff --git a/examples/mcxa/src/bin/reset-reason.rs b/examples/mcxa/src/bin/reset-reason.rs
index c244fbe04..2d48a92b1 100644
--- a/examples/mcxa/src/bin/reset-reason.rs
+++ b/examples/mcxa/src/bin/reset-reason.rs
@@ -11,5 +11,7 @@ async fn main(_spawner: Spawner) {
     let config = Config::default();
     let _p = hal::init(config);
 
-    defmt::info!("Reset Reason: '{}'", reset_reason());
+    for reason in reset_reason().into_iter() {
+        defmt::info!("Reset Reason: '{}'", reason);
+    }
 }