Lots of changes

.github/workflows/ci.yml

@@ -10,14 +10,22 @@ jobs:
       matrix:
         rust:
           - stable
-        feature:
+        device:
           - stm32g431
           - stm32g441
           - stm32g471
           - stm32g473
           - stm32g474
           - stm32g483
           - stm32g484
+          #- stm32g491 # Does not seem ready yet
+          #- stm32g4a1 # Does not seem ready yet
+        features:
+          - rt
+          - log-rtt,defmt
+          # TODO: -log-rtt # log-rtt without defmt, more combos?
+          - log-itm
+          - log-semihost
 
     steps:
       - uses: actions/checkout@v2
@@ -29,4 +37,8 @@ jobs:
           override: true
 
       - name: Regular build
-        run: cargo check --features ${{ matrix.feature }}
+        run: cargo check --features ${{ matrix.device }} --features ${{ matrix.features }}
+      - name: Build examples
+        run: cargo check --examples --features ${{ matrix.device }} --features ${{ matrix.features }}
+      - name: Clippy
+        run: cargo clippy --examples --features ${{ matrix.device }} --features ${{ matrix.features }}

.github/workflows/clippy.yml

@@ -19,4 +19,4 @@ jobs:
       - uses: actions-rs/clippy-check@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          args: --features=stm32g431 --target thumbv7em-none-eabihf
+          args: --features=stm32g484,log-rtt,defmt --target thumbv7em-none-eabihf

.gitignore

@@ -1,4 +1,7 @@
 /target/
 **/*.orig
 **/*.rs.bk
-Cargo.lock
+Cargo.lock
+
+# Remove idea files
+.idea/

Cargo.toml

@@ -11,13 +11,17 @@ readme = "README.md"
 repository = "https://github.com/stm32-rs/stm32g4xx-hal"
 version = "0.0.1"
 
+[patch.crates-io]
+stm32g4 = { path = "../stm32-rs/stm32g4" }
+
 [dependencies]
 nb = "0.1.1"
 stm32g4 = "0.15.1"
 paste = "1.0"
 bitflags = "1.2"
 vcell = "0.1"
 static_assertions = "1.1"
+fugit = "0.3.5"
 
 [dependencies.cortex-m]
 version = "0.7.7"
@@ -67,8 +71,6 @@ lazy_static = { version = "1.4", features = ["spin_no_std"] }
 log = "0.4.11"
 cortex-m-log = { version = "0.7", features = ["log-integration"] }
 cfg-if = "0.1.10"
-rtt-target = { version = "0.3.0", features = ["cortex-m"] }
-panic-rtt-target = { version = "0.1.1", features = ["cortex-m"] }
 mpu6050 = "0.1.4"
 bme680 = "0.6.0"
 embedded-sdmmc = "0.3.0"
@@ -102,3 +104,39 @@ debug = false
 codegen-units = 1
 incremental = false
 lto = true
+
+[[example]]
+name = "hrtim-adc-trigger"
+path = "examples/hrtim/adc-trigger.rs"
+
+[[example]]
+name = "hrtim-eev-comp"
+path = "examples/hrtim/eev-comp.rs"
+
+[[example]]
+name = "hrtim-eev-up-down"
+path = "examples/hrtim/eev-up-down.rs"
+
+[[example]]
+name = "hrtim-eev"
+path = "examples/hrtim/eev.rs"
+
+[[example]]
+name = "hrtim-flt-comp"
+path = "examples/hrtim/flt-comp.rs"
+
+[[example]]
+name = "hrtim-flt"
+path = "examples/hrtim/flt.rs"
+
+[[example]]
+name = "hrtim"
+path = "examples/hrtim/hrtim.rs"
+
+[[example]]
+name = "hrtim-master"
+path = "examples/hrtim/master.rs"
+
+[[example]]
+name = "hrtim-simple"
+path = "examples/hrtim/simple.rs"

examples/adc-continious-dma.rs

@@ -11,12 +11,13 @@ use crate::hal::{
     delay::SYSTDelayExt,
     dma::{config::DmaConfig, stream::DMAExt, TransferExt},
     gpio::GpioExt,
+    pwr::PwrExt,
     rcc::{Config, RccExt},
     stm32::Peripherals,
 };
 use stm32g4xx_hal as hal;
 
