From 203297b56912c05d2dd6a009ffeb433fb2ffbea6 Mon Sep 17 00:00:00 2001
From: Dion Dokter <diondokter@gmail.com>
Date: Mon, 8 Jul 2024 16:54:06 +0200
Subject: Make clocks repr C. Add shared data. Modify freq functions to use
 shared data. Modify examples to use new init/

---
 examples/stm32h755cm4/.cargo/config.toml |  2 +-
 examples/stm32h755cm4/memory.x           |  2 +-
 examples/stm32h755cm4/src/bin/blinky.rs  | 16 ++++++++++++----
 examples/stm32h755cm7/.cargo/config.toml |  2 +-
 examples/stm32h755cm7/src/bin/blinky.rs  | 12 ++++++++++--
 5 files changed, 25 insertions(+), 9 deletions(-)

(limited to 'examples')

diff --git a/examples/stm32h755cm4/.cargo/config.toml b/examples/stm32h755cm4/.cargo/config.toml
index f9ae6f2e7..193e6bbc3 100644
--- a/examples/stm32h755cm4/.cargo/config.toml
+++ b/examples/stm32h755cm4/.cargo/config.toml
@@ -1,5 +1,5 @@
 [target.thumbv7em-none-eabihf]
-runner = 'probe-rs run --chip STM32H755ZITx'
+runner = 'probe-rs run --chip STM32H755ZITx --catch-hardfault --always-print-stacktrace'
 
 [build]
 target = "thumbv7em-none-eabihf" # Cortex-M4F and Cortex-M7F (with FPU)
diff --git a/examples/stm32h755cm4/memory.x b/examples/stm32h755cm4/memory.x
index f946b6210..538bac586 100644
--- a/examples/stm32h755cm4/memory.x
+++ b/examples/stm32h755cm4/memory.x
@@ -1,7 +1,7 @@
 MEMORY
 {
     FLASH    : ORIGIN = 0x08100000, LENGTH = 1024K /* BANK_2 */
-    RAM      : ORIGIN = 0x30000000, LENGTH = 128K  /* SRAM1 */
+    RAM      : ORIGIN = 0x10000000, LENGTH = 128K  /* SRAM1 */
     RAM_D3   : ORIGIN = 0x38000000, LENGTH = 64K   /* SRAM4 */
 }
 
diff --git a/examples/stm32h755cm4/src/bin/blinky.rs b/examples/stm32h755cm4/src/bin/blinky.rs
index 765be5ba1..52db326b0 100644
--- a/examples/stm32h755cm4/src/bin/blinky.rs
+++ b/examples/stm32h755cm4/src/bin/blinky.rs
@@ -1,15 +1,23 @@
 #![no_std]
 #![no_main]
 
+use core::mem::MaybeUninit;
+
 use defmt::*;
 use embassy_executor::Spawner;
-use embassy_stm32::gpio::{Level, Output, Speed};
+use embassy_stm32::{
+    gpio::{Level, Output, Speed},
+    SharedData,
+};
 use embassy_time::Timer;
 use {defmt_rtt as _, panic_probe as _};
 
+#[link_section = ".ram_d3"]
+static SHARED_DATA: MaybeUninit<SharedData> = MaybeUninit::uninit();
+
 #[embassy_executor::main]
 async fn main(_spawner: Spawner) {
-    let p = embassy_stm32::init(Default::default());
+    let p = embassy_stm32::init_secondary(&SHARED_DATA);
     info!("Hello World!");
 
     let mut led = Output::new(p.PE1, Level::High, Speed::Low);
@@ -17,10 +25,10 @@ async fn main(_spawner: Spawner) {
     loop {
         info!("high");
         led.set_high();
-        Timer::after_millis(500).await;
+        Timer::after_millis(250).await;
 
         info!("low");
         led.set_low();
-        Timer::after_millis(500).await;
+        Timer::after_millis(250).await;
     }
 }
diff --git a/examples/stm32h755cm7/.cargo/config.toml b/examples/stm32h755cm7/.cargo/config.toml
index f9ae6f2e7..193e6bbc3 100644
--- a/examples/stm32h755cm7/.cargo/config.toml
+++ b/examples/stm32h755cm7/.cargo/config.toml
@@ -1,5 +1,5 @@
 [target.thumbv7em-none-eabihf]
-runner = 'probe-rs run --chip STM32H755ZITx'
+runner = 'probe-rs run --chip STM32H755ZITx --catch-hardfault --always-print-stacktrace'
 
 [build]
 target = "thumbv7em-none-eabihf" # Cortex-M4F and Cortex-M7F (with FPU)
diff --git a/examples/stm32h755cm7/src/bin/blinky.rs b/examples/stm32h755cm7/src/bin/blinky.rs
index 396b8c718..f76395326 100644
--- a/examples/stm32h755cm7/src/bin/blinky.rs
+++ b/examples/stm32h755cm7/src/bin/blinky.rs
@@ -1,12 +1,20 @@
 #![no_std]
 #![no_main]
 
+use core::mem::MaybeUninit;
+
 use defmt::*;
 use embassy_executor::Spawner;
-use embassy_stm32::gpio::{Level, Output, Speed};
+use embassy_stm32::{
+    gpio::{Level, Output, Speed},
+    SharedData,
+};
 use embassy_time::Timer;
 use {defmt_rtt as _, panic_probe as _};
 
+#[link_section = ".ram_d3"]
+static SHARED_DATA: MaybeUninit<SharedData> = MaybeUninit::uninit();
+
 #[embassy_executor::main]
 async fn main(_spawner: Spawner) {
     let mut config = embassy_stm32::Config::default();
@@ -31,7 +39,7 @@ async fn main(_spawner: Spawner) {
         config.rcc.voltage_scale = VoltageScale::Scale1;
         config.rcc.supply_config = SupplyConfig::DirectSMPS;
     }
-    let p = embassy_stm32::init(config);
+    let p = embassy_stm32::init_primary(config, &SHARED_DATA);
     info!("Hello World!");
 
     let mut led = Output::new(p.PB14, Level::High, Speed::Low);
-- 
cgit