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

rpll: update lockin integration test

Browse Source
This commit is contained in:
Robert Jördens 2021-01-25 12:00:47 +01:00
parent 9f9744b9e6
commit 16009c3b7e
2 changed files with 48 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
dsp/src/lockin.rs
View File

@ -384,7 +384,7 @@ mod test {
reference_frequency: f64, reference_frequency: f64,
demodulation_phase_offset: f64, demodulation_phase_offset: f64,
harmonic: i32, harmonic: i32,
sample_buffer_size_log2: usize, sample_buffer_size_log2: u8,
pll_shift_frequency: u8, pll_shift_frequency: u8,
pll_shift_phase: u8, pll_shift_phase: u8,
corner_frequency: f64, corner_frequency: f64,
@ -406,7 +406,7 @@ mod test {
); );
let adc_sample_ticks_log2 = let adc_sample_ticks_log2 =
(internal_frequency).log2().round() as usize; (internal_frequency).log2().round() as u8;
assert!( assert!(
adc_sample_ticks_log2 + sample_buffer_size_log2 <= 32, adc_sample_ticks_log2 + sample_buffer_size_log2 <= 32,
"The base-2 log of the number of ADC ticks in a sampling period plus the base-2 log of the sample buffer size must be less than 32." "The base-2 log of the number of ADC ticks in a sampling period plus the base-2 log of the sample buffer size must be less than 32."
@ -423,7 +423,7 @@ mod test {
), // DC gain to get to full scale with the image filtered out ), // DC gain to get to full scale with the image filtered out
); );
let mut timestamp_handler = let mut timestamp_handler =
RPLL::new(adc_sample_ticks_log2 + sample_buffer_size_log2); RPLL::new((adc_sample_ticks_log2 + sample_buffer_size_log2) as u8);
let mut timestamp_start: u64 = 0; let mut timestamp_start: u64 = 0;
let time_constant: f64 = 1. / (2. * PI * corner_frequency); let time_constant: f64 = 1. / (2. * PI * corner_frequency);
@ -484,7 +484,7 @@ mod test {
timestamp_start += batch_sample_count; timestamp_start += batch_sample_count;
let (demodulation_initial_phase, demodulation_frequency) = let (demodulation_initial_phase, demodulation_frequency) =
timestamp_handler.update(timestamp); timestamp_handler.update(timestamp.map(|t| t as i32), pll_shift_frequency, pll_shift_phase);
let output = lockin.update( let output = lockin.update(
adc_signal, adc_signal,
demodulation_initial_phase as i32, demodulation_initial_phase as i32,
@ -578,9 +578,9 @@ mod test {
let internal_frequency: f64 = 64.; let internal_frequency: f64 = 64.;
let signal_frequency: f64 = 64e-3; let signal_frequency: f64 = 64e-3;
let harmonic: i32 = 1; let harmonic: i32 = 1;
let sample_buffer_size_log2: usize = 2; let sample_buffer_size_log2: u8 = 2;
let pll_shift_frequency: u8 = 3; let pll_shift_frequency: u8 = 21;
let pll_shift_phase: u8 = 2; let pll_shift_phase: u8 = 21;
let corner_frequency: f64 = 1e-3; let corner_frequency: f64 = 1e-3;
let demodulation_frequency: f64 = harmonic as f64 * signal_frequency; let demodulation_frequency: f64 = harmonic as f64 * signal_frequency;
let demodulation_phase_offset: f64 = 0.; let demodulation_phase_offset: f64 = 0.;
@ -623,9 +623,9 @@ mod test {
let internal_frequency: f64 = 64.; let internal_frequency: f64 = 64.;
let signal_frequency: f64 = 64e-3; let signal_frequency: f64 = 64e-3;
let harmonic: i32 = 1; let harmonic: i32 = 1;
let sample_buffer_size_log2: usize = 2; let sample_buffer_size_log2: u8 = 2;
let pll_shift_frequency: u8 = 3; let pll_shift_frequency: u8 = 21;
let pll_shift_phase: u8 = 2; let pll_shift_phase: u8 = 21;
let corner_frequency: f64 = 1e-3; let corner_frequency: f64 = 1e-3;
let demodulation_frequency: f64 = harmonic as f64 * signal_frequency; let demodulation_frequency: f64 = harmonic as f64 * signal_frequency;
let demodulation_phase_offset: f64 = PI / 2.; let demodulation_phase_offset: f64 = PI / 2.;
@ -668,9 +668,9 @@ mod test {
let internal_frequency: f64 = 64.; let internal_frequency: f64 = 64.;
let signal_frequency: f64 = 64e-3; let signal_frequency: f64 = 64e-3;
let harmonic: i32 = 1; let harmonic: i32 = 1;
let sample_buffer_size_log2: usize = 2; let sample_buffer_size_log2: u8 = 2;
let pll_shift_frequency: u8 = 3; let pll_shift_frequency: u8 = 21;
let pll_shift_phase: u8 = 2; let pll_shift_phase: u8 = 21;
let corner_frequency: f64 = 1e-3; let corner_frequency: f64 = 1e-3;
let demodulation_frequency: f64 = harmonic as f64 * signal_frequency; let demodulation_frequency: f64 = harmonic as f64 * signal_frequency;
let demodulation_phase_offset: f64 = 0.; let demodulation_phase_offset: f64 = 0.;
@ -713,9 +713,9 @@ mod test {
let internal_frequency: f64 = 64.; let internal_frequency: f64 = 64.;
let signal_frequency: f64 = 71e-3; let signal_frequency: f64 = 71e-3;
let harmonic: i32 = 1; let harmonic: i32 = 1;
let sample_buffer_size_log2: usize = 2; let sample_buffer_size_log2: u8 = 2;
let pll_shift_frequency: u8 = 3; let pll_shift_frequency: u8 = 21;
let pll_shift_phase: u8 = 2; let pll_shift_phase: u8 = 21;
let corner_frequency: f64 = 0.6e-3; let corner_frequency: f64 = 0.6e-3;
let demodulation_frequency: f64 = harmonic as f64 * signal_frequency; let demodulation_frequency: f64 = harmonic as f64 * signal_frequency;
let demodulation_phase_offset: f64 = 0.; let demodulation_phase_offset: f64 = 0.;
@ -758,9 +758,9 @@ mod test {
let internal_frequency: f64 = 64.; let internal_frequency: f64 = 64.;
let signal_frequency: f64 = 50e-3; let signal_frequency: f64 = 50e-3;
let harmonic: i32 = 2; let harmonic: i32 = 2;
let sample_buffer_size_log2: usize = 2; let sample_buffer_size_log2: u8 = 2;
let pll_shift_frequency: u8 = 2; let pll_shift_frequency: u8 = 21;
let pll_shift_phase: u8 = 1; let pll_shift_phase: u8 = 21;
let corner_frequency: f64 = 1e-3; let corner_frequency: f64 = 1e-3;
let demodulation_frequency: f64 = harmonic as f64 * signal_frequency; let demodulation_frequency: f64 = harmonic as f64 * signal_frequency;
let demodulation_phase_offset: f64 = 0.; let demodulation_phase_offset: f64 = 0.;
@ -803,9 +803,9 @@ mod test {
let internal_frequency: f64 = 64.; let internal_frequency: f64 = 64.;
let signal_frequency: f64 = 50e-3; let signal_frequency: f64 = 50e-3;
let harmonic: i32 = 3; let harmonic: i32 = 3;
let sample_buffer_size_log2: usize = 2; let sample_buffer_size_log2: u8 = 2;
let pll_shift_frequency: u8 = 2; let pll_shift_frequency: u8 = 21;
let pll_shift_phase: u8 = 1; let pll_shift_phase: u8 = 21;
let corner_frequency: f64 = 1e-3; let corner_frequency: f64 = 1e-3;
let demodulation_frequency: f64 = harmonic as f64 * signal_frequency; let demodulation_frequency: f64 = harmonic as f64 * signal_frequency;
let demodulation_phase_offset: f64 = 0.; let demodulation_phase_offset: f64 = 0.;
@ -848,9 +848,9 @@ mod test {
let internal_frequency: f64 = 64.; let internal_frequency: f64 = 64.;
let signal_frequency: f64 = 50e-3; let signal_frequency: f64 = 50e-3;
let harmonic: i32 = 4; let harmonic: i32 = 4;
let sample_buffer_size_log2: usize = 2; let sample_buffer_size_log2: u8 = 2;
let pll_shift_frequency: u8 = 2; let pll_shift_frequency: u8 = 21;
let pll_shift_phase: u8 = 1; let pll_shift_phase: u8 = 21;
let corner_frequency: f64 = 1e-3; let corner_frequency: f64 = 1e-3;
let demodulation_frequency: f64 = harmonic as f64 * signal_frequency; let demodulation_frequency: f64 = harmonic as f64 * signal_frequency;
let demodulation_phase_offset: f64 = 0.; let demodulation_phase_offset: f64 = 0.;
@ -893,9 +893,9 @@ mod test {
let internal_frequency: f64 = 64.; let internal_frequency: f64 = 64.;
let signal_frequency: f64 = 50e-3; let signal_frequency: f64 = 50e-3;
let harmonic: i32 = 2; let harmonic: i32 = 2;
let sample_buffer_size_log2: usize = 2; let sample_buffer_size_log2: u8 = 2;
let pll_shift_frequency: u8 = 2; let pll_shift_frequency: u8 = 21;
let pll_shift_phase: u8 = 1; let pll_shift_phase: u8 = 21;
let corner_frequency: f64 = 1e-3; let corner_frequency: f64 = 1e-3;
let demodulation_frequency: f64 = harmonic as f64 * signal_frequency; let demodulation_frequency: f64 = harmonic as f64 * signal_frequency;
let demodulation_phase_offset: f64 = 0.; let demodulation_phase_offset: f64 = 0.;
@ -938,9 +938,9 @@ mod test {
let internal_frequency: f64 = 32.; let internal_frequency: f64 = 32.;
let signal_frequency: f64 = 100e-3; let signal_frequency: f64 = 100e-3;
let harmonic: i32 = 1; let harmonic: i32 = 1;
let sample_buffer_size_log2: usize = 2; let sample_buffer_size_log2: u8 = 2;
let pll_shift_frequency: u8 = 2; let pll_shift_frequency: u8 = 21;
let pll_shift_phase: u8 = 1; let pll_shift_phase: u8 = 21;
let corner_frequency: f64 = 1e-3; let corner_frequency: f64 = 1e-3;
let demodulation_frequency: f64 = harmonic as f64 * signal_frequency; let demodulation_frequency: f64 = harmonic as f64 * signal_frequency;
let demodulation_phase_offset: f64 = 0.; let demodulation_phase_offset: f64 = 0.;
@ -983,9 +983,9 @@ mod test {
let internal_frequency: f64 = 64.; let internal_frequency: f64 = 64.;
let signal_frequency: f64 = 100e-3; let signal_frequency: f64 = 100e-3;
let harmonic: i32 = 1; let harmonic: i32 = 1;
let sample_buffer_size_log2: usize = 2; let sample_buffer_size_log2: u8 = 2;
let pll_shift_frequency: u8 = 2; let pll_shift_frequency: u8 = 21;
let pll_shift_phase: u8 = 1; let pll_shift_phase: u8 = 21;
let corner_frequency: f64 = 1e-3; let corner_frequency: f64 = 1e-3;
let demodulation_frequency: f64 = harmonic as f64 * signal_frequency; let demodulation_frequency: f64 = harmonic as f64 * signal_frequency;
let demodulation_phase_offset: f64 = 0.; let demodulation_phase_offset: f64 = 0.;
@ -1028,9 +1028,9 @@ mod test {
let internal_frequency: f64 = 64.; let internal_frequency: f64 = 64.;
let signal_frequency: f64 = 10e-3; let signal_frequency: f64 = 10e-3;
let harmonic: i32 = 1; let harmonic: i32 = 1;
let sample_buffer_size_log2: usize = 2; let sample_buffer_size_log2: u8 = 2;
let pll_shift_frequency: u8 = 2; let pll_shift_frequency: u8 = 21;
let pll_shift_phase: u8 = 1; let pll_shift_phase: u8 = 21;
let corner_frequency: f64 = 1e-3; let corner_frequency: f64 = 1e-3;
let demodulation_frequency: f64 = harmonic as f64 * signal_frequency; let demodulation_frequency: f64 = harmonic as f64 * signal_frequency;
let demodulation_phase_offset: f64 = 0.; let demodulation_phase_offset: f64 = 0.;

19
dsp/src/rpll.rs
View File

@ -21,19 +21,22 @@ impl RPLL {
shift_frequency: u8, shift_frequency: u8,
shift_phase: u8, shift_phase: u8,
) -> (i32, i32) { ) -> (i32, i32) {
self.y1 += self.f1; debug_assert!(shift_frequency > 0);
debug_assert!(shift_phase > 0);
debug_assert!(32 + self.dt2 >= shift_frequency);
self.y1 = self.y1.wrapping_add(self.f1);
if let Some(xj) = input { if let Some(xj) = input {
self.f2 += (1i64 << 32 + self.dt2 - shift_frequency) self.f2 = self.f2.wrapping_add((1i64 << 32 + self.dt2 - shift_frequency)
- (self.f2 * (xj - self.xj1) as i64 - (self.f2.wrapping_mul(xj.wrapping_sub(self.xj1) as i64)
+ (1i64 << shift_frequency - 1) + (1i64 << shift_frequency - 1)
>> shift_frequency); >> shift_frequency));
self.f1 = self.f2 as i32 self.f1 = (self.f2 as i32)
+ (self.f2 * (self.t - xj) as i64 .wrapping_add((self.f2.wrapping_mul(self.t.wrapping_sub(xj) as i64)
- ((self.y1 as i64) << self.dt2) - ((self.y1 as i64) << self.dt2)
+ (1i64 << shift_phase - 1) + (1i64 << shift_phase - 1)
>> shift_phase) as i32; >> shift_phase) as i32);
} }
self.t += 1 << self.dt2; self.t = self.t.wrapping_add(1 << self.dt2);
(self.y1, self.f1) (self.y1, self.f1)
} }
} }