[Title]deleted tilt tab and fixed sensor value bugs

[Type]Bugfix
[Module]eventinjector
[Priority]Major
[Jira#]N_SE-2350
[Redmine#] 	// Redmine Isuue Number
[Problem] 	// Problem Description
[Cause] 	// Cause Description
[Solution]	// Solution Description
[TestCase] 	// Executed the test-target (How to)

diff --git a/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/Sensor.java b/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/Sensor.java
index 63a889b..6e17f21 100644 (file)
--- a/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/Sensor.java
+++ b/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/Sensor.java
@@ -32,7 +32,7 @@ import org.tizen.sensor.accelerometer.page.Accelerometer;
 import org.tizen.sensor.accelerometer.page.ManualInputAccel;
 import org.tizen.sensor.accelerometer.page.ManualInputGyro;
 import org.tizen.sensor.accelerometer.page.ManualInputMagnetic;
-import org.tizen.sensor.accelerometer.page.ManualInputTilt;
+//import org.tizen.sensor.accelerometer.page.ManualInputTilt;
 
 public class Sensor extends AbstractInjectorItem {
 
@@ -41,7 +41,7 @@ public class Sensor extends AbstractInjectorItem {
                addPage(new Accelerometer(this, String.format("%-16s", "GUI")));
                addPage(new ManualInputAccel(this, String.format("%-13s", "Acceleration")));
                addPage(new ManualInputMagnetic(this, String.format("%-13s", "Magnetic")));
-               addPage(new ManualInputTilt(this, String.format("%-16s", "Tilt")));
+//             addPage(new ManualInputTilt(this, String.format("%-16s", "Tilt")));
                addPage(new ManualInputGyro(this, String.format("%-13s", "Gyro")));
        }
 }

diff --git a/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/Accelerometer.java b/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/Accelerometer.java
index 2a3cfe9..9b643dd 100644 (file)
--- a/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/Accelerometer.java
+++ b/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/Accelerometer.java
@@ -201,8 +201,8 @@ public class Accelerometer extends AbstractInjectorPage {
                                                {                                                       
                                                        if(changed_accel == true){      
                                                                if( checkboxAcceleration.getSelection()){
-                                                                       accelerationData = "Acceleration : " + mf.format(panel.read_accelx) + ", "+ mf.format(panel.read_accely) +
-                                                                       ", "+ mf.format(panel.read_accelz);
+                                                                       accelerationData = "Acceleration : " + mf.format(panel.read_accelx/panel.g) + ", "+ mf.format(panel.read_accely/panel.g) +
+                                                                       ", "+ mf.format(panel.read_accelz/panel.g);
                                                                }
                                                                else {
                                                                        accelerationData = "Acceleration : Disable";
@@ -217,8 +217,8 @@ public class Accelerometer extends AbstractInjectorPage {
                                                        }
                                                        else
                                                        {
-                                                               accelerationData = "Acceleration : " + mf.format(panel.read_accelx) + ", "+ mf.format(panel.read_accely) +
-                                                                               ", "+ mf.format(panel.read_accelz);
+                                                               accelerationData = "Acceleration : " + mf.format(panel.read_accelx/panel.g) + ", "+ mf.format(panel.read_accely/panel.g) +
+                                                                               ", "+ mf.format(panel.read_accelz/panel.g);
                                                        }
                                                }
                                                

diff --git a/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/ManualInputAccel.java b/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/ManualInputAccel.java
index dd45a8b..3079706 100644 (file)
--- a/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/ManualInputAccel.java
+++ b/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/ManualInputAccel.java
@@ -50,6 +50,7 @@ public class ManualInputAccel extends AbstractInjectorPage {
        Slider accel_xSlider, accel_ySlider, accel_zSlider;
        private Text accel_xText, accel_yText, accel_zText;
        double accel_xValue, accel_yValue, accel_zValue;
+       double g = 9.80665;
        int accel_forSliderVal = 200;
        DecimalFormat df = new DecimalFormat("0.##");
        
@@ -316,10 +317,10 @@ public class ManualInputAccel extends AbstractInjectorPage {
        }
        
        public void sendMessage() {
-               accel_xText.setText(df.format(accel_xValue));
-               accel_yText.setText(df.format(accel_yValue));
-               accel_zText.setText(df.format(accel_zValue));
-               TestSensorMessage msg = new TestSensorMessage(accel_xValue * 9.81, accel_yValue * -9.81, accel_zValue * -9.81);
+               accel_xValue = Double.parseDouble(accel_xText.getText());
+               accel_yValue = Double.parseDouble(accel_yText.getText());
+               accel_zValue = Double.parseDouble(accel_zText.getText());
+               TestSensorMessage msg = new TestSensorMessage(accel_xValue * g, accel_yValue * g, accel_zValue * g);
                
                try {
                        injectorSocket.sendSensor(SensorConstants.ACCEL_ID + msg.getMessage());

diff --git a/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/ManualInputGyro.java b/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/ManualInputGyro.java
index aa405fc..dfcb4fb 100644 (file)
--- a/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/ManualInputGyro.java
+++ b/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/ManualInputGyro.java
@@ -254,7 +254,7 @@ public class ManualInputGyro extends AbstractInjectorPage {
                                }
                                
                                gyro_zValue = Double.parseDouble(number);
-                               zData = (int)(Double.parseDouble(number) * 100 + 2000);
+                               zData = (int)(Double.parseDouble(number) * 100 + gyro_forSliderVal);
                                gyro_zSlider.setSelection(zData);
                        }
                });
@@ -320,9 +320,9 @@ public class ManualInputGyro extends AbstractInjectorPage {
        }
        
        public void sendMessage() {
-               gyro_xText.setText(df.format(gyro_xValue));
-               gyro_yText.setText(df.format(gyro_yValue));
-               gyro_zText.setText(df.format(gyro_zValue));
+               gyro_xValue = Double.parseDouble(gyro_xText.getText());
+               gyro_yValue = Double.parseDouble(gyro_yText.getText());
+               gyro_zValue = Double.parseDouble(gyro_zText.getText());
                TestSensorMessage msg = new TestSensorMessage(gyro_xValue, gyro_yValue, gyro_zValue);
                
                try {

diff --git a/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/ManualInputMagnetic.java b/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/ManualInputMagnetic.java
index 2b33e54..35679a7 100644 (file)
--- a/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/ManualInputMagnetic.java
+++ b/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/ManualInputMagnetic.java
@@ -315,9 +315,9 @@ public class ManualInputMagnetic extends AbstractInjectorPage {
        }
 
        public void sendMessage() {
-               magnetic_xText.setText(Integer.toString(magnetic_xValue));
-               magnetic_yText.setText(Integer.toString(magnetic_yValue));
-               magnetic_zText.setText(Integer.toString(magnetic_zValue));
+               magnetic_xValue = Integer.parseInt(magnetic_xText.getText());
+               magnetic_yValue = Integer.parseInt(magnetic_yText.getText());
+               magnetic_zValue = Integer.parseInt(magnetic_zText.getText());
                TestSensorMessage msg = new TestSensorMessage(magnetic_xValue, magnetic_yValue, magnetic_zValue);
                
                try {

diff --git a/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/ManualInputTilt.java b/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/ManualInputTilt.java
index cc8e0ad..4a0a0f6 100644 (file)
--- a/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/ManualInputTilt.java
+++ b/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/ManualInputTilt.java
@@ -311,9 +311,9 @@ public class ManualInputTilt extends AbstractInjectorPage {
        }
        
        public void sendMessage() {
-               tilt_xText.setText(Integer.toString(tilt_xValue));
-               tilt_yText.setText(Integer.toString(tilt_yValue));
-               tilt_zText.setText(Integer.toString(tilt_zValue));
+               tilt_xValue = Integer.parseInt(tilt_xText.getText());
+               tilt_yValue = Integer.parseInt(tilt_yText.getText());
+               tilt_zValue = Integer.parseInt(tilt_zText.getText());
                TestSensorMessage msg = new TestSensorMessage(tilt_xValue, tilt_yValue, tilt_zValue);
                
                try {
@@ -322,5 +322,13 @@ public class ManualInputTilt extends AbstractInjectorPage {
                        // TODO Auto-generated catch block
                        e1.printStackTrace();
                }
+               
+               TestSensorMessage msg2 = new TestSensorMessage((tilt_yValue/ 26.2) * 1.425, (tilt_zValue / 26.2) * 1.425, ((tilt_xValue - 180)/ 26.0) * 1.425);
+               try {
+                       injectorSocket.sendSensor(SensorConstants.ACCEL_ID + msg2.getMessage());
+               } catch (Exception e1) {
+                       // TODO Auto-generated catch block
+                       e1.printStackTrace();
+               }
        }
 }

diff --git a/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/MobilePanel.java b/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/MobilePanel.java
index 19bd700..2a7e59d 100644 (file)
--- a/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/MobilePanel.java
+++ b/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/MobilePanel.java
@@ -712,6 +712,20 @@ private void updateSensorGyro(){
                                read_accelz = accelz;
                        }
                        
+                       if(read_accelx / g > 2)
+                               read_accelx = 2 * g;
+                       else if(read_accelx / g < -2)
+                               read_accelx = -2 * g;
+                       
+                       if(read_accely / g > 2)
+                               read_accely = 2 * g;
+                       else if(read_accely / g < -2)
+                               read_accely = -2 * g;
+                       
+                       if(read_accelz / g > 2)
+                               read_accelz = 2 * g;
+                       else if(read_accelz / g < -2)
+                               read_accelz = -2 * g;
                }
 
                if (currentTime >= orientation_next_update) {

diff --git a/org.tizen.sensor.accelerometer/src/org/tizen/sensor/magnetic/Magnetic.java b/org.tizen.sensor.accelerometer/src/org/tizen/sensor/magnetic/Magnetic.java
index 4725627..ced4196 100644 (file)
--- a/org.tizen.sensor.accelerometer/src/org/tizen/sensor/magnetic/Magnetic.java
+++ b/org.tizen.sensor.accelerometer/src/org/tizen/sensor/magnetic/Magnetic.java
@@ -127,16 +127,11 @@ public class Magnetic {
                /* tilt logic via accelerometer value */
                int tilt_yaw, tilt_pitch, tilt_roll;
                tilt_yaw = (int)(Math.round(Math.atan2(-x, -y) * (180.0/3.14) + 360) % 360);
-               tilt_pitch = (int)(Math.atan2(-y, -z) * (180.0/3.14)) % 180;
-               tilt_roll = (int)(Math.atan2(x, z) * (180.0/3.14)) % 180;
-               
-//             if(tilt_roll > 90)
-//                     tilt_roll = 180 - tilt_roll;
-//             else if(tilt_roll < -90)
-//                     tilt_roll = -180 - tilt_roll;
+               tilt_pitch = (int)(Math.atan2(x, -y) * (180.0/3.14));
+               tilt_roll = (int)(Math.atan2(x, -z) * (180.0/3.14)) % 180;
                
                azimuth = tilt_yaw;
-               pitch = -tilt_pitch;
+               pitch = tilt_pitch;
                roll = tilt_roll;
        }
        

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index e6d0865..7072c5b 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,5 +1,5 @@
 Package:eventinjector-eplugin
-Version:0.2.37
+Version:0.2.38
 OS:linux
 Build-host-os:linux
 Maintainer:yeongkyoon Lee <yeongkyoon.lee@samsung.com>, sungmin Ha <sungmin82.ha@samsung.com>
@@ -9,7 +9,7 @@ Install-dependency:common-eplugin[linux], base-ide-product[linux]
 Source:eventinjector-eplugin
 
 Package:eventinjector-eplugin
-Version:0.2.37
+Version:0.2.38
 OS:windows
 Build-host-os:linux
 Maintainer:yeongkyoon Lee <yeongkyoon.lee@samsung.com>, sungmin Ha <sungmin82.ha@samsung.com>