From 4edda09d86a3560a3adaa2676f27abcf4f9e73b3 Mon Sep 17 00:00:00 2001
From: Matt Huszagh <huszaghmatt@gmail.com>
Date: Tue, 24 Nov 2020 23:44:39 -0800
Subject: [PATCH] lockin: change demodulate to return result instead of option

---
 dsp/src/lockin.rs            | 14 ++++++++------
 dsp/tests/lockin_low_pass.rs |  8 ++++----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/dsp/src/lockin.rs b/dsp/src/lockin.rs
index 3aabf33..e185c31 100644
--- a/dsp/src/lockin.rs
+++ b/dsp/src/lockin.rs
@@ -175,8 +175,10 @@ impl Lockin {
         adc_samples: [i16; ADC_SAMPLE_BUFFER_SIZE],
         timestamps: [u16; TIMESTAMP_BUFFER_SIZE],
         valid_timestamps: u16,
-    ) -> Option<([f32; ADC_SAMPLE_BUFFER_SIZE], [f32; ADC_SAMPLE_BUFFER_SIZE])>
-    {
+    ) -> Result<
+        ([f32; ADC_SAMPLE_BUFFER_SIZE], [f32; ADC_SAMPLE_BUFFER_SIZE]),
+        &str,
+    > {
         // update old timestamps for new ADC batch
         let sample_period = self.sample_period as i32;
         self.timestamps.iter_mut().for_each(|t| match *t {
@@ -202,7 +204,7 @@ impl Lockin {
         // return prematurely if there aren't enough timestamps for
         // processing
         if self.timestamps.iter().filter(|t| t.is_some()).count() < 2 {
-            return None;
+            return Err("insufficient timestamps");
         }
 
         // compute ADC sample phases, sines/cosines and demodulate
@@ -227,7 +229,7 @@ impl Lockin {
                 *q = cosine * sample;
             });
 
-        Some((in_phase, quadrature))
+        Ok((in_phase, quadrature))
     }
 
     /// Filter the in-phase and quadrature signals using the supplied
@@ -448,7 +450,7 @@ mod tests {
                 [0; TIMESTAMP_BUFFER_SIZE],
                 0
             ),
-            None
+            Err("insufficient timestamps")
         );
     }
 
@@ -471,7 +473,7 @@ mod tests {
                 [0; TIMESTAMP_BUFFER_SIZE],
                 1
             ),
-            None
+            Err("insufficient timestamps")
         );
     }
 
diff --git a/dsp/tests/lockin_low_pass.rs b/dsp/tests/lockin_low_pass.rs
index 0cc32fd..1f8bed2 100644
--- a/dsp/tests/lockin_low_pass.rs
+++ b/dsp/tests/lockin_low_pass.rs
@@ -601,11 +601,11 @@ fn lowpass_test(
         let lockin_demodulate =
             lockin.demodulate(signal, timestamps, valid_timestamps as u16);
         match lockin_demodulate {
-            Some(i) => {
-                in_phase = i.0;
-                quadrature = i.1;
+            Ok((i, q)) => {
+                in_phase = i;
+                quadrature = q;
             }
-            None => {
+            Err(_) => {
                 continue;
             }
         }