Sensor App: Make the temp conversion happen immediately

The temp conversion from farenhiet to celcius would only take
effect when the temperature is updated from the sensor.

This change will make the conversion happen immediately without the
temp sensor needing to update

Change-Id: Id0905f77851a37d4882dfe39b4dffc20c12a5dc4
Signed-off-by: Dan Murphy <dmurphy@ti.com>

2 files changed, 19 insertions, 11 deletions

diff --git a/sensor_test_app/src/sensor/test/com/android/sensor/Main.java b/sensor_test_app/src/sensor/test/com/android/sensor/Main.java
index e71ec13..0dca112 100644
--- a/sensor_test_app/src/sensor/test/com/android/sensor/Main.java
+++ b/sensor_test_app/src/sensor/test/com/android/sensor/Main.java
@@ -406,11 +406,17 @@ public class Main extends Activity {
 	        }
 	} else if (Main.manage.sensor_to_manage == Sensor.TYPE_TEMPERATURE) {
 		 if(item.getItemId() == 0) {
-				data.temperature_measurement = 0;
-				Log.d(TESTING_TAG, INFO_TAG + "Setting Temperature data to Celcius");
+                    if (data.temperature_units == 1)
+                        data.temp.setText("Temperature Reading: " + data.temperature_measurement + " C");
+
+                    data.temperature_units = 0;
+                    Log.d(TESTING_TAG, INFO_TAG + "Setting Temperature data to Celcius");
 	        } else if(item.getItemId() == 1){
-			 data.temperature_measurement = 1;
-			 Log.d(TESTING_TAG, INFO_TAG + "Setting Temperature to Farenheit");
+                    if (data.temperature_units == 0)
+                         data.temp.setText("Temperature Reading: " + (data.temperature_measurement * 1.8f + 32) + " F");
+
+                    data.temperature_units = 1;
+                    Log.d(TESTING_TAG, INFO_TAG + "Setting Temperature to Farenheit");
 	        } else {
 			Log.e(TESTING_TAG, FAIL_TAG + "Unknown Pressure scale requested");
 			return false;
diff --git a/sensor_test_app/src/sensor/test/com/android/sensor/Sensor_data.java b/sensor_test_app/src/sensor/test/com/android/sensor/Sensor_data.java
index 3595c3b..67df907 100644
--- a/sensor_test_app/src/sensor/test/com/android/sensor/Sensor_data.java
+++ b/sensor_test_app/src/sensor/test/com/android/sensor/Sensor_data.java
@@ -62,7 +62,8 @@ public class Sensor_data {
 	public boolean prox_state, pressure_state, temperature_state;
 	public DecimalFormat round;
 	public int pressure_measurement = 0;
-	public int temperature_measurement = 0;
+	public float temperature_measurement = 0;
+	public int temperature_units = 0;
 	private double mmHG_Conv = 0.7500616827042;
 	private double inHG_Conv = 0.029529983071;
 
@@ -195,12 +196,13 @@ public class Sensor_data {
 
 		public void onSensorChanged(SensorEvent event) {
 			if (event.sensor.getType() == Sensor.TYPE_TEMPERATURE) {
-				if (temperature_measurement == 0) {
-					temp.setText("Temperature Reading: " + event.values[0] + " C");
-					Log.d(TEMP_DATA, "Temperature Reading: " + event.values[0] + " C");
-				} else if (temperature_measurement == 1) {
-					temp.setText("Temperature Reading: " + (event.values[0] * 1.8f + 32) + " F");
-					Log.d(TEMP_DATA, "Temperature Reading: " + (event.values[0] * 1.8f + 32) + " F");
+                               temperature_measurement = event.values[0];
+				if (temperature_units == 0) {
+					temp.setText("Temperature Reading: " + temperature_measurement + " C");
+					Log.d(TEMP_DATA, "Temperature Reading: " + temperature_measurement + " C");
+				} else if (temperature_units == 1) {
+					temp.setText("Temperature Reading: " + (temperature_measurement * 1.8f + 32) + " F");
+					Log.d(TEMP_DATA, "Temperature Reading: " + (temperature_measurement * 1.8f + 32) + " F");
 				}
 			}
 		}