kai
/
pounder_test
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Apply suggestions from code review 

Co-authored-by: Robert Jördens <rj@quartiq.de>
This commit is contained in:
Ryan Summers 2021-01-26 12:49:45 +01:00 committed by GitHub
parent 51085d175e
commit c030b97714
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/bin/lockin-internal-demo.rs
View File

@ -41,7 +41,6 @@ const APP: () = {
#[init(iir::IIR { ba: [1., 0., 0., 0., 0.], y_offset: 0., y_min: -SCALE - 1., y_max: SCALE })] #[init(iir::IIR { ba: [1., 0., 0., 0., 0.], y_offset: 0., y_min: -SCALE - 1., y_max: SCALE })]
iir: iir::IIR, iir: iir::IIR,
pll: TimestampHandler,
lockin: Lockin, lockin: Lockin,
} }
@ -50,13 +49,6 @@ 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 pll = TimestampHandler::new(
4, // relative PLL frequency bandwidth: 2**-4, TODO: expose
3, // relative PLL phase bandwidth: 2**-3, TODO: expose
ADC_SAMPLE_TICKS_LOG2 as usize,
SAMPLE_BUFFER_SIZE_LOG2,
);
let lockin = Lockin::new( let lockin = Lockin::new(
&iir_int::IIRState::default(), // TODO: lowpass, expose &iir_int::IIRState::default(), // TODO: lowpass, expose
); );
@ -116,7 +108,8 @@ const APP: () = {
} }
// TODO: Verify that the DAC code is always generated at T=0 // TODO: Verify that the DAC code is always generated at T=0
let (pll_phase, pll_frequency) = c.resources.pll.update(Some(0)); let pll_phase = 0i32;
let pll_frequency = 1i32 << (32 - 3); // 1/8 of the sample rate
// Harmonic index of the LO: -1 to _de_modulate the fundamental // Harmonic index of the LO: -1 to _de_modulate the fundamental
let harmonic: i32 = -1; let harmonic: i32 = -1;