From 32b7058b4720d1cb632163fd83ecf137d942b919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20J=C3=B6rdens?= Date: Thu, 11 Feb 2021 23:15:32 +0100 Subject: [PATCH] lockin: 2nd order lowpass --- dsp/src/lockin.rs | 4 ++-- src/bin/lockin-external.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dsp/src/lockin.rs b/dsp/src/lockin.rs index 7fc1e85..843a793 100644 --- a/dsp/src/lockin.rs +++ b/dsp/src/lockin.rs @@ -1,9 +1,9 @@ use super::{lowpass::Lowpass, Complex}; -use generic_array::typenum::U4; +use generic_array::typenum::U2; #[derive(Clone, Default)] pub struct Lockin { - state: [Lowpass; 2], + state: [Lowpass; 2], } impl Lockin { diff --git a/src/bin/lockin-external.rs b/src/bin/lockin-external.rs index a043201..cbda83c 100644 --- a/src/bin/lockin-external.rs +++ b/src/bin/lockin-external.rs @@ -126,7 +126,7 @@ const APP: () = { let conf = "frequency_discriminator"; let output = match conf { // Convert from IQ to power and phase. - "power_phase" => [(output.log2() << 10) as _, output.arg()], + "power_phase" => [(output.log2() << 24) as _, output.arg()], "frequency_discriminator" => [pll_frequency as _, output.arg()], _ => [output.0 << 16, output.1 << 16], };