lockin: new signal generator

quartiq · Dec 26, 2024 · cc8dd46 · cc8dd46
1 parent 5aee5c8
commit cc8dd46
Showing 1 changed file with 6 additions and 14 deletions.
diff --git a/src/bin/lockin.rs b/src/bin/lockin.rs
@@ -28,7 +28,6 @@
 #![no_main]
 
 use core::{
-    convert::TryFrom,
     mem::MaybeUninit,
     sync::atomic::{fence, Ordering},
 };
@@ -49,7 +48,6 @@ use stabilizer::{
         dac::{Dac0Output, Dac1Output, DacCode},
         hal,
         input_stamper::InputStamper,
-        signal_generator,
         timers::SamplingTimer,
         DigitalInput0, DigitalInput1, SerialTerminal, SystemTimer, Systick,
         UsbDevice, AFE0, AFE1,
@@ -265,7 +263,7 @@ mod app {
         dacs: (Dac0Output, Dac1Output),
         pll: RPLL,
         lockin: idsp::Lockin<Repeat<2, Lowpass<2>>>,
-        source: signal_generator::SignalGenerator,
+        source: idsp::AccuOsc<idsp::Accu<i64>>,
         generator: FrameGenerator,
         cpu_temp_sensor: stabilizer::hardware::cpu_temp_sensor::CpuTempSensor,
     }
@@ -302,16 +300,10 @@ mod app {
             settings: stabilizer.settings,
         };
 
-        let source = signal_generator::AsymmetricAccu {};
-        //::try_from_config(&signal_config).unwrap()
-        // let signal_config = signal_generator::Config {
-        //     // Same frequency as batch size.
-        //     phase_increment: [1 << (32 - BATCH_SIZE_LOG2); 2],
-        //     // 1V Amplitude
-        //     amplitude: DacCode::try_from(1.0).unwrap().into(),
-        //     signal: signal_generator::Signal::Cosine,
-        //     phase_offset: 0,
-        // };
+        let source = idsp::AccuOsc::from(idsp::Accu::new(
+            0,
+            1 << (64 - BATCH_SIZE_LOG2),
+        ));
 
         let mut local = Local {
             usb_terminal: stabilizer.usb_serial,
@@ -445,7 +437,7 @@ mod app {
                             Conf::InPhase => output.re >> 16,
                             Conf::Quadrature => output.im >> 16,
 
-                            Conf::Modulation => source.next().unwrap() as i32,
+                            Conf::Modulation => source.next().unwrap().re,
                         };
 
                         *sample = DacCode::from(value as i16).0;