Configure PLL2R

.github/workflows/build_examples.yml

@@ -0,0 +1,48 @@
+name: Build LibDaisy Examples
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+
+    - name: Set up Rust
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: stable
+        override: true
+
+    - name: Install target
+      run: rustup target add thumbv7em-none-eabihf
+
+    - name: Cache cargo registry
+      uses: actions/cache@v2
+      with:
+        path: |
+          ~/.cargo/registry
+          ~/.cargo/git
+        key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-cargo-registry-
+
+    - name: Build examples
+      run: |
+        excluded_examples="sdmmc usb_midi"  # List of examples to exclude
+        for example in $(ls examples/*.rs); do
+          example_name=$(basename $example .rs)
+          if [[ ! " $excluded_examples " =~ " $example_name " ]]; then
+            cargo build --example $example_name
+          else
+            echo "Skipping $example_name"
+          fi
+        done

.github/workflows/ci.yml

@@ -33,4 +33,4 @@ jobs:
         with:
           use-cross: true
           command: build
-          args: --verbose --release --examples --target thumbv7em-none-eabihf --features ${{ matrix.logger }}
+          args: --verbose --release --target thumbv7em-none-eabihf --features ${{ matrix.logger }}

.github/workflows/nightly.yml

@@ -20,4 +20,4 @@ jobs:
         with:
           use-cross: true
           command: build
-          args: --verbose --release --examples --target thumbv7em-none-eabihf
+          args: --verbose --release --target thumbv7em-none-eabihf

Cargo.toml

@@ -5,7 +5,7 @@ description = "Hardware Abstraction Layer implementation for Daisy boards"
 keywords = ["cortex-m", "stm32h7xx", "stm32h750", "hal", "daisy"]
 readme = "README.md"
 name = "libdaisy"
-version = "0.1.0"
+version = "0.2.0"
 license = "MIT"
 repository = "https://github.com/mtthw-meyer/libdaisy-rust.git"
 documentation = "https://docs.rs/libdaisy"
@@ -14,28 +14,45 @@ exclude = [".gitignore"]
 [dependencies]
 cfg-if = "1"
 cortex-m = "0.7"
-cortex-m-log = { version = "0.8", features = ["itm", "semihosting", "log-integration"], optional = true  }
-cortex-m-rtic = "1"
-cortex-m-semihosting = { version = "0.5", optional = true  }
+cortex-m-log = { version = "0.8", features = [
+  "itm",
+  "semihosting",
+  "log-integration",
+], optional = true }
+cortex-m-semihosting = { version = "0.5", optional = true }
 debouncr = "0.2.2"
-lazy_static = { version = "1.4.0", features = ["spin_no_std"], optional = true  }
+lazy_static = { version = "1.4.0", features = ["spin_no_std"], optional = true }
 log = "0.4"
 micromath = "2"
 panic-halt = "0.2.0"
-panic-itm = { version = "0.4", optional = true  }
-panic-rtt-target = { version = "0.1.2", features = ["cortex-m"], optional = true }
-panic-semihosting = { version = "0.6", optional = true  }
-rtt-target = { version = "0.4.0", optional = true }
+panic-itm = { version = "0.4", optional = true }
+panic-rtt-target = { version = "0.1.3", optional = true }
+panic-semihosting = { version = "0.6", optional = true }
+rtt-target = { version = "0.5.0", optional = true }
 stm32-fmc = "0.3.0"
-stm32h7xx-hal = { version = "0.14.0", features = ["stm32h750v","rt","fmc", "xspi", "sdmmc", "sdmmc-fatfs", "usb_hs"] }
+stm32h7xx-hal = { version = "0.16.0", features = [
+  "stm32h750v",
+  "rt",
+  "fmc",
+  "xspi",
+  "sdmmc",
+  "sdmmc-fatfs",
+  "usb_hs",
+] }
+embedded-hal = "0.2"
 
 [features]
 default = []
 
-log-itm = ["panic-itm", "lazy_static", "cortex-m-log"]
+log-itm = ["dep:panic-itm", "dep:lazy_static", "dep:cortex-m-log"]
 log-none = []
-log-rtt = ["rtt-target", "panic-rtt-target"]
-log-semihosting = ["panic-semihosting", "lazy_static", "cortex-m-log", "cortex-m-semihosting"]
+log-rtt = ["dep:rtt-target", "dep:panic-rtt-target"]
+log-semihosting = [
+  "dep:lazy_static",
+  "dep:cortex-m-log",
+  "dep:cortex-m-semihosting",
+]
+panic-semihosting = ["dep:panic-semihosting"]
 
 # this lets you use `cargo fix`!
 #[[bin]]
@@ -44,18 +61,19 @@ log-semihosting = ["panic-semihosting", "lazy_static", "cortex-m-log", "cortex-m
 #bench = false
 
 [profile.dev]
-codegen-units = 1 # better optimizations
-debug = true # symbols are nice and they don't increase the size in flash
+codegen-units = 1   # better optimizations
+debug = true        # symbols are nice and they don't increase the size in flash
 incremental = false
-opt-level = "s" # optimize for binary size
+opt-level = "s"     # optimize for binary size
 
 [profile.release]
 codegen-units = 1 # better optimizations
-debug = true # symbols are nice and they don't increase the size in flash
-lto = true # better optimizations
-opt-level = "s" # optimize for binary size
+debug = true      # symbols are nice and they don't increase the size in flash
+lto = true        # better optimizations
+opt-level = "s"   # optimize for binary size
 
-[dev_dependencies]
+[dev-dependencies]
+cortex-m-rtic = "1"
 embedded-sdmmc = "0.4"
 libm = "0.2"
 num_enum = { version = "0.5", default-features = false }

README.md

@@ -33,6 +33,7 @@ One of:
 ```bash
 cargo embed --features log-rtt --example passthru
 ```
+**note** You will need to specify the board IE `--chip stm32h750v` for the daisy seed, or create an `Embed.toml` that specifies the chip.
 
 ## Build Examples
 

examples/blinky.rs

@@ -8,8 +8,7 @@
 )]
 mod app {
     // Includes a panic handler and optional logging facilities
-    use libdaisy::logger;
-    use libdaisy::{gpio, system};
+    use libdaisy::{gpio, logger, system};
     use log::info;
     use stm32h7xx_hal::{stm32, time::MilliSeconds, timer::Timer};
 
@@ -25,18 +24,26 @@ mod app {
     #[init]
     fn init(ctx: init::Context) -> (Shared, Local, init::Monotonics) {
         logger::init();
-        let mut system = system::System::init(ctx.core, ctx.device);
+        let mut core = ctx.core;
+        let device = ctx.device;
+        let ccdr = system::SeedSystem::init_clocks(device.PWR, device.RCC, &device.SYSCFG);
+        let system = libdaisy::seed_system_init!(core, device, ccdr);
         info!("Startup done!");
+        let mut timer2 = stm32h7xx_hal::timer::TimerExt::timer(
+            device.TIM2,
+            MilliSeconds::from_ticks(100).into_rate(),
+            ccdr.peripheral.TIM2,
+            &ccdr.clocks,
+        );
+        timer2.listen(stm32h7xx_hal::timer::Event::TimeOut);
 
-        system
-            .timer2
-            .set_freq(MilliSeconds::from_ticks(500).into_rate());
+        timer2.set_freq(MilliSeconds::from_ticks(500).into_rate());
 
         (
             Shared {},
             Local {
                 seed_led: system.gpio.led,
-                timer2: system.timer2,
+                timer2,
             },
             init::Monotonics(),
         )

examples/button.rs

@@ -0,0 +1,56 @@
+#![deny(warnings)]
+#![deny(unsafe_code)]
+#![no_std]
+#![no_main]
+
+#[rtic::app(device = stm32h7xx_hal::stm32, peripherals = true)]
+mod app {
+    use libdaisy::{
+        gpio,
+        hal::gpio::{Edge, ExtiPin},
+        logger, system,
+    };
+    use log::info;
+
+    #[shared]
+    struct Shared {}
+
+    #[local]
+    struct Local {
+        button: gpio::SeedButton,
+        led: gpio::SeedLed,
+    }
+
+    #[init]
+    fn init(ctx: init::Context) -> (Shared, Local, init::Monotonics) {
+        logger::init();
+        let mut core = ctx.core;
+        let mut device = ctx.device;
+        let ccdr = system::SeedSeedSystem::init_clocks(device.PWR, device.RCC, &device.SYSCFG);
+        let mut system = libdaisy::seed_seed_system_init!(core, device, ccdr);
+        info!("Startup done!");
+
+        // Button
+        system.gpio.button.make_interrupt_source(&mut device.SYSCFG);
+        system
+            .gpio
+            .button
+            .trigger_on_edge(&mut device.EXTI, Edge::Rising);
+        system.gpio.button.enable_interrupt(&mut device.EXTI);
+
+        (
+            Shared {},
+            Local {
+                button: system.gpio.button,
+                led: system.gpio.led,
+            },
+            init::Monotonics(),
+        )
+    }
+
+    #[task(binds = EXTI3, local = [button, led])]
+    fn button_click(ctx: button_click::Context) {
+        ctx.local.button.clear_interrupt_pending_bit();
+        ctx.local.led.toggle();
+    }
+}

examples/delay.rs

@@ -7,7 +7,10 @@
     peripherals = true,
 )]
 mod app {
-    use libdaisy::{audio, logger, system};
+    use libdaisy::{
+        audio::{self, AudioBuffer},
+        logger, system,
+    };
     use log::info;
 
     #[shared]
@@ -16,14 +19,18 @@ mod app {
     #[local]
     struct Local {
         audio: audio::Audio,
-        buffer: audio::AudioBuffer,
+        buffer: AudioBuffer,
         sdram: &'static mut [f32],
     }
 
     #[init]
     fn init(ctx: init::Context) -> (Shared, Local, init::Monotonics) {
         logger::init();
-        let system = system::System::init(ctx.core, ctx.device);
+
+        let mut core = ctx.core;
+        let device = ctx.device;
+        let ccdr = system::SeedSystem::init_clocks(device.PWR, device.RCC, &device.SYSCFG);
+        let system = libdaisy::seed_system_init!(core, device, ccdr);
         let buffer = [(0.0, 0.0); audio::BLOCK_SIZE_MAX];
 
         info!("Startup done!");

examples/flash.rs

@@ -26,12 +26,21 @@ mod app {
     #[init]
     fn init(ctx: init::Context) -> (Shared, Local, init::Monotonics) {
         logger::init();
-        let mut system = system::System::init(ctx.core, ctx.device);
+        let mut core = ctx.core;
+        let device = ctx.device;
+        let ccdr = system::SeedSystem::init_clocks(device.PWR, device.RCC, &device.SYSCFG);
+        let system = libdaisy::seed_system_init!(core, device, ccdr);
         info!("Startup done!");
+        let mut timer2 = stm32h7xx_hal::timer::TimerExt::timer(
+            device.TIM2,
+            MilliSeconds::from_ticks(100).into_rate(),
+            ccdr.peripheral.TIM2,
+            &ccdr.clocks,
+        );
 
-        system
-            .timer2
-            .set_freq(MilliSeconds::from_ticks(500).into_rate());
+        timer2.listen(stm32h7xx_hal::timer::Event::TimeOut);
+
+        timer2.set_freq(MilliSeconds::from_ticks(500).into_rate());
 
         let mut flash = system.flash;
 
@@ -79,7 +88,7 @@ mod app {
             Shared {},
             Local {
                 seed_led: system.gpio.led,
-                timer2: system.timer2,
+                timer2,
             },
             init::Monotonics(),
         )

examples/hid_blinky.rs

@@ -27,11 +27,22 @@ mod app {
     #[init]
     fn init(ctx: init::Context) -> (Shared, Local, init::Monotonics) {
         logger::init();
-        let mut system = system::System::init(ctx.core, ctx.device);
+        let mut core = ctx.core;
+        let device = ctx.device;
+        let ccdr = system::SeedSystem::init_clocks(device.PWR, device.RCC, &device.SYSCFG);
+        let mut system = libdaisy::seed_system_init!(core, device, ccdr);
+        info!("Startup done!");
 
-        system
-            .timer2
-            .set_freq(MilliSeconds::from_ticks(1).into_rate());
+        let mut timer2 = stm32h7xx_hal::timer::TimerExt::timer(
+            device.TIM2,
+            MilliSeconds::from_ticks(100).into_rate(),
+            ccdr.peripheral.TIM2,
+            &ccdr.clocks,
+        );
+
+        timer2.listen(stm32h7xx_hal::timer::Event::TimeOut);
+
+        timer2.set_freq(MilliSeconds::from_ticks(1).into_rate());
 
         let mut led1 = hid::Led::new(system.gpio.led, false, 1000);
         led1.set_brightness(0.5);
@@ -55,7 +66,7 @@ mod app {
                 led1,
                 adc1,
                 control1,
-                timer2: system.timer2,
+                timer2,
             },
             init::Monotonics(),
         )