-use log::info;
+use utils::logger::info;
 
 #[macro_use]
 mod utils;
@@ -32,7 +33,8 @@ fn main() -> ! {
 
     info!("rcc");
     let rcc = dp.RCC.constrain();
-    let mut rcc = rcc.freeze(Config::hsi());
+    let pwr = dp.PWR.constrain().freeze();
+    let mut rcc = rcc.freeze(Config::hsi(), pwr);
 
     let streams = dp.DMA1.split(&rcc);
     let config = DmaConfig::default()
@@ -69,13 +71,17 @@ fn main() -> ! {
     loop {
         let mut b = [0_u16; 4];
         let r = transfer.read_exact(&mut b);
+        assert!(
+            !transfer.get_overrun_flag(),
+            "DMA did not have time to read the ADC value before ADC was done with a new conversion"
+        );
 
         info!("read: {}", r);
         assert!(r == b.len());
 
         let millivolts = Vref::sample_to_millivolts((b[0] + b[2]) / 2);
         info!("pa3: {}mV", millivolts);
         let temp = Temperature::temperature_to_degrees_centigrade((b[1] + b[3]) / 2);
-        info!("temp: {}℃C", temp); // Note: Temperature seems quite low...
+        info!("temp: {}℃", temp); // Note: Temperature seems quite low...
     }
 }

examples/adc-continious.rs

@@ -8,14 +8,15 @@ use crate::hal::{
     },
     delay::SYSTDelayExt,
     gpio::GpioExt,
+    pwr::PwrExt,
     rcc::{Config, RccExt},
     stm32::Peripherals,
 };
 use stm32g4xx_hal as hal;
 
 use cortex_m_rt::entry;
 
-use log::info;
+use utils::logger::info;
 
 #[macro_use]
 mod utils;
