Remove exploration stuff

Author: mennovf

esp-hal/src/analog/adc/calibration/basic.rs

@@ -36,13 +36,10 @@ where
     fn new_cal(atten: Attenuation) -> Self {
         // Try to get init code (Dout0) from efuse
         // Dout0 means mean raw ADC value when zero voltage applied to input.
-        use defmt::println;
         let cal_val = ADCI::init_code(atten).unwrap_or_else(|| {
             // As a fallback try to calibrate via connecting input to ground internally.
-            println!("Doing manual calibration");
             AdcConfig::<ADCI>::adc_calibrate(atten, AdcCalSource::Gnd)
         });
-        println!("CalBasic cal_val={}", cal_val);
 
         Self {
             cal_val,

esp-hal/src/analog/adc/calibration/line.rs

@@ -82,16 +82,6 @@ where
         // of it already.
         let gain = mv as u32 * GAIN_SCALE / code as u32;
 
-        use defmt::println;
-        #[cfg(esp32s2)]
-        println!(
-            "code={} mv={} gain={} offset={}",
-            code,
-            mv,
-            gain,
-            ADCI::coeff_b(atten)
-        );
-
         Self {
             basic,
             gain,
@@ -111,17 +101,7 @@ where
         let transformed = val as u32 * self.gain / GAIN_SCALE;
 
         #[cfg(esp32s2)]
-        let transformed = {
-            use defmt::println;
-            println!(
-                "Transforming {} -> {} + {} into {}",
-                val,
-                transformed,
-                self.offset,
-                (transformed as i32 + self.offset, 0)
-            );
-            i32::max(transformed as i32 + self.offset, 0)
-        };
+        let transformed = { i32::max(transformed as i32 + self.offset, 0) };
 
         transformed as u16
     }

esp-hal/src/analog/adc/xtensa.rs

@@ -6,7 +6,7 @@ use super::{AdcCalScheme, AdcCalSource, AdcChannel, AdcConfig, AdcPin, Attenuati
 #[cfg(any(esp32s2, esp32s3))]
 use crate::efuse::Efuse;
 use crate::{
-    peripherals::{APB_SARADC, I2C_ANA_MST, LPWR, SENS},
+    peripherals::{APB_SARADC, SENS},
     soc::regi2c,
     system::{GenericPeripheralGuard, Peripheral},
 };
@@ -42,95 +42,29 @@ where
     where
         ADCI: super::CalibrationAccess,
     {
-        let guard = GenericPeripheralGuard::<{ Peripheral::ApbSarAdc as u8 }>::new();
         let mut adc_max: u16 = 0;
         let mut adc_min: u16 = u16::MAX;
         let mut adc_sum: u32 = 0;
 
         ADCI::enable_vdef(true);
 
-        let sensors = SENS::regs();
-        unsafe {
-            // sensors
-            //.sar_meas2_mux()
-            //.write(|w| w.sar2_pwdet_cct().bits(4));
-        }
-
-        ADCI::clear_dig_force();
-        ADCI::set_start_force();
-        ADCI::set_en_pad_force();
-        sensors
-            .sar_hall_ctrl()
-            .modify(|_, w| w.xpd_hall_force().set_bit());
-        sensors
-            .sar_hall_ctrl()
-            .modify(|_, w| w.hall_phase_force().set_bit());
-
-        // Set power to SW power on
-        #[cfg(esp32s2)]
-        sensors
-            .sar_meas1_ctrl1()
-            .modify(|_, w| w.rtc_saradc_clkgate_en().set_bit());
-
-        #[cfg(esp32s3)]
-        sensors
-            .sar_peri_clk_gate_conf()
-            .modify(|_, w| w.saradc_clk_en().set_bit());
-
-        sensors
-            .sar_power_xpd_sar()
-            .modify(|_, w| w.sarclk_en().set_bit());
-
-        sensors
-            .sar_power_xpd_sar()
-            .modify(|_, w| unsafe { w.force_xpd_sar().bits(0b11) });
-
-        // disable AMP
-        sensors
-            .sar_meas1_ctrl1()
-            .modify(|_, w| unsafe { w.force_xpd_amp().bits(0b11) });
-        sensors
-            .sar_amp_ctrl3()
-            .modify(|_, w| unsafe { w.amp_rst_fb_fsm().bits(0) });
-        sensors
-            .sar_amp_ctrl3()
-            .modify(|_, w| unsafe { w.amp_short_ref_fsm().bits(0) });
-        sensors
-            .sar_amp_ctrl3()
-            .modify(|_, w| unsafe { w.amp_short_ref_gnd_fsm().bits(0) });
-        sensors
-            .sar_amp_ctrl1()
-            .modify(|_, w| unsafe { w.sar_amp_wait1().bits(1) });
-        sensors
-            .sar_amp_ctrl1()
-            .modify(|_, w| unsafe { w.sar_amp_wait2().bits(1) });
-        sensors
-            .sar_amp_ctrl2()
-            .modify(|_, w| unsafe { w.sar_amp_wait3().bits(1) });
-
         // Start sampling
         ADCI::set_en_pad(ADCI::ADC_CAL_CHANNEL as u8);
-        // ADCI::clear_en_pad();
         ADCI::set_attenuation(ADCI::ADC_CAL_CHANNEL as usize, atten as u8);
 
         // Connect calibration source
-        // ADCI::connect_cal(source, true);
+        ADCI::connect_cal(source, true);
 
         ADCI::set_init_code(0);
 
         for _ in 0..ADCI::ADC_CAL_CNT_MAX {
-            ADCI::clear_start_sample();
             // Trigger ADC sampling
             ADCI::start_sample();
 
             // Wait until ADCI sampling is done
             while !ADCI::is_done() {}
 
-            let adc = ADCI::read_data();
-            use defmt::println;
-            println!("Calibration read {} -> {}", adc, adc & ADCI::ADC_VAL_MASK);
-
-            let adc = adc & ADCI::ADC_VAL_MASK;
+            let adc = ADCI::read_data() & ADCI::ADC_VAL_MASK;
 
             ADCI::reset();
 
@@ -142,9 +76,6 @@ where
         let cal_val =
             (adc_sum - adc_max as u32 - adc_min as u32) as u16 / (ADCI::ADC_CAL_CNT_MAX - 2);
 
-        use defmt::println;
-        println!("Calibration result {}", cal_val);
-
         // Disconnect calibration source
         ADCI::connect_cal(source, false);
 
@@ -163,7 +94,6 @@ pub trait RegisterAccess {
     fn set_en_pad_force();
 
     fn set_en_pad(channel: u8);
-    fn clear_en_pad();
 
     fn clear_start_sample();
 
@@ -215,11 +145,6 @@ impl RegisterAccess for crate::peripherals::ADC1<'_> {
             .sar_meas1_ctrl2()
             .modify(|_, w| unsafe { w.sar1_en_pad().bits(1 << channel) });
     }
-    fn clear_en_pad() {
-        SENS::regs()
-            .sar_meas1_ctrl2()
-            .modify(|_, w| unsafe { w.sar1_en_pad().bits(0) });
-    }
 
     fn clear_start_sample() {
         SENS::regs()
@@ -252,19 +177,6 @@ impl RegisterAccess for crate::peripherals::ADC1<'_> {
     fn set_init_code(data: u16) {
         let [msb, lsb] = data.to_be_bytes();
 
-        use defmt::println;
-        println!("Writing {} HIGH={} LOW={}", data, msb, lsb);
-
-        LPWR::regs().ana_conf().modify(|_, w| {
-            w.sar_i2c_force_pd().clear_bit();
-            w.sar_i2c_force_pu().set_bit()
-        });
-        I2C_ANA_MST::regs()
-            .config1()
-            .modify(|_, w| w.sar().clear_bit());
-        I2C_ANA_MST::regs()
-            .config0()
-            .modify(|_, w| w.sar_cfg2().set_bit());
         regi2c::ADC_SAR1_INITIAL_CODE_HIGH.write_field(msb);
         regi2c::ADC_SAR1_INITIAL_CODE_LOW.write_field(lsb);
     }
@@ -338,11 +250,6 @@ impl RegisterAccess for crate::peripherals::ADC2<'_> {
             .sar_meas2_ctrl2()
             .modify(|_, w| unsafe { w.sar2_en_pad().bits(1 << channel) });
     }
-    fn clear_en_pad() {
-        SENS::regs()
-            .sar_meas2_ctrl2()
-            .modify(|_, w| unsafe { w.sar2_en_pad().bits(0) });
-    }
 
     fn clear_start_sample() {
         SENS::regs()
@@ -515,8 +422,6 @@ where
 
         // Get converted value
         let converted_value = ADCI::read_data();
-        use defmt::println;
-        println!("Actual raw={}", converted_value);
         ADCI::reset();
 
         // Postprocess converted value according to calibration scheme used for pin
@@ -574,17 +479,15 @@ where
         PIN: AdcChannel,
         CS: AdcCalScheme<ADCI>,
     {
-        ADCI::set_en_pad(PIN::CHANNEL);
-
         // Set ADC unit calibration according used scheme for pin
         let init_code = pin.cal_scheme.adc_cal();
         if self.last_init_code != init_code {
-            use defmt::println;
-            println!("Setting init_code = {}", init_code);
             ADCI::set_init_code(init_code);
             self.last_init_code = init_code;
         }
 
+        ADCI::set_en_pad(PIN::CHANNEL);
+
         ADCI::clear_start_sample();
         ADCI::start_sample();
     }

esp-hal/src/soc/esp32s2/regi2c.rs

@@ -196,26 +196,18 @@ pub(crate) fn regi2c_read(block: u8, _host_id: u8, reg_add: u8) -> u8 {
     I2C_ANA_MST::regs().config2().read().data().bits()
 }
 
-pub(crate) fn regi2c_write(block: u8, host_id: u8, reg_add: u8, data: u8) {
-    use defmt::println;
+pub(crate) fn regi2c_write(block: u8, _host_id: u8, reg_add: u8, data: u8) {
     i2c_rtc_enable_block(block);
 
-    I2C_ANA_MST::regs().config2().write(|w| unsafe {
-        let v = w
-            .slave_id()
+    I2C_ANA_MST::regs().config2().modify(|_, w| unsafe {
+        w.slave_id()
             .bits(block)
             .addr()
             .bits(reg_add)
             .wr_cntl()
             .bit(true)
             .data()
-            .bits(data);
-
-        println!(
-            "regi2c_write({=u8:#x}, {=u8:#x}, {=u8:#x}, {=u8:#x}) = {=u32:#x}",
-            block, host_id, reg_add, data, v.bits
-        );
-        v
+            .bits(data)
     });
 
     while I2C_ANA_MST::regs().config2().read().busy().bit_is_set() {}