Updating virtual sensor configuration based on fusion sensor

- Adding new fusion sensor configuration
- Cleaning up existing fusion related configuration from orientation,
rotation vector, geomagnetic rotation vector and gaming rotation vector

Change-Id: Icb2284875fc84782a5df2321c49411e59b333390

diff --git a/virtual_sensors.xml b/virtual_sensors.xml
index 42ea53d..8371d60 100755 (executable)
--- a/virtual_sensors.xml
+++ b/virtual_sensors.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VIRTUAL_SENSOR>
        <DEVICE type="Mobile-Emulator">
-               <ORIENTATION>
-                       <NAME value="ORIENTATION_SENSOR" />
+               <FUSION>
+                       <NAME value="FUSION_SENSOR" />
                        <VENDOR value="SAMSUNG" />
                        <RAW_DATA_UNIT value="DEGREES" />
                        <DEFAULT_SAMPLING_TIME value="100" />
@@ -16,6 +16,13 @@
                        <GYRO_SCALE value="1146" />
                        <GEOMAGNETIC_SCALE value="1" />
                        <MAGNETIC_ALIGNMENT_FACTOR value="1" />
+               </FUSION>
+
+               <ORIENTATION>
+                       <NAME value="ORIENTATION_SENSOR" />
+                       <VENDOR value="SAMSUNG" />
+                       <RAW_DATA_UNIT value="DEGREES" />
+                       <DEFAULT_SAMPLING_TIME value="100" />
                        <AZIMUTH_ROTATION_COMPENSATION value="-1" />
                        <PITCH_ROTATION_COMPENSATION value="-1" />
                        <ROLL_ROTATION_COMPENSATION value="-1" />
@@ -44,47 +51,24 @@
                        <NAME value="RV_SENSOR" />
                        <VENDOR value="SAMSUNG" />
                        <DEFAULT_SAMPLING_TIME value="100" />
-                       <ACCEL_STATIC_BIAS value1="0" value2="0" value3="0" />
-                       <GYRO_STATIC_BIAS value1="0" value2="0" value3="0" />
-                       <GEOMAGNETIC_STATIC_BIAS value1="0" value2="0" value3="0" />
-                       <ACCEL_ROTATION_DIRECTION_COMPENSATION value1="-1" value2="-1" value3="-1" />
-                       <GYRO_ROTATION_DIRECTION_COMPENSATION value1="1" value2="1" value3="1" />
-                       <GEOMAGNETIC_ROTATION_DIRECTION_COMPENSATION value1="-1" value2="-1" value3="-1" />
-                       <ACCEL_SCALE value="1" />
-                       <GYRO_SCALE value="1146" />
-                       <GEOMAGNETIC_SCALE value="1" />
-                       <MAGNETIC_ALIGNMENT_FACTOR value="1" />
                </ROTATION_VECTOR>
 
                <GEOMAGNETIC_ROTATION_VECTOR>
                        <NAME value="GEOMAGNETIC_RV_SENSOR" />
                        <VENDOR value="SAMSUNG" />
                        <DEFAULT_SAMPLING_TIME value="100" />
-                       <ACCEL_STATIC_BIAS value1="0" value2="0" value3="0" />
-                       <GEOMAGNETIC_STATIC_BIAS value1="0" value2="0" value3="0" />
-                       <ACCEL_ROTATION_DIRECTION_COMPENSATION value1="-1" value2="-1" value3="-1" />
-                       <GEOMAGNETIC_ROTATION_DIRECTION_COMPENSATION value1="-1" value2="-1" value3="-1" />
-                       <ACCEL_SCALE value="1" />
-                       <GEOMAGNETIC_SCALE value="1" />
-                       <MAGNETIC_ALIGNMENT_FACTOR value="1" />
                </GEOMAGNETIC_ROTATION_VECTOR>
 
                <GAMING_ROTATION_VECTOR>
                        <NAME value="GAMING_RV_SENSOR" />
                        <VENDOR value="SAMSUNG" />
                        <DEFAULT_SAMPLING_TIME value="100" />
-                       <ACCEL_STATIC_BIAS value1="0" value2="0" value3="0" />
-                       <GYRO_STATIC_BIAS value1="0" value2="0" value3="0" />
-                       <ACCEL_ROTATION_DIRECTION_COMPENSATION value1="-1" value2="-1" value3="-1" />
-                       <GYRO_ROTATION_DIRECTION_COMPENSATION value1="1" value2="1" value3="1" />
-                       <ACCEL_SCALE value="1" />
-                       <GYRO_SCALE value="1146" />
                </GAMING_ROTATION_VECTOR>
        </DEVICE>
 
        <DEVICE type="Mobile-RD-PQ">
