undoing channel split

1 files changed, 50 insertions, 104 deletions

diff --git a/embassy-stm32/src/adc/v3.rs b/embassy-stm32/src/adc/v3.rs
index c77a1d4f5..c65357aff 100644
--- a/embassy-stm32/src/adc/v3.rs
+++ b/embassy-stm32/src/adc/v3.rs
@@ -11,10 +11,9 @@ pub use pac::adc::vals::{Ovsr, Ovss, Presc};
 
 #[allow(unused_imports)]
 use super::SealedAdcChannel;
-#[allow(unused_imports)]
 use super::{Adc, Averaging, Instance, Resolution, SampleTime, Temperature, Vbat, VrefInt, blocking_delay_us};
 use crate::adc::ConversionMode;
-use crate::{Peri, pac, peripherals, rcc};
+use crate::{Peri, pac, rcc};
 
 /// Default VREF voltage used for sample conversion to millivolts.
 pub const VREF_DEFAULT_MV: u32 = 3300;
@@ -490,22 +489,6 @@ impl<'d, T: Instance> Adc<'d, T> {
         s
     }
 
-    #[cfg(any(adc_g0, adc_u0))]
-    pub fn enable_vbat(&self) -> Vbat {
-        T::regs().ccr().modify(|reg| {
-            reg.set_vbaten(true);
-        });
-
-        Vbat {}
-    }
-
-    #[cfg(any(adc_g0, adc_u0))]
-    pub fn disable_vbat(&self) {
-        T::regs().ccr().modify(|reg| {
-            reg.set_vbaten(false);
-        });
-    }
-
     #[cfg(adc_g0)]
     /// Initialize ADC with explicit clock for the analog ADC
     pub fn new_with_clock(adc: Peri<'d, T>, clock: Clock) -> Self {
@@ -542,124 +525,87 @@ impl<'d, T: Instance> Adc<'d, T> {
         Self { adc }
     }
 
-    /*
-    /// Convert a raw sample from the `Temperature` to deg C
-    pub fn to_degrees_centigrade(sample: u16) -> f32 {
-        (130.0 - 30.0) / (VtempCal130::get().read() as f32 - VtempCal30::get().read() as f32)
-            * (sample as f32 - VtempCal30::get().read() as f32)
-            + 30.0
-    }
-     */
-}
+    pub fn enable_vrefint(&self) -> VrefInt {
+        #[cfg(not(any(adc_g0, adc_u0)))]
+        T::common_regs().ccr().modify(|reg| {
+            reg.set_vrefen(true);
+        });
+        #[cfg(any(adc_g0, adc_u0))]
+        T::regs().ccr().modify(|reg| {
+            reg.set_vrefen(true);
+        });
 
-#[cfg(not(any(adc_g0, adc_u0, stm32wb)))]
-impl<'d> Adc<'d, peripherals::ADC2> {
-    pub fn enable_vbat(&self) -> Vbat {
-        cfg_if! {
-            if #[cfg(any(adc_h5, adc_h7rs))] {
-                pac::ADC12_COMMON.ccr().modify(|reg| {
-                    reg.set_vbaten(true);
-                });
-            } else if #[cfg(stm32l4)] {
-                pac::ADC123_COMMON.ccr().modify(|reg| {
-                    reg.set_ch18sel(true);
-                });
-            } else {
-                pac::ADC12_COMMON.ccr().modify(|reg| {
-                    reg.set_ch18sel(true);
-                });
-            }
-        }
+        // "Table 24. Embedded internal voltage reference" states that it takes a maximum of 12 us
+        // to stabilize the internal voltage reference.
+        blocking_delay_us(15);
 
-        Vbat {}
+        VrefInt {}
     }
 
