Diff: main.cpp

Revision:

1:78138640bd0e

Parent:

0:a006e8002089

Child:

2:152191e37eb1

diff -r a006e8002089 -r 78138640bd0e main.cpp
--- a/main.cpp	Sat Jun 30 10:12:08 2012 +0000
+++ b/main.cpp	Wed Jul 04 20:22:15 2012 +0000
@@ -4,15 +4,13 @@
 #include "mbed.h"
 #include "MMA7660FC.h"
 
-#define ADDR_MMA7660 0x98        // I2C SLAVE ADDR MMA7660FC
+#define ADDR_MMA7660 0x98                   // I2C SLAVE ADDR MMA7660FC
 
-MMA7660FC Acc(p28, p27, ADDR_MMA7660);       //sda, scl, Addr
+MMA7660FC Acc(p28, p27, ADDR_MMA7660);      //sda, scl, Addr
 Serial pc(USBTX, USBRX);
 
 
 float G_VALUE[64] = {0, 0.047, 0.094, 0.141, 0.188, 0.234, 0.281, 0.328, 0.375, 0.422, 0.469, 0.516, 0.563, 0.609, 0.656, 0.703, 0.750, 0.797, 0.844, 0.891, 0.938, 0.984, 1.031, 1.078, 1.125, 1.172, 1.219, 1.266, 1.313, 1.359, 1.406, 1.453, -1.500, -1.453, -1.406, -1.359, -1.313, -1.266, -1.219, -1.172, -1.125, -1.078, -1.031, -0.984, -0.938, -0.891, -0.844, -0.797, -0.750, -0.703, -0.656, -0.609, -0.563, -0.516, -0.469, -0.422, -0.375, -0.328, -0.281, -0.234, -0.188, -0.141, -0.094, -0.047};
-float TILT_XY[64] = {0, 2.69, 5.38, 8.08, 10.81, 13.55, 16.33, 19.16, 22.02, 24.95, 27.95, 31.04, 34.23, 37.54, 41.01, 44.68, 48.59, 52.83, 57.54, 62.95, 69.64, 79.86, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -79.86, -69.64, -62.95, -57.54, -52.83, -48.59, -44.68, -41.01, -37.54, -34.23, -31.04, -27.95, -24.95, -22.02, -19.16, -16.33, -13.55, -10.81, -8.08, -5.38, -2.69}; 
-float TILT_Z[64] = {90.00, 87.31, 84.62, 81.92, 79.19, 76.45, 73.67, 70.84, 67.98, 65.05, 62.05, 58.96, 55.77, 52.46, 48.99, 45.32, 41.41, 37.17, 32.46, 27.05, 20.36, 10.14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -10.14, -20.36, -27.05, -32.46, -37.17, -41.41, -45.32, -48.99, -52.46, -55.77, -58.96, -62.05, -65.05, -67.98, -70.84, -73.67, -76.45, -79.19, -81.92, -84.62};                         
 
 
 
@@ -26,21 +24,20 @@
            
     while(1)
     {   
-        int x=0, y=0, z=0;
-        
-        Acc.read_g(&x, &y, &z);                                     // Read the acceleration
-              
-        pc.printf("x: %1.3fg \n", G_VALUE[x]);                      // Print the X axis acceleration in g
-        pc.printf("y: %1.3fg \n", G_VALUE[y]);                      // Print the Y axis acceleration in g
-        pc.printf("z: %1.3fg \n", G_VALUE[z]);                      // Print the Z axis acceleration in g
+        float x=0, y=0, z=0;
         
-        
-        pc.printf("Tilt x: %2.2f degree \n", TILT_XY[x]);           // Print the tilt orientation of the X axis
-        pc.printf("Tilt y: %2.2f degree \n", TILT_XY[y]);           // Print the tilt orientation of the Y axis
-        pc.printf("Tilt z: %2.2f degree \n", TILT_Z[z]);            // Print the tilt orientation of the Z axis
+        Acc.read_Tilt(&x, &y, &z);                                     // Read the acceleration                    
+        pc.printf("Tilt x: %2.2f degree \n", x);                    // Print the tilt orientation of the X axis
+        pc.printf("Tilt y: %2.2f degree \n", y);                    // Print the tilt orientation of the Y axis
+        pc.printf("Tilt z: %2.2f degree \n", z);                    // Print the tilt orientation of the Z axis
 
+        wait_ms(100);
+
+        pc.printf("x: %2.0f \n", Acc.read_z());                      // Print the X axis acceleration
+        pc.printf("y: %2.0f \n", Acc.read_y());                      // Print the Y axis acceleration
+        pc.printf("z: %2.0f \n", Acc.read_z());                      // Print the Z axis acceleration
         pc.printf("\n");
-        wait(2);
+        wait(5);
           
     }
 }