-               <ORIENTATION>
-                       <NAME value="ORIENTATION_SENSOR" />
+               <FUSION>
+                       <NAME value="FUSION_SENSOR" />
                        <VENDOR value="SAMSUNG" />
                        <RAW_DATA_UNIT value="DEGREES" />
                        <DEFAULT_SAMPLING_TIME value="100" />
@@ -98,6 +82,13 @@
                        <GYRO_SCALE value="1150" />
                        <GEOMAGNETIC_SCALE value="1" />
                        <MAGNETIC_ALIGNMENT_FACTOR value="1" />
+               </FUSION>
+
+               <ORIENTATION>
+                       <NAME value="ORIENTATION_SENSOR" />
+                       <VENDOR value="SAMSUNG" />
+                       <RAW_DATA_UNIT value="DEGREES" />
+                       <DEFAULT_SAMPLING_TIME value="100" />
                        <AZIMUTH_ROTATION_COMPENSATION value="-1" />
                        <PITCH_ROTATION_COMPENSATION value="-1" />
                        <ROLL_ROTATION_COMPENSATION value="-1" />
@@ -126,46 +117,24 @@
                        <NAME value="RV_SENSOR" />
                        <VENDOR value="SAMSUNG" />
                        <DEFAULT_SAMPLING_TIME value="100" />
-                       <ACCEL_STATIC_BIAS value1="0.064444" value2="0.15789" value3="-0.36865" />
-                       <GYRO_STATIC_BIAS value1="3.5638" value2="-5.8288" value3="-0.79750" />
-                       <GEOMAGNETIC_STATIC_BIAS value1="2.5" value2="6.5" value3="4.5" />
-                       <ACCEL_ROTATION_DIRECTION_COMPENSATION value1="1" value2="1" value3="1" />
-                       <GYRO_ROTATION_DIRECTION_COMPENSATION value1="1" value2="1" value3="1" />
-                       <GEOMAGNETIC_ROTATION_DIRECTION_COMPENSATION value1="1" value2="1" value3="1" />
-                       <ACCEL_SCALE value="1" />
-                       <GYRO_SCALE value="1150" />
-                       <GEOMAGNETIC_SCALE value="1" />
-                       <MAGNETIC_ALIGNMENT_FACTOR value="1" />
                </ROTATION_VECTOR>
 
                <GEOMAGNETIC_ROTATION_VECTOR>
                        <NAME value="GEOMAGNETIC_RV_SENSOR" />
                        <VENDOR value="SAMSUNG" />
                        <DEFAULT_SAMPLING_TIME value="100" />
-                       <ACCEL_STATIC_BIAS value1="0.064444" value2="0.15789" value3="-0.36865" />
-                       <GEOMAGNETIC_STATIC_BIAS value1="2.5" value2="6.5" value3="4.5" />
-                       <ACCEL_ROTATION_DIRECTION_COMPENSATION value1="1" value2="1" value3="1" />
-                       <GEOMAGNETIC_ROTATION_DIRECTION_COMPENSATION value1="1" value2="1" value3="1" />
-                       <ACCEL_SCALE value="1" />
-                       <GEOMAGNETIC_SCALE value="1" />
-                       <MAGNETIC_ALIGNMENT_FACTOR value="1" />
                </GEOMAGNETIC_ROTATION_VECTOR>
 
                <GAMING_ROTATION_VECTOR>
                        <NAME value="GAMING_RV_SENSOR" />
                        <VENDOR value="SAMSUNG" />
                        <DEFAULT_SAMPLING_TIME value="100" />
-                       <ACCEL_STATIC_BIAS value1="0.064444" value2="0.15789" value3="-0.36865" />
-                       <GYRO_STATIC_BIAS value1="3.5638" value2="-5.8288" value3="-0.79750" />
-                       <ACCEL_ROTATION_DIRECTION_COMPENSATION value1="1" value2="1" value3="1" />
-                       <GYRO_ROTATION_DIRECTION_COMPENSATION value1="1" value2="1" value3="1" />
-                       <ACCEL_SCALE value="1" />
-                       <GYRO_SCALE value="1150" />
                </GAMING_ROTATION_VECTOR>
        </DEVICE>