-    pub fn disable_vbat(&self) {
+    pub fn enable_temperature(&self) -> Temperature {
         cfg_if! {
-            if #[cfg(any(adc_h5, adc_h7rs))] {
-                pac::ADC12_COMMON.ccr().modify(|reg| {
-                    reg.set_vbaten(false);
+            if #[cfg(any(adc_g0, adc_u0))] {
+                T::regs().ccr().modify(|reg| {
+                    reg.set_tsen(true);
                 });
-            } else if #[cfg(stm32l4)] {
-                pac::ADC123_COMMON.ccr().modify(|reg| {
-                    reg.set_ch18sel(false);
+            } else if #[cfg(any(adc_h5, adc_h7rs))] {
+                T::common_regs().ccr().modify(|reg| {
+                    reg.set_tsen(true);
                 });
             } else {
-                pac::ADC12_COMMON.ccr().modify(|reg| {
-                    reg.set_ch18sel(false);
+                T::common_regs().ccr().modify(|reg| {
+                    reg.set_ch17sel(true);
                 });
             }
         }
-    }
-
-    #[cfg(any(adc_h5, adc_h7rs))]
-    pub fn enable_vddcore(&self) -> VddCore {
-        pac::ADC2.or().modify(|reg| {
-            reg.set_op0(true);
-        });
 
-        VddCore {}
+        Temperature {}
     }
-}
 
-impl<'d> Adc<'d, peripherals::ADC1> {
-    pub fn enable_vrefint(&self) -> VrefInt {
+    pub fn enable_vbat(&self) -> Vbat {
         cfg_if! {
-            if #[cfg(any(adc_h5, adc_h7rs))] {
-                pac::ADC12_COMMON.ccr().modify(|reg| {
-                    reg.set_vrefen(true);
-                });
-            } else if #[cfg(any(adc_g0, adc_u0))] {
-                pac::ADC1.ccr().modify(|reg| {
-                    reg.set_vrefen(true);
+            if #[cfg(any(adc_g0, adc_u0))] {
+                T::regs().ccr().modify(|reg| {
+                    reg.set_vbaten(true);
                 });
-            } else if #[cfg(stm32l4)] {
-                pac::ADC123_COMMON.ccr().modify(|reg| {
-                    reg.set_vrefen(true);
+            } else if #[cfg(any(adc_h5, adc_h7rs))] {
+                T::common_regs().ccr().modify(|reg| {
+                    reg.set_vbaten(true);
                 });
             } else {
-                pac::ADC1_COMMON.ccr().modify(|reg| {
-                    reg.set_vrefen(true);
+                T::common_regs().ccr().modify(|reg| {
+                    reg.set_ch18sel(true);
                 });
             }
         }
 
-        // "Table 24. Embedded internal voltage reference" states that it takes a maximum of 12 us
-        // to stabilize the internal voltage reference.
-        blocking_delay_us(15);
-
-        VrefInt {}
+        Vbat {}
     }
 
-    pub fn enable_temperature(&self) -> Temperature {
+    pub fn disable_vbat(&self) {
         cfg_if! {
             if #[cfg(any(adc_g0, adc_u0))] {
-                pac::ADC1.ccr().modify(|reg| {
-                    reg.set_tsen(true);
+                T::regs().ccr().modify(|reg| {
+                    reg.set_vbaten(false);
                 });
-
-                Temperature {}
             } else if #[cfg(any(adc_h5, adc_h7rs))] {
-                pac::ADC12_COMMON.ccr().modify(|reg| {
-                    reg.set_tsen(true);
-                });
-
-                Temperature {}
-            } else if #[cfg(stm32wb)] {
-                todo!();
-            } else if #[cfg(stm32l4)] {
-                pac::ADC123_COMMON.ccr().modify(|reg| {
-                    reg.set_ch17sel(true);
+                T::common_regs().ccr().modify(|reg| {
+                    reg.set_vbaten(false);
                 });
-
-                Temperature {}
             } else {
-                pac::ADC12_COMMON.ccr().modify(|reg| {
-                    reg.set_ch17sel(true);
+                T::common_regs().ccr().modify(|reg| {
+                    reg.set_ch18sel(false);
                 });
-
-                Temperature {}
             }
         }
     }
+
+    /*
+    /// Convert a raw sample from the `Temperature` to deg C
+    pub fn to_degrees_centigrade(sample: u16) -> f32 {
+        (130.0 - 30.0) / (VtempCal130::get().read() as f32 - VtempCal30::get().read() as f32)
+            * (sample as f32 - VtempCal30::get().read() as f32)
+            + 30.0
+    }
+     */
 }