From: Rikhard Kuutti <rikhard.kuutti@fudeco.com>
Date: Wed, 3 Mar 2010 08:11:22 +0000 (+0200)
Subject: Refactored code
X-Git-Tag: v0.1~92
X-Git-Url: http://git.maemo.org/git/?p=speedfreak;a=commitdiff_plain;h=f5596a344c6d2fbc6bea90dbe8efde68c4a1a226

Refactored code
---

diff --git a/Client/accelerometer.cpp b/Client/accelerometer.cpp
index 8733d32..33f7ff2 100644
--- a/Client/accelerometer.cpp
+++ b/Client/accelerometer.cpp
@@ -121,9 +121,9 @@ void Accelerometer::calibrate(void)
         iteration++;
     } while(iteration!=1024);       // 1024 times
 
-    calibrationX = sstatex>>10;     // division by 1024
-    calibrationY = sstatey>>10;
-    calibrationZ = sstatez>>10;
+    calibrationX = calibrationX>>10;     // division by 1024
+    calibrationY = calibrationY>>10;
+    calibrationZ = calibrationZ>>10;
 
     file.close();
 }
@@ -246,9 +246,9 @@ void Accelerometer::processData()
     if (trueAccelerationY <= 30 && trueAccelerationY >= -30) { trueAccelerationY = 0; }
     if (trueAccelerationZ <= 30 && trueAccelerationZ >= -30) { trueAccelerationZ = 0; }
 
-    trueAccelerationX = (accelerationX - previousAccelerationX) / 1000 * kGravity;
-    trueAccelerationY = (accelerationY - previousAccelerationY) / 1000 * kGravity;
-    trueAccelerationZ = (accelerationZ - previousAccelerationZ) / 1000 * kGravity;
+    trueAccelerationX = (accelerationX - previousAccelerationX) /*/ 1000 * kGravity*/;
+    trueAccelerationY = (accelerationY - previousAccelerationY) /*/ 1000 * kGravity*/;
+    trueAccelerationZ = (accelerationZ - previousAccelerationZ) /*/ 1000 * kGravity*/;
 
     previousAccelerationX = accelerationX;
     previousAccelerationY = accelerationY;
diff --git a/Client/accelerometer.h b/Client/accelerometer.h
index 8eef4aa..3b74cb0 100644
--- a/Client/accelerometer.h
+++ b/Client/accelerometer.h
@@ -40,7 +40,9 @@ public:
     qreal getTotalAcceleration();
     qreal getPreviousTotalAcceleration();
 
-    int sstatex, sstatey, sstatez;
+    int calibrationX;
+    int calibrationY;
+    int calibrationZ;
 
     qreal getIntervalTime();