From 919419ba02ecd66b43cb2003123fdfee8decf17b Mon Sep 17 00:00:00 2001
From: "tawhwan.son" <tawhwan.son@samsung.com>
Date: Tue, 26 Mar 2013 17:35:22 +0900
Subject: [PATCH] Fix tilt sensor routine

Change-Id: I86746645fb2d0d9e2ad21e413cab3b927a807dac
Signed-off-by: tawhwan.son <tawhwan.son@samsung.com>
---
 src/FUixSensor_ISensorCore.cpp | 79 ++++--------------------------------------
 1 file changed, 7 insertions(+), 72 deletions(-)

diff --git a/src/FUixSensor_ISensorCore.cpp b/src/FUixSensor_ISensorCore.cpp
index 7e887cd..a5bfb20 100644
--- a/src/FUixSensor_ISensorCore.cpp
+++ b/src/FUixSensor_ISensorCore.cpp
@@ -211,17 +211,6 @@ OnProximityDistanceDataEventReceived(unsigned long long timestamp, float distanc
 }
 
 void
-OnTiltAccelerationDataEventReceived(unsigned long long timestamp, sensor_data_accuracy_e accuracy,
-	float x, float y, float z, void* pUserData)
-{
-	_ISensorCoreEventReceiver& receiver= *static_cast<_ISensorCoreEventReceiver*>(pUserData);
-	_SensorCoreEvent& eventBuffer = receiver.GetSensorCoreEventBuffer();
-	eventBuffer.isEventValid = !(IsEquals(x, 0.0F) && (IsEquals(y, 0.0F) || IsEquals(z, 0.0F)));
-	eventBuffer.eventKind.tiltData.roll = _SensorUtil::Atan2(-x, z) * RADIAN_TO_DEGREE;
-	eventBuffer.eventKind.tiltData.pitch = _SensorUtil::Atan2(-x, y) * RADIAN_TO_DEGREE;
-}
-
-void
 OnTiltMagneticAzimuthDataEventReceived(unsigned long long timestamp, sensor_data_accuracy_e accuracy,
 	float azimuth, float pitch, float roll, void* pUserData)
 {
@@ -231,6 +220,8 @@ OnTiltMagneticAzimuthDataEventReceived(unsigned long long timestamp, sensor_data
 	eventBuffer.eventType = _SENSOR_CORE_EVENT_TYPE_TILT_DATA;
 	eventBuffer.eventTimestamp = CorrectTimestamp(timestamp);
 	eventBuffer.eventKind.tiltData.azimuth = azimuth;
+	eventBuffer.eventKind.tiltData.roll = roll;
+	eventBuffer.eventKind.tiltData.pitch = pitch;
 	receiver.OnSensorCoreEventReceived(eventBuffer);
 }
 
@@ -384,16 +375,7 @@ PrepareSensorCoreEventSensing(sensor_h sensorHandle, _SensorCoreEventType eventT
 		}
 	case _SENSOR_CORE_EVENT_TYPE_TILT_DATA:
 		{
-			sensorResult = sensor_accelerometer_set_cb(sensorHandle, interval, OnTiltAccelerationDataEventReceived, pUserData);
-			if (!IsSuccess(sensorResult))
-			{
-				break;
-			}
 			sensorResult = sensor_orientation_set_cb(sensorHandle, interval, OnTiltMagneticAzimuthDataEventReceived, pUserData);
-			if (!IsSuccess(sensorResult))
-			{
-				sensor_accelerometer_unset_cb(sensorHandle);
-			}
 			break;
 		}
 	case _SENSOR_CORE_EVENT_TYPE_ROTATION_RATE_DATA:
@@ -480,11 +462,6 @@ UnprepareSensorCoreEventSensing(sensor_h sensorHandle, _SensorCoreEventType even
 	case _SENSOR_CORE_EVENT_TYPE_TILT_DATA:
 		{
 			sensorResult = sensor_orientation_unset_cb(sensorHandle);
-			if (!IsSuccess(sensorResult))
-			{
-				break;
-			}
-			sensorResult = sensor_accelerometer_unset_cb(sensorHandle);
 			break;
 		}
 	case _SENSOR_CORE_EVENT_TYPE_ROTATION_RATE_DATA:
@@ -592,28 +569,9 @@ StartSensorType(sensor_h sensorHandle, sensor_type_e sensorTypeE)
 result
 StartSensorCoreEventSensing(sensor_h sensorHandle, _SensorCoreEventType eventType)
 {
-	switch (eventType)
-	{
-	case _SENSOR_CORE_EVENT_TYPE_TILT_DATA:
-		{
-			StartSensorType(sensorHandle,SENSOR_ACCELEROMETER);
-			StartSensorType(sensorHandle,SENSOR_ORIENTATION);
-			break;
-		}
-	case _SENSOR_CORE_EVENT_TYPE_GRAVITY_DATA:
-		{
-			SysLog(NID_UIX,"taehwan.son ");
-			StartSensorType(sensorHandle,SENSOR_GRAVITY);
-			break;
-		}
-	default:
-		{
-			sensor_type_e sensorTypeE = GetSensorTypeEFromSensorCoreEventType(eventType);
-			StartSensorType(sensorHandle,sensorTypeE);
-			break;
-		}
-	}
-	return E_SUCCESS;
+		sensor_type_e sensorTypeE = GetSensorTypeEFromSensorCoreEventType(eventType);
+		StartSensorType(sensorHandle,sensorTypeE);
+		return E_SUCCESS;
 }
 
 result
@@ -643,27 +601,9 @@ StopSensorType(sensor_h sensorHandle,  sensor_type_e sensorTypeE)
 result
 StopSensorCoreEventSensing(sensor_h sensorHandle, _SensorCoreEventType eventType)
 {
-	switch (eventType)
-	{
-	case _SENSOR_CORE_EVENT_TYPE_TILT_DATA:
-		{
-			StopSensorType(sensorHandle,SENSOR_ORIENTATION );
-			StopSensorType(sensorHandle,SENSOR_ACCELEROMETER );
-			break;
-		}
-	case _SENSOR_CORE_EVENT_TYPE_GRAVITY_DATA:
-		{
-			StopSensorType(sensorHandle,SENSOR_GRAVITY);
-			break;
-		}
-	default:
-		{
-			sensor_type_e sensorTypeE = GetSensorTypeEFromSensorCoreEventType(eventType);
-			StopSensorType(sensorHandle,sensorTypeE);
-			break;
-		}
-	}
 
+	sensor_type_e sensorTypeE = GetSensorTypeEFromSensorCoreEventType(eventType);
+	StopSensorType(sensorHandle,sensorTypeE);
 	return E_SUCCESS;
 }
 
@@ -691,11 +631,6 @@ ResetSensorCoreDataEventSensingInterval(sensor_h sensorHandle, _SensorCoreEventT
 	case _SENSOR_CORE_EVENT_TYPE_TILT_DATA:
 		{
 			sensorResult = sensor_orientation_set_interval(sensorHandle, interval);
-			if (!IsSuccess(sensorResult))
-			{
-				break;
-			}
-			sensorResult = sensor_accelerometer_set_interval(sensorHandle, interval);
 			break;
 		}
 	case _SENSOR_CORE_EVENT_TYPE_ROTATION_RATE_DATA:
-- 
2.7.4