Renamed loc to geo

Author: lupyuen

rust/app/src/app_sensor.rs

@@ -121,7 +121,7 @@ fn convert_sensor_data(sensor_data: sensor_data_ptr, sensor_type: sensor_type_t)
     //  Construct and return a new `SensorValue` (without semicolon)
     SensorValue {
         key: &TEMP_SENSOR_KEY,       //  Sensor data key is `t`
-        loc: SensorValueType::None,  //  No location
+        geo: 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.

rust/app/src/gps_sensor.rs

@@ -109,7 +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,
+        geo: 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.
@@ -146,7 +146,7 @@ fn aggregate_sensor_data(sensor_value: SensorValue) {
         unsafe { current_geolocation = sensor_value.val };
     } else {
         //  Attach the current geolocation to the sensor data for transmission.
-        sensor_value.loc = current_geolocation;
+        sensor_value.geo = current_geolocation;
         //  TODO: Transmit sensor value with geolocation.
     }
 }

rust/mynewt/src/hw/sensor.rs

@@ -248,7 +248,7 @@ pub struct SensorValue {
   ///  The type of the sensor value and the value.
   pub val: SensorValueType,
   ///  Geolocation associated with the sensor value.
-  pub loc: SensorValueType,
+  pub geo: SensorValueType,
 }
 
 ///  Default sensor value is `None`
@@ -258,7 +258,7 @@ impl Default for SensorValue {
     SensorValue {
       key: &init_strn!(""),
       val: SensorValueType::None,
-      loc: SensorValueType::None,
+      geo: SensorValueType::None,
     }
   }
 }