Merge pull request #530 from stm32-rs/adcc

ADC pac ext, unmacro Adc

Author: burrbull

CHANGELOG.md

@@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 
+- `Adc::new` instead of `Adc::adcX` and `AdcExt` trait
 - Update `bxcan`, `heapless`, `mfrc522`, reenable `mpu9250` example [#513]
 - PWM timer auto reload value is now preloaded/buffered [#453]
 - Move from bors/manual merge to GH merge queue [#467]

Cargo.toml

@@ -21,7 +21,7 @@ features = ["stm32f103", "rtic", "high"]
 default-target = "x86_64-unknown-linux-gnu"
 
 [dependencies]
-defmt = { version = "0.3.8", optional = true }
+defmt = { version = "1.0", optional = true }
 cortex-m = { version = "0.7.7", features = ["critical-section-single-core"] }
 cortex-m-rt = "0.7.3"
 nb = "1.1"
@@ -36,7 +36,7 @@ vcell = "0.1.3"
 
 [dependencies.stm32f1]
 package = "stm32f1-staging"
-version = "0.19.0"
+version = "0.20.0"
 features = ["atomics"]
 
 [dependencies.embedded-hal-02]
@@ -58,7 +58,7 @@ version = "0.7.0"
 optional = true
 
 [dev-dependencies]
-panic-halt = "0.2.0"
+panic-halt = "1.0.0"
 panic-semihosting = "0.6.0"
 panic-itm = "0.4.2"
 cortex-m-rtic = "1.1.3"

examples/adc-dma-circ.rs

@@ -28,7 +28,7 @@ fn main() -> ! {
     let dma_ch1 = p.DMA1.split().1;
 
     // Setup ADC
-    let adc1 = adc::Adc::adc1(p.ADC1, &clocks);
+    let adc1 = adc::Adc::new(p.ADC1, &clocks);
 
     // Setup GPIOA
     let mut gpioa = p.GPIOA.split();

examples/adc-dma-rx.rs

@@ -28,7 +28,7 @@ fn main() -> ! {
     let dma_ch1 = p.DMA1.split().1;
 
     // Setup ADC
-    let adc1 = adc::Adc::adc1(p.ADC1, &clocks);
+    let adc1 = adc::Adc::new(p.ADC1, &clocks);
 
     // Setup GPIOA
     let mut gpioa = p.GPIOA.split();

examples/adc.rs

@@ -25,10 +25,10 @@ fn main() -> ! {
     hprintln!("adc freq: {}", clocks.adcclk());
 
     // Setup ADC
-    let mut adc1 = adc::Adc::adc1(p.ADC1, &clocks);
+    let mut adc1 = adc::Adc::new(p.ADC1, &clocks);
 
     #[cfg(any(feature = "stm32f103", feature = "connectivity"))]
-    let mut adc2 = adc::Adc::adc2(p.ADC2, &clocks);
+    let mut adc2 = adc::Adc::new(p.ADC2, &clocks);
 
     // Setup GPIOB
     let mut gpiob = p.GPIOB.split();

examples/adc_temperature.rs

@@ -5,7 +5,7 @@
 use panic_semihosting as _;
 
 use cortex_m_rt::entry;
-use stm32f1xx_hal::{adc, pac, prelude::*};
+use stm32f1xx_hal::{pac, prelude::*};
 
 use cortex_m_semihosting::hprintln;
 
@@ -38,7 +38,7 @@ fn main() -> ! {
     hprintln!("adc freq: {}", clocks.adcclk());
 
     // Setup ADC
-    let mut adc = adc::Adc::adc1(p.ADC1, &clocks);
+    let mut adc = p.ADC1.adc(&clocks);
 
     // Read temperature sensor
     loop {