Added xmlwriter to project.

[speedfreak] / Client / accelerometer.cpp

diff --git a/Client/accelerometer.cpp b/Client/accelerometer.cpp
index 8733d32..04a05ce 100644 (file)
--- 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();
 }
@@ -217,6 +217,11 @@ qreal Accelerometer::getIntervalTime()
     return intervalTime;
 }
 
+qreal Accelerometer::getTotalTime()
+{
+    return totalTime;
+}
+
 /**
  * Processes Accelerometer data
  *
@@ -246,9 +251,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;
@@ -272,10 +277,10 @@ void Accelerometer::processData()
     }
 
     // Using calculate class to calculate velocity and distance etc.
-    calculate->CalculateParameters(currentAcceleration,intervalTime );
+    calculate->calculateParameters(currentAcceleration,intervalTime );
 
-    currentSpeed = calculate->CurrentSpeed();
-    distanceTraveled = calculate->DistanceTraveled();
+    currentSpeed = calculate->getCurrentSpeed();
+    distanceTraveled = calculate->getDistanceTraveled();
 
     file.close();
 }