Demacrofy ADC

Split out common adc parts to avoid safety issues

Clean up adc

Update tests and examples for adc changes

Use indices for arrayified fields

Author: usbalbin

Cargo.toml

@@ -89,13 +89,13 @@ rt = ["stm32g4/rt"]
 usb = ["dep:stm32-usbd"]
 stm32g431 = ["stm32g4/stm32g431"]
 stm32g441 = ["stm32g4/stm32g441"]
-stm32g471 = ["stm32g4/stm32g471"]
-stm32g473 = ["stm32g4/stm32g473"]
-stm32g474 = ["stm32g4/stm32g474"]
-stm32g483 = ["stm32g4/stm32g483"]
-stm32g484 = ["stm32g4/stm32g484"]
-stm32g491 = ["stm32g4/stm32g491"]
-stm32g4a1 = ["stm32g4/stm32g4a1"]
+stm32g471 = ["stm32g4/stm32g471", "adc3"]
+stm32g473 = ["stm32g4/stm32g473", "adc3", "adc4", "adc5"]
+stm32g474 = ["stm32g4/stm32g474", "adc3", "adc4", "adc5"]
+stm32g483 = ["stm32g4/stm32g483", "adc3", "adc4", "adc5"]
+stm32g484 = ["stm32g4/stm32g484", "adc3", "adc4", "adc5"]
+stm32g491 = ["stm32g4/stm32g491", "adc3"]
+stm32g4a1 = ["stm32g4/stm32g4a1", "adc3"]
 log-itm = ["cortex-m-log/itm"]
 log-rtt = []
 log-semihost = ["cortex-m-log/semihosting"]
@@ -107,6 +107,9 @@ defmt = [
     "embedded-io/defmt-03",
 ]
 cordic = ["dep:fixed"]
+adc3 = []
+adc4 = []
+adc5 = []
 
 [profile.dev]
 codegen-units = 1

examples/adc-continious-dma.rs

