Use DMA to read Tec_I & Tec_V

- Remove the single conversion polling time with DMA

src/device/boot.rs

@@ -63,7 +63,7 @@ pub fn bootup(
     usb::State::setup(usb);
 
     debug!("Setting up TEC");
-    let tec_driver = MAX1968::new(max1968_phy, perif.ADC1);
+    let tec_driver = MAX1968::new(max1968_phy, perif.ADC1, perif.ADC2, perif.DMA2);
     let mut thermostat = Thermostat::new(tec_driver, ad7172_phy);
     thermostat.setup();
     thermostat.power_up();
@@ -72,7 +72,7 @@ pub fn bootup(
 
     debug!("Setting up Laser Driver");
     let current_source = LdCtrl::new(current_source_phy);
-    let mut laser = LdDrive::new(current_source, perif.ADC2, perif.TIM2.counter(&clocks), pd_mon_phy);
+    let mut laser = LdDrive::new(current_source, perif.ADC3, perif.TIM2.counter(&clocks), pd_mon_phy);
     laser.setup();
     laser.ld_open();
     laser.ld_set_i(ElectricCurrent::new::<ampere>(0.0));

src/laser_diode/laser_diode.rs

@@ -1,6 +1,6 @@
 use miniconf::Tree;
 use stm32f4xx_hal::timer::CounterUs;
-use stm32f4xx_hal::pac::{ADC2, TIM2};
+use stm32f4xx_hal::pac::{ADC3, TIM2};
 use uom::si::electric_current::ampere;
 use uom::si::power::milliwatt;
 use crate::laser_diode::ld_ctrl::{LdCtrl, Impedance};
@@ -85,7 +85,7 @@ pub struct LdDrive{
 }
 
 impl LdDrive{
-    pub fn new(current_source: LdCtrl, pins_adc: ADC2, tim2: CounterUs<TIM2>, phy: ld_pwr_exc_protector::LdPwrExcProtectorPhy)-> Self {
+    pub fn new(current_source: LdCtrl, pins_adc: ADC3, tim2: CounterUs<TIM2>, phy: ld_pwr_exc_protector::LdPwrExcProtectorPhy)-> Self {
         LdPwrExcProtector::setup(pins_adc, phy);
         LdCurrentOutCtrlTimer::setup(tim2);
         

src/laser_diode/ld_pwr_exc_protector.rs

@@ -1,7 +1,7 @@
 use stm32f4xx_hal::pac;
 use stm32f4xx_hal::rcc::Enable;
 use stm32f4xx_hal::{
-    pac::{ADC2, NVIC},
+    pac::{ADC3, NVIC},
     gpio::{Analog, Output, PushPull, gpioa::PA3, gpiod::PD9},
     interrupt,
 };
@@ -45,7 +45,7 @@ impl Default for Status {
 }
 
 pub struct LdPwrExcProtector {
-    pac: ADC2,
+    pac: ADC3,
     phy: LdPwrExcProtectorPhy,
     alarm_status: Status,
     calibrated_vdda: u32, 
@@ -55,13 +55,13 @@ impl LdPwrExcProtector {
     /// ADC Analog Watchdog is configured to guard a single regular Adc channel on Pd Mon Pin.
     /// ADC is configured to start continuous conversion without using DMA immediately.
     /// Interrupt is disabled by default.
-    pub fn setup(pac_adc: ADC2, mut phy: LdPwrExcProtectorPhy){
+    pub fn setup(pac_adc: ADC3, mut phy: LdPwrExcProtectorPhy){
         unsafe {
             // All ADCs share the same reset interface.
             // NOTE(unsafe) this reference will only be used for atomic writes with no side effects.
             let rcc = &(*pac::RCC::ptr());
-            // Enable the ADC2 Clock
+            // Enable the ADC3 Clock
-            pac::ADC2::enable(rcc);
+            pac::ADC3::enable(rcc);
             // Enable ADC Interrupt
             NVIC::unmask(interrupt::ADC);
         }

src/main.rs

@@ -13,7 +13,7 @@ use device::{boot::bootup, log_setup, sys_timer};
 use uom::fmt::DisplayStyle::Abbreviation;
 use uom::si::electric_potential::volt;
 use uom::si::electric_current::{ampere, milliampere};
-use uom::si::f64::{ElectricPotential, ElectricCurrent};
+use uom::si::f32::{ElectricPotential, ElectricCurrent};
 
 use stm32f4xx_hal::pac::SCB;
 // If RTT is used, print panic info through RTT
@@ -89,10 +89,12 @@ fn main() -> ! {
 
         if !should_reset {
             let mut eth_is_pending = false;
+            let mut has_temp_reading = false;
             
             laser.poll_and_update_output_current();
             
             if thermostat.poll_adc() {
+                has_temp_reading = true;
                 thermostat.update_pid();
                 if thermostat.get_temp_mon_status().over_temp_alarm {
                     laser.power_down();
@@ -100,17 +102,17 @@ fn main() -> ! {
                     thermostat.power_down();
                 }
 
-                info!("curr_dac_vfb: {:?}", volt_fmt.with(thermostat.get_dac_vfb()));
+                // info!("curr_dac_vfb: {:?}", volt_fmt.with(thermostat.get_dac_vfb()));
-                info!("curr_vref: {:?}", volt_fmt.with(thermostat.get_vref()));
+                // info!("curr_vref: {:?}", volt_fmt.with(thermostat.get_vref()));
-                info!("curr_tec_i: {:?}", amp_fmt.with(thermostat.get_tec_i()));
+                // info!("curr_tec_i: {:?}", amp_fmt.with(thermostat.get_tec_i()));
-                info!("curr_tec_v: {:?}", volt_fmt.with(thermostat.get_tec_v()));
+                // info!("curr_tec_v: {:?}", volt_fmt.with(thermostat.get_tec_v()));
 
-                info!("curr_ld_drive_cuurent: {:?}", milli_amp_fmt.with(laser.get_ld_drive_current()));
+                // info!("curr_ld_drive_cuurent: {:?}", milli_amp_fmt.with(laser.get_ld_drive_current()));
                 
-                info!("pd_mon_v: {:?}", volt_fmt.with(laser.pd_mon_status().v));
+                // info!("pd_mon_v: {:?}", volt_fmt.with(laser.pd_mon_status().v));
-                info!("power_excursion: {:?}", laser.pd_mon_status().pwr_excursion);
+                // info!("power_excursion: {:?}", laser.pd_mon_status().pwr_excursion);
                 
-                info!("Termination Status: {:?}", laser.get_term_status());
+                // info!("Termination Status: {:?}", laser.get_term_status());
 
                 if net::net::eth_is_socket_active() {
                     if device_settings.report_readings {
@@ -134,10 +136,14 @@ fn main() -> ! {
                             net::net::clear_pending(cs);
                         });
                         let bytes = net::net::eth_recv(&mut ETH_DATA_BUFFER);
+                        info!("Ts: {:?}", sys_timer::now());
                         debug!("Number of bytes recv: {:?}", bytes);
                         (laser, thermostat, should_reset, device_settings) = net::cmd_handler::execute_cmd(&mut ETH_DATA_BUFFER, bytes, laser, thermostat, device_settings);
                     }
                 }
+                if has_temp_reading {
+                    thermostat.start_tec_readings_conversion();
+                }
             }
             else {
                 device_settings.report_readings = false;

src/thermostat/max1968.rs

@@ -1,16 +1,15 @@
-use core::u16;
 use crate::thermostat::ad5680;
 use fugit::KilohertzU32;
+use stm32_eth::stm32::{ADC2, DMA2};
+
 use stm32f4xx_hal::{
-    adc::{
+    adc::{config::{self, AdcConfig}, Adc}, 
-        config::{self, AdcConfig},
+    dma::{config::DmaConfig, PeripheralToMemory, Stream2, StreamsTuple, Transfer as DMA_Transfer}, 
-        Adc,
-    },
     gpio::{gpioa::*, gpiob::*, gpioc::*, Alternate, Analog, Output, PushPull}, 
     hal::{self, blocking::spi::Transfer, digital::v2::OutputPin}, 
     pac::{ADC1, SPI1, TIM4}, 
     spi::{NoMiso, Spi, TransferModeNormal}, 
-    timer::pwm::PwmChannel,
+    timer::pwm::PwmChannel
 };
 
 use uom::si::{
@@ -77,9 +76,9 @@ type DacSpi = Spi<SPI1, (PB3<Alternate<5>>, NoMiso, PB5<Alternate<5>>), Transfer
 type DacSync = PB4<Output<PushPull>>;
 
 pub struct MAX1968 {
-    // settings
     pub phy: MAX1968Phy<Channel0>,
     pub pins_adc: Adc<ADC1>,
+    pub dma_adc: DMA_Transfer<Stream2<DMA2>, 1, Adc<ADC2>, PeripheralToMemory, &'static mut [u16; 16]>,
 }
 
 pub enum PwmPinsEnum {
@@ -88,6 +87,7 @@ pub enum PwmPinsEnum {
     MaxNegI,
 }
 
+#[allow(unused)]
 pub enum AdcReadTarget {
     VREF,
     DacVfb,
@@ -111,21 +111,96 @@ impl<C: ChannelPins> MAX1968Phy<C> {
     }
 }
 
+static mut ADC2_FIRST_BUFFER : [u16; 16] = [0; 16];
+static mut ADC2_LOCAL_BUFFER : [u16; 16] = [0; 16];
+
 impl MAX1968 {
-    pub fn new(phy_ch0: MAX1968Phy<Channel0>, adc1: ADC1) -> Self {
+    pub fn new(phy_ch0: MAX1968Phy<Channel0>, adc1: ADC1, adc2: ADC2, dma2: DMA2) -> Self {
-        let config = AdcConfig::default()
+        let adc_config = AdcConfig::default()
             .clock(config::Clock::Pclk2_div_8)
             .default_sample_time(config::SampleTime::Cycles_480);
         // Do not set reset RCCs as it causes other ADCs' clock to be disabled
-        let mut pins_adc = Adc::adc1(adc1, false, config);
+        let mut pins_adc1 = Adc::adc1(adc1, false, adc_config);
-        pins_adc.calibrate();
+        pins_adc1.calibrate();
+
+        let adc_config  = AdcConfig::default()
+            .clock(config::Clock::Pclk2_div_8)
+            .default_sample_time(config::SampleTime::Cycles_480)
+            .dma(config::Dma::Continuous)
+            .scan(config::Scan::Enabled)
+            .reference_voltage(pins_adc1.reference_voltage());
+        let dma_config = DmaConfig::default()
+            .transfer_complete_interrupt(true)
+            .memory_increment(true)
+            .double_buffer(false);
+        let mut pins_adc2 = Adc::adc2(adc2, false, adc_config);
+        pins_adc2.configure_channel(&phy_ch0.itec_pin, config::Sequence::One, config::SampleTime::Cycles_480);
+        pins_adc2.configure_channel(&phy_ch0.vtec_pin, config::Sequence::Two, config::SampleTime::Cycles_480);
+        pins_adc2.configure_channel(&phy_ch0.itec_pin, config::Sequence::Three, config::SampleTime::Cycles_480);
+        pins_adc2.configure_channel(&phy_ch0.vtec_pin, config::Sequence::Four, config::SampleTime::Cycles_480);
+        pins_adc2.configure_channel(&phy_ch0.itec_pin, config::Sequence::Five, config::SampleTime::Cycles_480);
+        pins_adc2.configure_channel(&phy_ch0.vtec_pin, config::Sequence::Six, config::SampleTime::Cycles_480);
+        pins_adc2.configure_channel(&phy_ch0.itec_pin, config::Sequence::Seven, config::SampleTime::Cycles_480);
+        pins_adc2.configure_channel(&phy_ch0.vtec_pin, config::Sequence::Eight, config::SampleTime::Cycles_480);
+        pins_adc2.configure_channel(&phy_ch0.itec_pin, config::Sequence::Nine, config::SampleTime::Cycles_480);
+        pins_adc2.configure_channel(&phy_ch0.vtec_pin, config::Sequence::Ten, config::SampleTime::Cycles_480);
+        pins_adc2.configure_channel(&phy_ch0.itec_pin, config::Sequence::Eleven, config::SampleTime::Cycles_480);
+        pins_adc2.configure_channel(&phy_ch0.vtec_pin, config::Sequence::Twelve, config::SampleTime::Cycles_480);
+        pins_adc2.configure_channel(&phy_ch0.itec_pin, config::Sequence::Thirteen, config::SampleTime::Cycles_480);
+        pins_adc2.configure_channel(&phy_ch0.vtec_pin, config::Sequence::Fourteen, config::SampleTime::Cycles_480);
+        pins_adc2.configure_channel(&phy_ch0.itec_pin, config::Sequence::Fifteen, config::SampleTime::Cycles_480);
+        pins_adc2.configure_channel(&phy_ch0.vtec_pin, config::Sequence::Sixteen, config::SampleTime::Cycles_480);
+
+        let dma = StreamsTuple::new(dma2);
+        let dma_adc : DMA_Transfer<Stream2<DMA2>, 1, Adc<ADC2>, PeripheralToMemory, &'static mut [u16; 16]>;
+        unsafe {
+            dma_adc = DMA_Transfer::init_peripheral_to_memory(dma.2, pins_adc2, &mut ADC2_FIRST_BUFFER, None, dma_config);
+        }
 
         MAX1968 {
             phy: phy_ch0,
-            pins_adc: pins_adc,
+            pins_adc: pins_adc1,
+            dma_adc: dma_adc,
         }
     }
 
+    pub fn dma_adc_start_conversion(&mut self){
+        self.dma_adc.clear_interrupts();
+        self.dma_adc.start(|adc| {
+            adc.clear_end_of_conversion_flag();
+            adc.start_conversion();
+        });
+    }
+
+    pub fn get_tec_readings(&mut self) -> (ElectricPotential, ElectricPotential) {
+        self.dma_adc.clear_interrupts();
+        let buffer: &[u16; 16];
+        unsafe{
+            (buffer, _) = self.dma_adc
+                .next_transfer(&mut ADC2_LOCAL_BUFFER)
+                .unwrap();
+        }
+        
+        let sample_to_millivolts = self.dma_adc.peripheral().make_sample_to_millivolts();
+        let mut itec: u16 = 0;
+        for data in buffer.into_iter().step_by(2){
+            itec += *data;
+        }
+        itec = itec >> 3;
+
+        let mut vtec: u16 = 0;
+        for data in buffer.into_iter().skip(1).step_by(2){
+            vtec += *data;
+        }
+        vtec = vtec >> 3;
+
+        unsafe {
+            ADC2_LOCAL_BUFFER = *buffer;
+        }
+
+        (ElectricPotential::new::<millivolt>(sample_to_millivolts(vtec) as f32), ElectricPotential::new::<millivolt>(sample_to_millivolts(itec) as f32))
+    }
+
     // Return the calibrated VDDA Voltage
     // Can be used to set reference voltage for other ADC
     pub fn get_calibrated_vdda(&mut self) -> u32 {

src/thermostat/thermostat.rs

@@ -1,4 +1,4 @@
-use core::f64::NAN;
+use core::f32::NAN;
 use core::marker::PhantomData;
 use crate::sys_timer;
 use crate::thermostat::ad5680;
@@ -34,6 +34,7 @@ pub struct TecSettings {
     pub max_i_pos_set: ElectricCurrent,
     pub max_i_neg_set: ElectricCurrent,
     pub i_set: ElectricCurrent,
+    pub vref: ElectricPotential,
 }
 
 impl TecSettings{
@@ -96,6 +97,7 @@ impl Default for TecSettings {
             max_i_pos_set: ElectricCurrent::new::<ampere>(1.0),
             max_i_neg_set: ElectricCurrent::new::<ampere>(1.0),
             i_set: ElectricCurrent::new::<ampere>(0.0),
+            vref: ElectricPotential::new::<volt>(1.5),
         }
     }
 }
@@ -133,6 +135,13 @@ impl Thermostat{
         self.pid_ctrl_ch0.set_adc_calibration(t_adc_ch0_cal) ;
     }
 
+    /// start_tec_readings_conversion() should not be called before the current
+    /// DMA request is serviced or the conversion process will be restarted
+    /// Thus, no new readings is available when you call get_tec_readings() fn
+    pub fn start_tec_readings_conversion(&mut self){
+        self.max1968.dma_adc_start_conversion();
+    }
+
     fn tec_setup(&mut self) {
         self.power_down();
 
@@ -232,23 +241,31 @@ impl Thermostat{
         self.tec_settings.max_i_neg_set
     }
 
-    pub fn get_dac_vfb(&mut self) -> ElectricPotential {
+    #[allow(unused)]
-        ElectricPotential::new::<volt>(NAN)
+    fn get_dac_vfb(&mut self) -> ElectricPotential {
-        // self.max1968.adc_read(AdcReadTarget::DacVfb, 16)
+        self.max1968.adc_read(AdcReadTarget::DacVfb, 16)
     }
 
-    pub fn get_vref(&mut self) -> ElectricPotential {
+    #[allow(unused)]
-        // ElectricPotential::new::<volt>(NAN)
+    fn get_vref(&mut self) -> ElectricPotential {
-        self.max1968.adc_read(AdcReadTarget::VREF, 1)
+        self.max1968.adc_read(AdcReadTarget::VREF, 16)
     }
 
+    #[allow(unused)]
     pub fn get_tec_i(&mut self) -> ElectricCurrent {
-        let vref = self.get_vref();
+        let vref = self.max1968.adc_read(AdcReadTarget::VREF, 16);
-        (self.max1968.adc_read(AdcReadTarget::ITec, 1) - vref) / ElectricalResistance::new::<ohm>(0.4)
+        (self.max1968.adc_read(AdcReadTarget::ITec, 16) - vref) / ElectricalResistance::new::<ohm>(0.4)
     }
 
+    #[allow(unused)]
     pub fn get_tec_v(&mut self) -> ElectricPotential {
-        (self.max1968.adc_read(AdcReadTarget::VTec, 1) - TecSettings::TEC_VSEC_BIAS_V) * 4.0
+        (self.max1968.adc_read(AdcReadTarget::VTec, 16) - TecSettings::TEC_VSEC_BIAS_V) * 4.0
+    }
+
+    pub fn get_tec_readings(&mut self) -> (ElectricPotential, ElectricCurrent) {
+        let vref = self.tec_settings.vref;
+        let (vtec, itec) = self.max1968.get_tec_readings();
+        ((vtec - TecSettings::TEC_VSEC_BIAS_V) * 4.0, (itec - vref) / ElectricalResistance::new::<ohm>(0.4))
     }
 
     /// Calibrates the DAC output to match vref of the MAX driver to reduce zero-current offset of the MAX driver output.
@@ -293,6 +310,7 @@ impl Thermostat{
                 prev_value = value;
             }
         }
+        self.tec_settings.vref = target_voltage;
     }
     
     pub fn set_pid_engaged(&mut self, val: bool) {
@@ -304,14 +322,14 @@ impl Thermostat{
     }
 
     pub fn get_status_report(&mut self) -> StatusReport {
+        let (tec_v, tec_i) = self.get_tec_readings();
         StatusReport {
             pid_engaged: self.get_pid_engaged(),
             temp_mon_status: self.temp_mon.get_status(),
             temperature: self.pid_ctrl_ch0.get_temperature(),
             i_set: self.tec_settings.i_set,
-            tec_i: self.get_tec_i(),
+            tec_i: tec_i,
-            tec_v: self.get_tec_v(),
+            tec_v: tec_v,
-            tec_vref: self.get_vref(),
         }
     }
 
@@ -424,7 +442,6 @@ pub struct StatusReport {
     i_set: ElectricCurrent,
     tec_i: ElectricCurrent,
     tec_v: ElectricPotential,
-    tec_vref: ElectricPotential,
 }
 
 #[derive(Deserialize, Serialize, Copy, Clone, Debug, Tree)]