Diff: LCD_punch_mtr8_v5.cpp

Revision:

8:ce65e42b08c9

Parent:

7:6aa16a6fde70

Child:

9:795a998ebb21

--- a/LCD_punch_mtr8_v5.cpp	Fri Jan 30 22:26:06 2015 +0000
+++ b/LCD_punch_mtr8_v5.cpp	Mon Feb 02 18:23:30 2015 +0000
@@ -125,6 +125,8 @@
     char lcdData[LCDLEN]; //buffer needs places dor decimal pt and colon
     uint8_t regData = MAX_4G; // test value must change after G setting
     int16_t xCounts;
+    int16_t yCounts;
+    int16_t zCounts;
     
 #ifdef PRINTDBUG
         pc.printf(PROGNAME);
@@ -173,7 +175,9 @@
             xAcc = abs(acc.getAccX());
             xCounts = acc.getAccAxis(REG_OUT_X_MSB);
             yAcc = abs(acc.getAccY());
+            yCounts = acc.getAccAxis(REG_OUT_Y_MSB);
             zAcc = abs(acc.getAccZ());
+            zCounts = acc.getAccAxis(REG_OUT_Z_MSB);
  // Calulate vector sum of x,y and z reading.       
             vector = sqrt(pow(xAcc,2) + pow(zAcc,2));
             vector = zAcc;
@@ -182,8 +186,8 @@
             }
 //Prepare data for LCD display 
             accaxisdata[XCOMPD] = abs((float)xCounts/COUNTSCALE); // scalling is set to 1 at this point
-            accaxisdata[YCOMPD] = yAcc;
-            accaxisdata[ZCOMPD] = zAcc;
+            accaxisdata[YCOMPD] = abs((float)yCounts/COUNTSCALE);
+            accaxisdata[ZCOMPD] = abs((float)zCounts/COUNTSCALE);
             accaxisdata[VMAXD] = vMax;
             dataTimer.reset();
             LEDDwell = 1.1 - vMax/MAXGS;