@@ -32,7 +33,8 @@ fn main() -> ! {
     info!("rcc");
 
     let rcc = dp.RCC.constrain();
-    let mut rcc = rcc.freeze(Config::hsi());
+    let pwr = dp.PWR.constrain().freeze();
+    let mut rcc = rcc.freeze(Config::hsi(), pwr);
 
     info!("Setup Gpio");
     let gpioa = dp.GPIOA.split(&mut rcc);

examples/adc-one-shot-dma.rs

@@ -11,6 +11,7 @@ use crate::hal::{
     delay::SYSTDelayExt,
     dma::{config::DmaConfig, stream::DMAExt, TransferExt},
     gpio::GpioExt,
+    pwr::PwrExt,
     rcc::{Config, RccExt},
     stm32::Peripherals,
 };
@@ -33,7 +34,8 @@ fn main() -> ! {
     info!("rcc");
 
     let rcc = dp.RCC.constrain();
-    let mut rcc = rcc.freeze(Config::hsi());
+    let pwr = dp.PWR.constrain().freeze();
+    let mut rcc = rcc.freeze(Config::hsi(), pwr);
 
     let mut streams = dp.DMA1.split(&rcc);
     let config = DmaConfig::default()

examples/adc-one-shot.rs

@@ -2,8 +2,9 @@
 #![no_std]
 
 use crate::hal::{
-    adc::{config::SampleTime, AdcClaim, ClockSource},
+    adc::{config::SampleTime, AdcClaim},
     delay::SYSTDelayExt,
+    pwr::PwrExt,
     rcc::Config,
     stm32::Peripherals,
 };
@@ -12,7 +13,7 @@ use stm32g4xx_hal as hal;
 
 use cortex_m_rt::entry;
 
-use log::info;
+use utils::logger::info;
 
 #[macro_use]
 mod utils;
@@ -29,26 +30,31 @@ fn main() -> ! {
     info!("rcc");
 
     let rcc = dp.RCC.constrain();
-    let mut rcc = rcc.freeze(Config::hsi());
+    let pwr = dp.PWR.constrain().freeze();
+    let mut rcc = rcc.freeze(Config::hsi(), pwr);
 
     info!("Setup Adc1");
     let mut delay = cp.SYST.delay(&rcc.clocks);
-    let mut adc = dp
-        .ADC1
-        .claim(ClockSource::SystemClock, &rcc, &mut delay, true);
+    let mut adc = dp.ADC2.claim_and_configure(
+        stm32g4xx_hal::adc::ClockSource::SystemClock,
+        &rcc,
+        stm32g4xx_hal::adc::config::AdcConfig::default(),
+        &mut delay,
+        false,
+    );
 
     info!("Setup Gpio");
 
     let gpioa = dp.GPIOA.split(&mut rcc);
-    let pa0 = gpioa.pa0.into_analog();
+    let pa7 = gpioa.pa7.into_analog();
 
     info!("Enter Loop");
 
     loop {
         info!("Convert");
-        let sample = adc.convert(&pa0, SampleTime::Cycles_640_5);
+        let sample = adc.convert(&pa7, SampleTime::Cycles_640_5);
         info!("sample to mv");
         let millivolts = adc.sample_to_millivolts(sample);
-        info!("pa3: {}mV", millivolts);
+        info!("pa7: {}mV", millivolts);
     }
 }

examples/bench.rs_

@@ -0,0 +1,81 @@
+#![no_main]
+#![no_std]
+
+use crate::hal::{
+    adc::{config::SampleTime, AdcClaim, ClockSource},
+    delay::SYSTDelayExt,
+    rcc::Config,
+    stm32::Peripherals,
+};
+use hal::prelude::*;
+use stm32g4xx_hal as hal;
+
+use cortex_m::peripheral::DWT;
+use cortex_m_rt::entry;
+
+use utils::logger::info;
+
+#[macro_use]
+mod utils;
+
+macro_rules! bench {
+    ($data:expr, $op:ident, $($arg:expr, )*) => {{
+        let start_cyc = DWT::cycle_count();
+        for i in 0..10000  {
+            $data = $data.$op($($arg, )*);
+        }
+        let cycles = DWT::cycle_count() - start_cyc;
+
+        defmt::info!("$op: {} cycles - {}", cycles, $data);
+    }};
+}
+
+#[entry]
+fn main() -> ! {
+    defmt::info!("init");
+
+    let dp = Peripherals::take().unwrap();
+    let cp = cortex_m::Peripherals::take().expect("cannot take core peripherals");
+
+    let rcc = dp.RCC.constrain();
+    let mut rcc = rcc.freeze(Config::hsi());
+
+    info!("Setup Adc1");
+    let mut delay = cp.SYST.delay(&rcc.clocks);
+    let mut adc = dp
+        .ADC1
+        .claim(ClockSource::SystemClock, &rcc, &mut delay, true);
+
+    info!("Setup Gpio");
+
+    let gpioa = dp.GPIOA.split(&mut rcc);
+    let pa0 = gpioa.pa0.into_analog();
+
+    let sample = adc.convert(&pa0, SampleTime::Cycles_640_5) as f32;
+
+    info!("Enter Loop");
+
+    let mut data = sample;
+
+    bench!(data, sin,);
+    bench!(data, sqrt,);
+    bench!(data, atan2, sample,);
+    bench!(data, atan2, sample,);
+
+    info!("done!");
+    loop {}
+}
+
+/// Hardware sqrt
+fn hsqrt(x: f32) -> f32 {
+    let mut result: f32;
+    unsafe {
+        core::arch::asm!(
+            "VSQRT.F32 {}, {}",
+            out(sreg) result, // Sreg for fpu register
+            in(sreg) x,
+        );
+    }
+
+    result
+}

examples/blinky.rs

@@ -8,11 +8,12 @@ use hal::stm32;
 use stm32g4xx_hal as hal;
 
 use cortex_m_rt::entry;
-use log::info;
 
 #[macro_use]
 mod utils;
 
+use utils::logger::info;
+
 #[entry]
 fn main() -> ! {
     utils::logger::init();
@@ -27,11 +28,12 @@ fn main() -> ! {
 
     loop {
         info!("Set Led low");
-        for _ in 0..100_000 {
+        for _ in 0..10_000_000 {
             led.set_low().unwrap();
         }
+
         info!("Set Led High");
-        for _ in 0..100_000 {
+        for _ in 0..10_000_000 {
             led.set_high().unwrap();
         }
     }