From 15163d82da61a41780b19a86db922bfe065c3da3 Mon Sep 17 00:00:00 2001
From: Aux1r <ThePigZilla@gmail.com>
Date: Thu, 14 Nov 2024 18:04:02 +0000
Subject: [PATCH] Tests & Task done

---
 boards/stm32l476rg/src/tasks/tof.rs | 34 ++++++++++++++++
 lib/sensors/src/tof.rs              | 60 ++++++++++++++++++++++++++++-
 2 files changed, 93 insertions(+), 1 deletion(-)
 create mode 100644 boards/stm32l476rg/src/tasks/tof.rs

diff --git a/boards/stm32l476rg/src/tasks/tof.rs b/boards/stm32l476rg/src/tasks/tof.rs
new file mode 100644
index 0000000..51543c6
--- /dev/null
+++ b/boards/stm32l476rg/src/tasks/tof.rs
@@ -0,0 +1,34 @@
+use crate::io::i2c::Stm32l476rgI2c;
+use defmt_rtt as _;
+use embassy_stm32::i2c::I2c;
+use embassy_stm32::time::Hertz;
+use hyped_sensors::tof::{TimeOfFlight, ToFAddresses};
+
+// Test task that continuously starts a single shot measurement and reads the result
+#[embassy_executor::task]
+pub async fn read_tof_range() -> ! {
+    let p = embassy_stm32::init(Default::default());
+    let i2c = I2c::new_blocking(p.I2C1, p.PB8, p.PB9, Hertz(100_000), Default::default());
+    let mut hyped_i2c = Stm32l476rgI2c::new(i2c);
+
+    let mut tof_sensor = TimeOfFlight::new(&mut hyped_i2c, ToFAddresses::Address29)
+        .expect(
+            "Failed to create Time of Flight sensor. Check the wiring and I2C address of the sensor."
+        );
+
+    loop {
+
+        tof_sensor.start_ss_measure()
+
+        tof_sensor.poll_range()
+
+        match tof_sensor.read_range() {
+            Some(range) => {
+                defmt::info!("Range: {:?}", range)
+            }
+            None => {
+                defmt::info!("Failed to read range")
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/lib/sensors/src/tof.rs b/lib/sensors/src/tof.rs
index 8e72dea..a4d6552 100644
--- a/lib/sensors/src/tof.rs
+++ b/lib/sensors/src/tof.rs
@@ -5,6 +5,8 @@ use hyped_io::i2c::{HypedI2c, I2cError};
 ///
 /// The majority of this implementation was done by implementing code examples from the Application Sheet (see below)
 /// into Rust code; this implementation should allow us to start single-shot and continuous measurements and read their results.
+/// Switching between single-shot and continuous measurements is outlined at the end of page 22 of the Application Sheet. The sensor's
+/// task in /tasks/tof.rs is a test task that reads range via single-shot measurement. 
 /// 
 /// Data Sheet: https://www.st.com/en/imaging-and-photonics-solutions/vl6180.html#overview
 /// 
@@ -83,7 +85,7 @@ impl<'a, T: HypedI2c> TimeOfFlight<'a, T> {
             } & 0x07;
         }
 
-    } // consider using a 10-iteration loop, each time it waits, say, 1-2 seconds. if the result is not ready after 10-20 seconds, return an error?
+    }
 
     pub fn read_range(&mut self) -> Option<u8> {
         let range_byte =
@@ -137,6 +139,7 @@ pub enum ToFAddresses {
     Address29 = 0x29,
 }
 
+#[derive(Debug)]
 pub enum ToFError {
     I2cError(I2cError)
 }
@@ -241,6 +244,7 @@ mod tests {
     use heapless::FnvIndexMap;
     use hyped_io::i2c::mock_i2c::MockI2c;
 
+    #[test]
     fn test_tof_config() {
         let i2c_values = FnvIndexMap::new();
         let mut i2c = MockI2c::new(i2c_values);
@@ -278,6 +282,8 @@ mod tests {
                 Some(&Some(SYS_INTERRUPT_CONFIG_GPIO_VAL))
         );
     }
+    
+    #[test]
     fn test_start_ss() {
         let i2c_values = FnvIndexMap::new();
         let mut i2c = MockI2c::new(i2c_values);
@@ -288,6 +294,8 @@ mod tests {
             Some(&Some(SYSRANGE_START_SS_VAL))
         );
     }
+
+    #[test]
     fn test_start_cts() {
         let i2c_values = FnvIndexMap::new();
         let mut i2c = MockI2c::new(i2c_values);
@@ -298,6 +306,8 @@ mod tests {
             Some(&Some(SYSRANGE_START_CTS_VAL))
         );
     }
+
+    #[test]
     fn test_clear_interr() {
         let i2c_values = FnvIndexMap::new();
         let mut i2c = MockI2c::new(i2c_values);
@@ -308,4 +318,52 @@ mod tests {
             Some(&Some(CLEAR_INTERRUPTS_VAL))
         );
     }
+
+    #[test]
+    fn test_range_read_0() {
+        let mut i2c_values = FnvIndexMap::new();
+        let _ = i2c_values.insert(
+            (ToFAddresses::Address29 as u8, RESULT_RANGE_VAL as u16),
+            Some(0x00),
+        );
+        let mut i2c = MockI2c::new(i2c_values);
+        let mut tof = TimeOfFlight::new(&mut i2c, ToFAddresses::Address29).unwrap();
+        assert_eq!(tof.read_range(), Some(0));
+    }
+
+    #[test]
+    fn test_range_read_200() {
+        let mut i2c_values = FnvIndexMap::new();
+        let _ = i2c_values.insert(
+            (ToFAddresses::Address29 as u8, RESULT_RANGE_VAL as u16),
+            Some(0xC8),
+        );
+        let mut i2c = MockI2c::new(i2c_values);
+        let mut tof = TimeOfFlight::new(&mut i2c, ToFAddresses::Address29).unwrap();
+        assert_eq!(tof.read_range(), Some(200));
+    }
+    
+    #[test]
+    fn test_range_read_255() {
+        let mut i2c_values = FnvIndexMap::new();
+        let _ = i2c_values.insert(
+            (ToFAddresses::Address29 as u8, RESULT_RANGE_VAL as u16),
+            Some(0xFF),
+        );
+        let mut i2c = MockI2c::new(i2c_values);
+        let mut tof = TimeOfFlight::new(&mut i2c, ToFAddresses::Address29).unwrap();
+        assert_eq!(tof.read_range(), Some(255));
+    }
+
+    #[test]
+    fn test_read_reset() {
+        let mut i2c_values = FnvIndexMap::new();
+        let _ = i2c_values.insert(
+            (ToFAddresses::Address29 as u8, SYS_FRESH_OUT_RESET as u16),
+            Some(0xFF),
+        );
+        let mut i2c = MockI2c::new(i2c_values);
+        let mut tof = TimeOfFlight::new(&mut i2c, ToFAddresses::Address29).unwrap();
+        assert_eq!(tof.check_reset(), true);
+    }
 }
\ No newline at end of file