Refactor heart sensing task to use LED3 and simplify sample data processing

Author: krokosik

src/main.rs

@@ -259,7 +259,15 @@ fn heart_sensing_task(
 
     // Fs = 25 Hz
     let mut heart = heart
-        .into_heart_rate()
+        .into_multi_led()
+        .map_err(|_| anyhow!("Heartbeat I2C disconnected"))?;
+    heart
+        .set_led_time_slots([
+            max3010x::TimeSlot::Led3,
+            max3010x::TimeSlot::Disabled,
+            max3010x::TimeSlot::Disabled,
+            max3010x::TimeSlot::Disabled,
+        ])
         .map_err(|_| anyhow!("Heartbeat I2C disconnected"))?;
     heart
         .set_sample_averaging(max3010x::SampleAveraging::Sa16)
@@ -268,7 +276,7 @@ fn heart_sensing_task(
         .set_sampling_rate(max3010x::SamplingRate::Sps800)
         .map_err(|_| anyhow!("Heartbeat I2C disconnected"))?;
     heart
-        .set_pulse_amplitude(max3010x::Led::Led1, led_amplitude)
+        .set_pulse_amplitude(max3010x::Led::Led3, led_amplitude)
         .map_err(|_| anyhow!("Heartbeat I2C disconnected"))?;
     heart
         .set_pulse_width(max3010x::LedPulseWidth::Pw411)

src/pulse_sensor.rs

@@ -10,10 +10,6 @@ use crate::{
 pub const MAX30102_NUM_SAMPLES: usize = 100;
 pub const MAX30102_SAMPLE_RATE: Hertz = Hertz(25);
 
-// const FIR_COEFFS: [u16; 12] = [
-//     172, 321, 579, 927, 1360, 1858, 2390, 2916, 3391, 3768, 4012, 4096,
-// ];
-
 pub struct Max3012SampleData {
     /// "AC" component of R/IR signal sample
     /// (sensor value - DC mean subtracted)
@@ -56,30 +52,26 @@ impl Max3012SampleData {
     }
 
     pub fn update_from_samples(&mut self, data: impl Iterator<Item = f32>) {
-        self.data_to_skip = data
-            .enumerate()
-            .fold((0, None::<f32>), |(res, prev), (i, x)| {
-                self.ac[i] = x;
-                if let Some(prev) = prev {
-                    if (x - prev).abs() > 100_000.0 {
-                        (i + 1, None)
-                    } else {
-                        (res, Some(x))
-                    }
-                } else {
-                    (res, Some(x))
-                }
-            })
-            .0;
-
-        self.data_to_skip = min(
-            if self.data_to_skip > 0 {
-                self.data_to_skip + 50
-            } else {
-                self.data_to_skip
-            },
-            MAX30102_NUM_SAMPLES,
-        );
+        // self.data_to_skip = data
+        //     .enumerate()
+        //     .fold((0, None::<f32>), |(res, prev), (i, x)| {
+        //         self.ac[i] = x;
+        //         if let Some(prev) = prev {
+        //             if (x - prev).abs() > 100_000.0 {
+        //                 (i + 1, Some(prev))
+        //             } else {
+        //                 (res, Some(x))
+        //             }
+        //         } else {
+        //             (res, Some(x))
+        //         }
+        //     })
+        //     .0;
+
+        // self.data_to_skip = 0;
+        for (i, x) in data.enumerate() {
+            self.ac[i] = x;
+        }
     }
 
     pub fn process_signal(&mut self) {
@@ -134,12 +126,4 @@ impl Max3012SampleData {
             }
         }
     }
-
-    // fn low_pass_FIR_filter(&mut self, data: &[f32], filter: &[f32]) -> f32 {
-    //     let mut result = 0.0;
-    //     for (i, &f) in filter.iter().enumerate() {
-    //         result += f * data[i];
-    //     }
-    //     result
-    // }
 }