@@ -8,7 +8,7 @@ use crate::hal::{
     adc::{
         config,
         config::{Continuous, Dma as AdcDma, SampleTime, Sequence},
-        AdcClaim, ClockSource, Temperature, Vref,
+        AdcClaim, Vref,
     },
     delay::SYSTDelayExt,
     dma::{channel::DMAExt, config::DmaConfig, TransferExt},
@@ -18,7 +18,10 @@ use crate::hal::{
     signature::{VrefCal, VDDA_CALIB},
     stm32::Peripherals,
 };
-use stm32g4xx_hal as hal;
+use stm32g4xx_hal::{
+    self as hal,
+    adc::{temperature::Temperature, AdcCommonExt},
+};
 
 use cortex_m_rt::entry;
 
@@ -49,12 +52,11 @@ fn main() -> ! {
     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 adc12_common = dp.ADC12_COMMON.claim(Default::default(), &mut rcc);
+    let mut adc = adc12_common.claim(dp.ADC1, &mut delay);
 
-    adc.enable_temperature(&dp.ADC12_COMMON);
-    adc.enable_vref(&dp.ADC12_COMMON);
+    adc12_common.enable_temperature();
+    adc12_common.enable_vref();
     adc.set_continuous(Continuous::Continuous);
     adc.reset_sequence();
     adc.configure_channel(&pa0, Sequence::One, SampleTime::Cycles_640_5);

examples/adc-continious.rs

@@ -4,7 +4,7 @@
 use crate::hal::{
     adc::{
         config::{Continuous, Resolution, SampleTime, Sequence},
-        AdcClaim, ClockSource, Temperature, Vref,
+        AdcClaim, Vref,
     },
     delay::SYSTDelayExt,
     gpio::GpioExt,
@@ -13,7 +13,10 @@ use crate::hal::{
     signature::{VrefCal, VDDA_CALIB},
     stm32::Peripherals,
 };
-use stm32g4xx_hal as hal;
+use stm32g4xx_hal::{
+    self as hal,
+    adc::{temperature::Temperature, AdcCommonExt},
+};
 
 use cortex_m_rt::entry;
 
@@ -43,12 +46,11 @@ fn main() -> ! {
 
     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 adc12_common = dp.ADC12_COMMON.claim(Default::default(), &mut rcc);
+    let mut adc = adc12_common.claim(dp.ADC1, &mut delay);
 
-    adc.enable_temperature(&dp.ADC12_COMMON);
-    adc.enable_vref(&dp.ADC12_COMMON);
+    adc12_common.enable_temperature();
+    adc12_common.enable_vref();
     adc.set_auto_delay(true);
     adc.set_continuous(Continuous::Continuous);
     adc.reset_sequence();

examples/adc-one-shot-dma.rs

@@ -6,7 +6,7 @@ use cortex_m_rt::entry;
 use crate::hal::{
     adc::{
         config::{Continuous, Dma as AdcDma, Resolution, SampleTime, Sequence},
-        AdcClaim, ClockSource, Temperature,
+        AdcClaim,
     },
     delay::SYSTDelayExt,
     dma::{channel::DMAExt, config::DmaConfig, TransferExt},
@@ -15,7 +15,10 @@ use crate::hal::{
     rcc::{Config, RccExt},
     stm32::Peripherals,
 };
-use stm32g4xx_hal as hal;
+use stm32g4xx_hal::{
+    self as hal,
+    adc::{temperature::Temperature, AdcCommonExt},
+};
 
 #[macro_use]
 mod utils;
@@ -49,11 +52,10 @@ fn main() -> ! {
     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 adc12_common = dp.ADC12_COMMON.claim(Default::default(), &mut rcc);
+    let mut adc = adc12_common.claim(dp.ADC1, &mut delay);
 
-    adc.enable_temperature(&dp.ADC12_COMMON);
+    adc12_common.enable_temperature();
     adc.set_continuous(Continuous::Single);
     adc.reset_sequence();
     adc.configure_channel(&pa0, Sequence::One, SampleTime::Cycles_640_5);

examples/adc-one-shot.rs

@@ -8,7 +8,7 @@ use crate::hal::{
     stm32::Peripherals,
 };
 use hal::prelude::*;
-use stm32g4xx_hal as hal;
+use stm32g4xx_hal::{self as hal, adc::AdcCommonExt};
 
 use cortex_m_rt::entry;
 
@@ -33,12 +33,11 @@ fn main() -> ! {
 
     info!("Setup Adc1");
     let mut delay = cp.SYST.delay(&rcc.clocks);
-    let mut adc = dp.ADC2.claim_and_configure(
-        stm32g4xx_hal::adc::ClockSource::SystemClock,
-        &rcc,
+    let adc12_common = dp.ADC12_COMMON.claim(Default::default(), &mut rcc);
+    let mut adc = adc12_common.claim_and_configure(
+        dp.ADC2,
         stm32g4xx_hal::adc::config::AdcConfig::default(),
         &mut delay,
-        false,
     );
 
     info!("Setup Gpio");

examples/observe.rs

@@ -17,7 +17,12 @@ use hal::{
     stm32,
 };
 use rt::entry;
-use stm32g4xx_hal::{self as hal, adc::config::SampleTime, delay::DelayExt as _, stasis::Freeze};
+use stm32g4xx_hal::{
+    self as hal,
+    adc::{config::SampleTime, AdcCommonExt},
+    delay::DelayExt as _,
+    stasis::Freeze,
+};
 
 #[entry]
 fn main() -> ! {
@@ -40,12 +45,11 @@ fn main() -> ! {
     let _comp1 = comp1.enable(); // <-- TODO: Do things with comparator
 
     let mut delay = cp.SYST.delay(&rcc.clocks);
-    let mut adc = dp.ADC1.claim_and_configure(
-        stm32g4xx_hal::adc::ClockSource::SystemClock,
-        &rcc,
+    let adc12_common = dp.ADC12_COMMON.claim(Default::default(), &mut rcc);
+    let mut adc = adc12_common.claim_and_configure(
+        dp.ADC1,
         stm32g4xx_hal::adc::config::AdcConfig::default(),
         &mut delay,
-        false,
     );
 
     // Can not reconfigure pa1 here

examples/opamp.rs

@@ -4,7 +4,7 @@
 #![no_main]
 
 use stm32g4xx_hal::adc::AdcClaim;
-use stm32g4xx_hal::adc::ClockSource;
+use stm32g4xx_hal::adc::AdcCommonExt;
 use stm32g4xx_hal::opamp::Gain;
 use stm32g4xx_hal::prelude::*;
 use stm32g4xx_hal::pwr::PwrExt;
@@ -66,9 +66,8 @@ fn main() -> ! {
     let opamp2 = opamp2.lock();
 
     let mut delay = cp.SYST.delay(&rcc.clocks);
-    let mut adc = dp
-        .ADC2
-        .claim(ClockSource::SystemClock, &rcc, &mut delay, true);
+    let adc12_common = dp.ADC12_COMMON.claim(Default::default(), &mut rcc);
+    let mut adc = adc12_common.claim(dp.ADC2, &mut delay);
 
     loop {
         // Here we can sample the output of opamp2 as if it was a regular AD pin