Renamed val to value

Author: lupyuen

rust/app/src/app_sensor.rs

@@ -93,7 +93,7 @@ extern fn handle_sensor_data(sensor: sensor_ptr, _arg: sensor_arg,
 
     //  Get the temperature sensor value. It could be raw or computed.
     let sensor_value = convert_sensor_data(sensor_data, sensor_type);
-    if let SensorValueType::None = sensor_value.val { assert!(false, "bad type"); }
+    if let SensorValueType::None = sensor_value.value { assert!(false, "bad type"); }
 
     //  Compose a CoAP message with the temperature sensor data and send to the 
     //  CoAP server.  The message will be enqueued for transmission by the OIC 
@@ -122,7 +122,7 @@ fn convert_sensor_data(sensor_data: sensor_data_ptr, sensor_type: sensor_type_t)
     SensorValue {
         key: &TEMP_SENSOR_KEY,       //  Sensor data key is `t`
         geo: SensorValueType::None,  //  No location
-        val: match sensor_type {
+        value: 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.
                 let mut rawtempdata = fill_zero!(sensor_temp_raw_data);

rust/app/src/gps_sensor.rs

@@ -81,13 +81,13 @@ extern fn handle_gps_data(sensor: sensor_ptr, _arg: sensor_arg,
 
     //  Convert the GPS geolocation for transmission.
     let sensor_value = convert_gps_data(sensor_data, sensor_type);
-    if let SensorValueType::None = sensor_value.val {
+    if let SensorValueType::None = sensor_value.value {
         console::print("Warn: GPS not ready\n");
         return MynewtError::SYS_EINVAL;   //  Exit if GPS is not ready
     }
 
     //  Show the GPS geolocation.
-    if let SensorValueType::Geolocation { latitude, longitude, altitude } = sensor_value.val {
+    if let SensorValueType::Geolocation { latitude, longitude, altitude } = sensor_value.value {
         console::print("Info: GPS lat: ");   console::printdouble(latitude);
         console::print(", lng: "); console::printdouble(longitude);
         console::print(", alt: "); console::printfloat(altitude as f32);
@@ -110,7 +110,7 @@ fn convert_gps_data(sensor_data: sensor_data_ptr, sensor_type: sensor_type_t) ->
     SensorValue {
         key: &GPS_SENSOR_KEY,  //  Sensor data key is `geolocation`
         geo: SensorValueType::None,
-        val: match sensor_type {
+        value: 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.
                 let mut geolocation = fill_zero!(sensor_geolocation_data);
@@ -141,9 +141,9 @@ 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) {
-    if let SensorValueType::Geolocation {..} = sensor_value.val {
+    if let SensorValueType::Geolocation {..} = sensor_value.value {
         //  Save the geolocation for later transmission.
-        unsafe { current_geolocation = sensor_value.val };
+        unsafe { current_geolocation = sensor_value.value };
     } else {
         //  Attach the current geolocation to the sensor data for transmission.
         sensor_value.geo = current_geolocation;

rust/mynewt/src/hw/sensor.rs

@@ -123,7 +123,7 @@ extern "C" fn wrap_sensor_listener(
 
     //  Convert the sensor data to sensor value
     let sensor_value = convert_sensor_data(sensor_data, info.sensor_key, sensor_type);
-    if let SensorValueType::None = sensor_value.val { assert!(false, "bad type"); }
+    if let SensorValueType::None = sensor_value.value { assert!(false, "bad type"); }
 
     //  Call the unwrapped function
     (info.listener_func)(&sensor_value)
@@ -157,8 +157,8 @@ 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 {
+        geo: SensorValueType::None,
+        value: 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.
                 let mut rawtempdata = fill_zero!(sensor_temp_raw_data);
@@ -246,7 +246,7 @@ 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,
+  pub value: SensorValueType,
   ///  Geolocation associated with the sensor value.
   pub geo: SensorValueType,
 }
@@ -257,7 +257,7 @@ impl Default for SensorValue {
   fn default() -> SensorValue {
     SensorValue {
       key: &init_strn!(""),
-      val: SensorValueType::None,
+      value: SensorValueType::None,
       geo: SensorValueType::None,
     }
   }