LOC - Implement Navigator

lib/localisation/src/control.rs

@@ -1 +1 @@
-pub mod navigator;
+pub mod localizer;

lib/localisation/src/control/localizer.rs

@@ -0,0 +1,186 @@
+use crate::{
+    filtering::kalman_filter::KalmanFilter,
+    preprocessing::{
+        accelerometer::AccelerometerPreprocessor,
+        keyence::{KeyenceAgrees, SensorChecks},
+        optical::process_optical_data,
+    },
+    types::{RawAccelerometerData, K_NUM_ACCELEROMETERS, K_NUM_AXIS},
+};
+
+use heapless::Vec;
+
+use libm::pow;
+use nalgebra::{Matrix2, Vector1, Vector2};
+
+const DELTA_T: f64 = 0.01;
+const STRIPE_WIDTH: f64 = 1.0;
+
+pub struct Localizer {
+    displacement: f64,
+    velocity: f64,
+    previous_velocity: f64,
+    acceleration: f64,
+    kalman_filter: KalmanFilter,
+    keyence_checker: KeyenceAgrees,
+    keyence_val: f64,
+    optical_val: f64,
+    accelerometer_val: f64,
+}
+
+impl Localizer {
+    pub fn new() -> Localizer {
+        let initial_state = Vector2::new(0.0, 0.0);
+        let initial_covariance = Matrix2::new(1.0, 0.0, 0.0, 1.0);
+        let transition_matrix = Matrix2::new(1.0, DELTA_T, 0.0, 1.0);
+        let control_matrix = Vector2::new(0.5 * DELTA_T * DELTA_T, DELTA_T);
+        let observation_matrix = Matrix2::new(1.0, 0.0, 0.0, DELTA_T);
+
+        // Assuming frequency of 6400hz for IMU at 120 mu g / sqrt(Hz)
+        // standard deviation = 120 * sqrt(6400) = 9600 mu g = 0.0096 g
+        //                    = 0.0096 * 9.81 = 0.094176 m/s^2
+        // variance =  0.094176^2 = 0.0089 m/s^2
+
+        let process_noise: Matrix2<f64> = Matrix2::new(
+            0.25 * pow(DELTA_T, 4.0),
+            0.5 * pow(DELTA_T, 3.0),
+            0.5 * pow(DELTA_T, 3.0),
+            pow(DELTA_T, 2.0) * 0.0089,
+        );
+
+        //  We assume the stripe counter is accurate
+        //  Optical flow expects standard deviation of 0.01% of the measured value
+        //  Assuming top speed 10m/s,
+        //  standard deviation = 0.01 * 10 = 0.1 m/s
+        //  variance = 0.1^2 = 0.01 m/s^2
+
+        let measurement_noise: Matrix2<f64> = Matrix2::new(0.01, 0.0, 0.0, 0.0);
+
+        let kalman_filter = KalmanFilter::new(
+            initial_state,
+            initial_covariance,
+            transition_matrix,
+            control_matrix,
+            observation_matrix,
+            process_noise,
+            measurement_noise,
+        );
+
+        Localizer {
+            displacement: 0.0,
+            velocity: 0.0,
+            previous_velocity: 0.0,
+            acceleration: 0.0,
+            kalman_filter,
+            keyence_checker: KeyenceAgrees::new(),
+            keyence_val: 0.0,
+            optical_val: 0.0,
+            accelerometer_val: 0.0,
+        }
+    }
+}
+
+impl Default for Localizer {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl Localizer {
+    pub fn preprocessor(
+        &mut self,
+        optical_data: Vec<f64, 2>,
+        keyence_data: Vec<u32, 2>,
+        accelerometer_data: RawAccelerometerData<K_NUM_ACCELEROMETERS, K_NUM_AXIS>,
+    ) {
+        let processed_optical_data = process_optical_data(optical_data.clone());
+        self.optical_val = processed_optical_data as f64;
+
+        let keyence_status = self
+            .keyence_checker
+            .check_keyence_agrees(keyence_data.clone());
+
+        if keyence_status == SensorChecks::Unacceptable {
+            //TODOLater: Change state
+            return;
+        } else {
+            //TODOLater: Check unit of keyence data
+            self.keyence_val = keyence_data[0] as f64;
+        }
+
+        let mut accelerometer_preprocessor = AccelerometerPreprocessor::new();
+        let processed_accelerometer_data =
+            accelerometer_preprocessor.process_data(accelerometer_data);
+        if processed_accelerometer_data.is_none() {
+            // TODOLater: Change state
+            return;
+        }
+
+        let processed_accelerometer_data = processed_accelerometer_data.unwrap();
+        self.accelerometer_val = 0.0;
+        for i in 0..K_NUM_ACCELEROMETERS {
+            for _ in 0..K_NUM_AXIS {
+                self.accelerometer_val += processed_accelerometer_data[i] as f64;
+            }
+        }
+        self.accelerometer_val /= (K_NUM_ACCELEROMETERS * K_NUM_AXIS) as f64;
+    }
+
+    pub fn iteration(
+        &mut self,
+        optical_data: Vec<f64, 2>,
+        keyence_data: Vec<u32, 2>,
+        accelerometer_data: RawAccelerometerData<K_NUM_ACCELEROMETERS, K_NUM_AXIS>,
+    ) {
+        self.preprocessor(
+            optical_data.clone(),
+            keyence_data.clone(),
+            accelerometer_data.clone(),
+        );
+
+        let control_input = Vector1::new(self.accelerometer_val);
+
+        self.kalman_filter.predict(&control_input);
+
+        //TODOLater: Check unit of keyence data
+        let measurement = Vector2::new(self.keyence_val * STRIPE_WIDTH, self.optical_val);
+
+        self.kalman_filter.update(&measurement);
+
+        let state = self.kalman_filter.get_state();
+
+        self.displacement = state[0];
+        self.velocity = state[1];
+        self.acceleration = (self.velocity - self.previous_velocity) / DELTA_T; //TODOLater: is this accurate enough?
+        self.previous_velocity = self.velocity;
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_localizer_with_zeros() {
+        let mut localizer = Localizer::default();
+
+        let optical_data: Vec<f64, 2> = Vec::from_slice(&[0.0, 0.0]).unwrap();
+
+        let raw_keyence_data: Vec<u32, 2> = Vec::from_slice(&[0, 0]).unwrap();
+
+        let raw_accelerometer_data: RawAccelerometerData<K_NUM_ACCELEROMETERS, K_NUM_AXIS> =
+            RawAccelerometerData::from_slice(&[
+                Vec::from_slice(&[0.0, 0.0, 0.0]).unwrap(),
+                Vec::from_slice(&[0.0, 0.0, 0.0]).unwrap(),
+                Vec::from_slice(&[0.0, 0.0, 0.0]).unwrap(),
+                Vec::from_slice(&[0.0, 0.0, 0.0]).unwrap(),
+            ])
+            .unwrap();
+
+        localizer.iteration(optical_data, raw_keyence_data, raw_accelerometer_data);
+
+        assert_eq!(localizer.displacement, 0.0);
+        assert_eq!(localizer.velocity, 0.0);
+        assert_eq!(localizer.acceleration, 0.0);
+    }
+}

lib/localisation/src/preprocessing/accelerometer.rs

@@ -1,6 +1,7 @@
-use crate::types::{AccelerometerData, RawAccelerometerData, SensorChecks};
-
-use super::super::types::{K_NUM_ACCELEROMETERS, K_NUM_ALLOWED_ACCELEROMETER_OUTLIERS, K_NUM_AXIS};
+use crate::types::{
+    AccelerometerData, RawAccelerometerData, SensorChecks, K_NUM_ACCELEROMETERS,
+    K_NUM_ALLOWED_ACCELEROMETER_OUTLIERS, K_NUM_AXIS,
+};
 use heapless::Vec;
 
 /// Stores the quartiles of the data and the bounds for outliers

lib/localisation/src/preprocessing/keyence.rs

@@ -3,7 +3,7 @@ use heapless::Vec;
 #[derive(PartialEq, Debug)]
 pub enum SensorChecks {
     Acceptable,
-    Unnaceptable,
+    Unacceptable,
 }
 
 /// Checks if the two Keyence sensors are in agreement.
@@ -25,9 +25,9 @@ impl KeyenceAgrees {
         }
     }
 
-    pub fn check_keyence_agrees(&mut self, keyence_data: Vec<bool, 2>) -> SensorChecks {
+    pub fn check_keyence_agrees(&mut self, keyence_data: Vec<u32, 2>) -> SensorChecks {
         if keyence_data[0] != keyence_data[1] && !self.previous_keyence_agreement {
-            return SensorChecks::Unnaceptable;
+            return SensorChecks::Unacceptable;
         } else {
             self.previous_keyence_agreement = keyence_data[0] == keyence_data[1];
         }
@@ -42,7 +42,7 @@ mod tests {
 
     #[test]
     fn test_acceptable_success() {
-        let keyence_data: Vec<bool, 2> = Vec::from_slice(&[true, true]).unwrap();
+        let keyence_data: Vec<u32, 2> = Vec::from_slice(&[0, 1]).unwrap();
         let mut keyence_agrees = KeyenceAgrees::new();
         let desired_outcome = SensorChecks::Acceptable;
         let result = keyence_agrees.check_keyence_agrees(keyence_data);
@@ -51,7 +51,7 @@ mod tests {
 
     #[test]
     fn test_acceptable_false_success() {
-        let keyence_data: Vec<bool, 2> = Vec::from_slice(&[true, false]).unwrap();
+        let keyence_data: Vec<u32, 2> = Vec::from_slice(&[0, 1]).unwrap();
         let mut keyence_agrees = KeyenceAgrees::new();
         let desired_outcome = SensorChecks::Acceptable;
         let result = keyence_agrees.check_keyence_agrees(keyence_data);
@@ -60,8 +60,8 @@ mod tests {
 
     #[test]
     fn test_acceptable_second_false_success() {
-        let first_keyence_data: Vec<bool, 2> = Vec::from_slice(&[true, true]).unwrap();
-        let second_keyence_data: Vec<bool, 2> = Vec::from_slice(&[true, false]).unwrap();
+        let first_keyence_data: Vec<u32, 2> = Vec::from_slice(&[1, 1]).unwrap();
+        let second_keyence_data: Vec<u32, 2> = Vec::from_slice(&[1, 1]).unwrap();
         let mut keyence_agrees = KeyenceAgrees::new();
         let desired_outcome = SensorChecks::Acceptable;
         let initial_try = keyence_agrees.check_keyence_agrees(first_keyence_data);
@@ -72,8 +72,8 @@ mod tests {
 
     #[test]
     fn test_acceptable_prev_false_success() {
-        let first_keyence_data: Vec<bool, 2> = Vec::from_slice(&[true, false]).unwrap();
-        let second_keyence_data: Vec<bool, 2> = Vec::from_slice(&[true, true]).unwrap();
+        let first_keyence_data: Vec<u32, 2> = Vec::from_slice(&[1, 2]).unwrap();
+        let second_keyence_data: Vec<u32, 2> = Vec::from_slice(&[1, 1]).unwrap();
         let mut keyence_agrees = KeyenceAgrees::new();
         let desired_outcome = SensorChecks::Acceptable;
         let initial_try = keyence_agrees.check_keyence_agrees(first_keyence_data);
@@ -84,11 +84,11 @@ mod tests {
 
     #[test]
     fn test_unnacceptable_prev_false_success() {
-        let first_keyence_data: Vec<bool, 2> = Vec::from_slice(&[true, false]).unwrap();
-        let second_keyence_data: Vec<bool, 2> = Vec::from_slice(&[true, false]).unwrap();
+        let first_keyence_data: Vec<u32, 2> = Vec::from_slice(&[1, 2]).unwrap();
+        let second_keyence_data: Vec<u32, 2> = Vec::from_slice(&[2, 3]).unwrap();
         let mut keyence_agrees = KeyenceAgrees::new();
         let first_outcome = SensorChecks::Acceptable;
-        let second_outcome = SensorChecks::Unnaceptable;
+        let second_outcome = SensorChecks::Unacceptable;
         let initial_try = keyence_agrees.check_keyence_agrees(first_keyence_data);
         let result = keyence_agrees.check_keyence_agrees(second_keyence_data);
         assert_eq!(initial_try, first_outcome);

lib/localisation/src/preprocessing/optical.rs

@@ -2,20 +2,15 @@ use heapless::Vec;
 use libm::sqrtf;
 
 /// Processes the raw optical data to get the magnitude and added to the optical data for each sensor
-pub fn process_data(raw_optical_data: Vec<Vec<f64, 2>, 2>) -> Vec<f32, 2> {
-    let mut optical_data: Vec<f32, 2> = Vec::from_slice(&[0.0, 0.0]).unwrap();
+pub fn process_optical_data(raw_optical_data: Vec<f64, 2>) -> f32 {
+    let mut magnitude: f32 = 0.0;
 
-    for i in 0..2 {
-        let mut magnitude: f32 = 0.0;
-
-        for data in raw_optical_data[i].clone() {
-            let data: f32 = data as f32;
-            magnitude += data * data;
-        }
-        optical_data[i] = sqrtf(magnitude);
+    for data in raw_optical_data {
+        let data: f32 = data as f32;
+        magnitude += data * data;
     }
 
-    optical_data
+    sqrtf(magnitude)
 }
 
 #[cfg(test)]
@@ -24,37 +19,25 @@ mod tests {
 
     #[test]
     fn test_correct_positive() {
-        let raw_optical_data: Vec<Vec<f64, 2>, 2> = Vec::from_slice(&[
-            Vec::from_slice(&[1.0, 1.0]).unwrap(),
-            Vec::from_slice(&[3.0, 4.0]).unwrap(),
-        ])
-        .unwrap();
-        let desired_outcome: Vec<f32, 2> = Vec::from_slice(&[sqrtf(2.0), 5.0]).unwrap();
-        let result = process_data(raw_optical_data);
+        let raw_optical_data: Vec<f64, 2> = Vec::from_slice(&[1.0, 1.0]).unwrap();
+        let desired_outcome: f32 = sqrtf(2.0);
+        let result = process_optical_data(raw_optical_data);
         assert_eq!(result, desired_outcome);
     }
 
     #[test]
     fn test_correct_negative() {
-        let raw_optical_data: Vec<Vec<f64, 2>, 2> = Vec::from_slice(&[
-            Vec::from_slice(&[-4.0, -6.0]).unwrap(),
-            Vec::from_slice(&[-3.0, -1.0]).unwrap(),
-        ])
-        .unwrap();
-        let desired_outcome: Vec<f32, 2> = Vec::from_slice(&[7.2111025, 3.1622777]).unwrap();
-        let result = process_data(raw_optical_data);
+        let raw_optical_data: Vec<f64, 2> = Vec::from_slice(&[-4.0, -6.0]).unwrap();
+        let desired_outcome: f32 = sqrtf(52.0);
+        let result = process_optical_data(raw_optical_data);
         assert_eq!(result, desired_outcome);
     }
 
     #[test]
     fn test_correct_zero() {
-        let raw_optical_data: Vec<Vec<f64, 2>, 2> = Vec::from_slice(&[
-            Vec::from_slice(&[0.0, 0.0]).unwrap(),
-            Vec::from_slice(&[0.0, 0.0]).unwrap(),
-        ])
-        .unwrap();
-        let desired_outcome: Vec<f32, 2> = Vec::from_slice(&[0.0, 0.0]).unwrap();
-        let result = process_data(raw_optical_data);
+        let raw_optical_data: Vec<f64, 2> = Vec::from_slice(&[0.0, 0.0]).unwrap();
+        let desired_outcome: f32 = 0.0;
+        let result = process_optical_data(raw_optical_data);
         assert_eq!(result, desired_outcome);
     }
 }