Adding geolocation to sensor values

Author: lupyuen

rust/app/src/app_sensor.rs

@@ -120,7 +120,8 @@ fn convert_sensor_data(sensor_data: sensor_data_ptr, sensor_type: sensor_type_t)
     console::print("TMP listener got rawtmp\n");
     //  Construct and return a new `SensorValue` (without semicolon)
     SensorValue {
-        key: &TEMP_SENSOR_KEY,  //  Sensor data key is `t`
+        key: &TEMP_SENSOR_KEY,       //  Sensor data key is `t`
+        loc: SensorValueType::None,  //  No location
         val: match sensor_type {
             SENSOR_TYPE_AMBIENT_TEMPERATURE_RAW => {  //  If this is raw temperature...
                 //  Interpret the sensor data as a `sensor_temp_raw_data` struct that contains raw temp.
@@ -133,7 +134,7 @@ fn convert_sensor_data(sensor_data: sensor_data_ptr, sensor_type: sensor_type_t)
                 SensorValueType::Uint(rawtempdata.strd_temp_raw)  //  Raw Temperature in integer (0 to 4095)
             }
             //  Unknown type of sensor value
-            //  _ => { assert!(false, "sensor type"); SensorValueType::Uint(0) }
+            //  _ => { assert!(false, "sensor type"); SensorValueType::None }
         }
     }
 }

rust/app/src/gps_sensor.rs

@@ -109,6 +109,7 @@ fn convert_gps_data(sensor_data: sensor_data_ptr, sensor_type: sensor_type_t) ->
     //  Construct and return a new `SensorValue` (without semicolon)
     SensorValue {
         key: &GPS_SENSOR_KEY,  //  Sensor data key is `geolocation`
+        loc: SensorValueType::None,
         val: match sensor_type {
             SENSOR_TYPE_GEOLOCATION => {  //  If sensor data is GPS geolocation...
                 //  Interpret the sensor data as a `sensor_geolocation_data` struct that contains GPS geolocation.
@@ -136,6 +137,16 @@ fn convert_gps_data(sensor_data: sensor_data_ptr, sensor_type: sensor_type_t) ->
     }
 }
 
+static mut current_geolocation: SensorValueType = SensorValueType::None;
+
 ///  Aggregate the sensor value with other sensor data before transmitting to server.
-fn aggregate_sensor_data(_sensor_value: &SensorValue) {
+fn aggregate_sensor_data(sensor_value: SensorValue) {
+    if let SensorValueType::Geolocation {..} = sensor_value.val {
+        //  Save the geolocation for later transmission.
+        unsafe { current_geolocation = sensor_value.val };
+    } else {
+        //  Attach the current geolocation to the sensor data for transmission.
+        sensor_value.loc = current_geolocation;
+        //  TODO: Transmit sensor value with geolocation.
+    }
 }

rust/mynewt/src/hw/sensor.rs

@@ -157,6 +157,7 @@ fn convert_sensor_data(sensor_data: sensor_data_ptr, sensor_key: &'static Strn,
     //  Construct and return a new `SensorValue` (without semicolon)
     SensorValue {
         key: sensor_key,
+        loc: SensorValueType::None,
         val: match sensor_type {
             SENSOR_TYPE_AMBIENT_TEMPERATURE_RAW => {  //  If this is raw temperature...
                 //  Interpret the sensor data as a `sensor_temp_raw_data` struct that contains raw temp.
@@ -169,7 +170,7 @@ fn convert_sensor_data(sensor_data: sensor_data_ptr, sensor_key: &'static Strn,
                 SensorValueType::Uint(rawtempdata.strd_temp_raw)  //  Raw Temperature in integer (0 to 4095)
             }
             //  Unknown type of sensor value
-            _ => { assert!(false, "sensor type"); SensorValueType::Uint(0) }
+            _ => { assert!(false, "sensor type"); SensorValueType::None }
         }
     }
 }
@@ -240,11 +241,14 @@ pub const SENSOR_TYPE_GEOLOCATION: sensor_type_t =
 
 ///  Represents a decoded sensor data value. Since temperature may be integer (raw)
 ///  or float (computed), we use the struct to return both integer and float values.
+#[derive(Clone, Copy)]  //  Sensor values may be copied
 pub struct SensorValue {
   ///  Null-terminated string for the key.  `t` for raw temp, `tmp` for computed. When transmitted to CoAP Server or Collector Node, the key (field name) to be used.
   pub key: &'static Strn,
   ///  The type of the sensor value and the value.
   pub val: SensorValueType,
+  ///  Geolocation associated with the sensor value.
+  pub loc: SensorValueType,
 }
 
 ///  Default sensor value is `None`
@@ -254,11 +258,13 @@ impl Default for SensorValue {
     SensorValue {
       key: &init_strn!(""),
       val: SensorValueType::None,
+      loc: SensorValueType::None,
     }
   }
 }
 
 ///  Represents the type and value of a sensor data value.
+#[derive(Clone, Copy)]  //  Sensor values may be copied
 pub enum SensorValueType {
   ///  No value.
   None,