add lockin bin

This commit is contained in:
Robert Jördens 2021-01-20 14:29:29 +01:00
parent 603d6df6a4
commit d014ed0fe0
2 changed files with 38 additions and 4 deletions

View File

@ -14,8 +14,22 @@ use heapless::{consts::*, String};
use stabilizer::{hardware, server}; use stabilizer::{hardware, server};
use dsp::iir; use dsp::{
use hardware::{Adc0Input, Adc1Input, Dac0Output, Dac1Output, AFE0, AFE1}; iir, iir_int,
reciprocal_pll::TimestampHandler,
trig::{atan2, cossin},
Complex,
};
use hardware::{
Adc0Input, Adc1Input, Dac0Output, Dac1Output, InputStamper, AFE0, AFE1,
};
// Frequency scaling factor for lock-in harmonic demodulation.
const HARMONIC: u32 = 1;
// Phase offset applied to the lock-in demodulation signal.
const PHASE_OFFSET: u32 = 0;
const ADC_SAMPLE_TICKS_LOG2: u16 = 8;
const SAMPLE_BUFFER_SIZE_LOG2: usize = 3;
const SCALE: f32 = ((1 << 15) - 1) as f32; const SCALE: f32 = ((1 << 15) - 1) as f32;
@ -38,6 +52,11 @@ const APP: () = {
iir_state: [[iir::IIRState; IIR_CASCADE_LENGTH]; 2], iir_state: [[iir::IIRState; IIR_CASCADE_LENGTH]; 2],
#[init([[iir::IIR { ba: [1., 0., 0., 0., 0.], y_offset: 0., y_min: -SCALE - 1., y_max: SCALE }; IIR_CASCADE_LENGTH]; 2])] #[init([[iir::IIR { ba: [1., 0., 0., 0., 0.], y_offset: 0., y_min: -SCALE - 1., y_max: SCALE }; IIR_CASCADE_LENGTH]; 2])]
iir_ch: [[iir::IIR; IIR_CASCADE_LENGTH]; 2], iir_ch: [[iir::IIR; IIR_CASCADE_LENGTH]; 2],
timestamper: InputStamper,
timestamp_handler: TimestampHandler,
iir_lockin: iir_int::IIR,
iir_state_lockin: [iir_int::IIRState; 2],
} }
#[init] #[init]
@ -45,6 +64,15 @@ const APP: () = {
// Configure the microcontroller // Configure the microcontroller
let (mut stabilizer, _pounder) = hardware::setup(c.core, c.device); let (mut stabilizer, _pounder) = hardware::setup(c.core, c.device);
let timestamp_handler = TimestampHandler::new(
4,
3,
ADC_SAMPLE_TICKS_LOG2 as usize,
SAMPLE_BUFFER_SIZE_LOG2,
);
let iir_lockin = iir_int::IIR::default();
let iir_state_lockin = [iir_int::IIRState::default(); 2];
// Enable ADC/DAC events // Enable ADC/DAC events
stabilizer.adcs.0.start(); stabilizer.adcs.0.start();
stabilizer.adcs.1.start(); stabilizer.adcs.1.start();
@ -59,6 +87,11 @@ const APP: () = {
adcs: stabilizer.adcs, adcs: stabilizer.adcs,
dacs: stabilizer.dacs, dacs: stabilizer.dacs,
net_interface: stabilizer.net.interface, net_interface: stabilizer.net.interface,
timestamper: stabilizer.timestamper,
timestamp_handler,
iir_lockin,
iir_state_lockin,
} }
} }
@ -78,7 +111,7 @@ const APP: () = {
/// ///
/// Because the ADC and DAC operate at the same rate, these two constraints actually implement /// Because the ADC and DAC operate at the same rate, these two constraints actually implement
/// the same time bounds, meeting one also means the other is also met. /// the same time bounds, meeting one also means the other is also met.
#[task(binds=DMA1_STR4, resources=[adcs, dacs, iir_state, iir_ch], priority=2)] #[task(binds=DMA1_STR4, resources=[adcs, dacs, iir_state, iir_ch, iir_lockin, iir_state_lockin, timestamp_handler, timestamper], priority=2)]
fn process(c: process::Context) { fn process(c: process::Context) {
let adc_samples = [ let adc_samples = [
c.resources.adcs.0.acquire_buffer(), c.resources.adcs.0.acquire_buffer(),
@ -98,7 +131,7 @@ const APP: () = {
let (pll_phase, pll_frequency) = c let (pll_phase, pll_frequency) = c
.resources .resources
.timestamp_handler .timestamp_handler
.update(c.resources.input_stamper.latest_timestamp()); .update(c.resources.timestamper.latest_timestamp());
let frequency = pll_frequency.wrapping_mul(HARMONIC); let frequency = pll_frequency.wrapping_mul(HARMONIC);
let mut phase = let mut phase =
PHASE_OFFSET.wrapping_add(pll_phase.wrapping_mul(HARMONIC)); PHASE_OFFSET.wrapping_add(pll_phase.wrapping_mul(HARMONIC));

View File

@ -20,6 +20,7 @@ mod timers;
pub use adc::{Adc0Input, Adc1Input}; pub use adc::{Adc0Input, Adc1Input};
pub use afe::Gain as AfeGain; pub use afe::Gain as AfeGain;
pub use dac::{Dac0Output, Dac1Output}; pub use dac::{Dac0Output, Dac1Output};
pub use digital_input_stamper::InputStamper;
pub use pounder::DdsOutput; pub use pounder::DdsOutput;
// Type alias for the analog front-end (AFE) for ADC0. // Type alias for the analog front-end (AFE) for ADC0.