+       
        <DEVICE type="Mobile-RD-PQ_V2">
-               <ORIENTATION>
-                       <NAME value="ORIENTATION_SENSOR" />
+               <FUSION>
+                       <NAME value="FUSION_SENSOR" />
                        <VENDOR value="SAMSUNG" />
                        <RAW_DATA_UNIT value="DEGREES" />
                        <DEFAULT_SAMPLING_TIME value="100" />
@@ -179,6 +148,13 @@
                        <GYRO_SCALE value="1150" />
                        <GEOMAGNETIC_SCALE value="1" />
                        <MAGNETIC_ALIGNMENT_FACTOR value="-1" />
+               </FUSION>
+
+               <ORIENTATION>
+                       <NAME value="ORIENTATION_SENSOR" />
+                       <VENDOR value="SAMSUNG" />
+                       <RAW_DATA_UNIT value="DEGREES" />
+                       <DEFAULT_SAMPLING_TIME value="100" />
                        <AZIMUTH_ROTATION_COMPENSATION value="1" />
                        <PITCH_ROTATION_COMPENSATION value="1" />
                        <ROLL_ROTATION_COMPENSATION value="-1" />
@@ -207,41 +183,18 @@
                        <NAME value="RV_SENSOR" />
                        <VENDOR value="SAMSUNG" />
                        <DEFAULT_SAMPLING_TIME value="100" />
-                       <ACCEL_STATIC_BIAS value1="0.046091" value2="0.127486" value3="0.10787" />
-                       <GYRO_STATIC_BIAS value1="-0.54385" value2="0.24325" value3="0.87875" />
-                       <GEOMAGNETIC_STATIC_BIAS value1="-2.25" value2="-5.5" value3="1.35" />
-                       <ACCEL_ROTATION_DIRECTION_COMPENSATION value1="1" value2="-1" value3="1" />
-                       <GYRO_ROTATION_DIRECTION_COMPENSATION value1="-1" value2="1" value3="-1" />
-                       <GEOMAGNETIC_ROTATION_DIRECTION_COMPENSATION value1="1" value2="-1" value3="1" />
-                       <ACCEL_SCALE value="1" />
-                       <GYRO_SCALE value="1150" />
-                       <GEOMAGNETIC_SCALE value="1" />
-                       <MAGNETIC_ALIGNMENT_FACTOR value="-1" />
                </ROTATION_VECTOR>
 
                <GEOMAGNETIC_ROTATION_VECTOR>
                        <NAME value="GEOMAGNETIC_RV_SENSOR" />
                        <VENDOR value="SAMSUNG" />
                        <DEFAULT_SAMPLING_TIME value="100" />
-                       <ACCEL_STATIC_BIAS value1="0.046091" value2="0.127486" value3="0.10787" />
-                       <GEOMAGNETIC_STATIC_BIAS value1="-2.25" value2="-5.5" value3="1.35" />
-                       <ACCEL_ROTATION_DIRECTION_COMPENSATION value1="1" value2="-1" value3="1" />
-                       <GEOMAGNETIC_ROTATION_DIRECTION_COMPENSATION value1="1" value2="-1" value3="1" />
-                       <ACCEL_SCALE value="1" />
-                       <GEOMAGNETIC_SCALE value="1" />
-                       <MAGNETIC_ALIGNMENT_FACTOR value="-1" />
                </GEOMAGNETIC_ROTATION_VECTOR>
 
                <GAMING_ROTATION_VECTOR>
                        <NAME value="GAMING_RV_SENSOR" />
                        <VENDOR value="SAMSUNG" />
                        <DEFAULT_SAMPLING_TIME value="100" />
-                       <ACCEL_STATIC_BIAS value1="0.046091" value2="0.127486" value3="0.10787" />
-                       <GYRO_STATIC_BIAS value1="-0.54385" value2="0.24325" value3="0.87875" />
-                       <ACCEL_ROTATION_DIRECTION_COMPENSATION value1="1" value2="-1" value3="1" />
-                       <GYRO_ROTATION_DIRECTION_COMPENSATION value1="-1" value2="1" value3="-1" />
-                       <ACCEL_SCALE value="1" />
-                       <GYRO_SCALE value="1150" />
                </GAMING_ROTATION_VECTOR>
        </DEVICE>
 </VIRTUAL_SENSOR>