Diff: main.cpp

Revision:

13:b3637adeaa2a

Parent:

12:bd1d030d5c30

Child:

14:682bdfcff46a

--- a/main.cpp	Tue Jan 17 20:55:08 2017 +0000
+++ b/main.cpp	Tue Jan 17 23:34:00 2017 +0000
@@ -33,6 +33,7 @@
 Ticker inter_t; //Ticker for the touch screen
 Timer t;
 float compass_h; //compass heading
+float main_data[2];
 
 void UI() //the general UI code for the touch screen
 {
@@ -70,7 +71,7 @@
         touch.init(); //initializes touch screen
         compass_config();
         temperature_config();
-        //configure_acceleration();
+        configure_acceleration();
         while(1){
             //myLCD.foreground(Black);
              //myLCD.background(White);   
@@ -126,7 +127,9 @@
                                     myLCD.locate(60, 100);
                                     myLCD.printf("A");
                                     myLCD.fillcircle(60,100,30,Blue);
-                                    //acceleration
+                                    getacceleration(main_data);
+                                    myLCD.locate(80,150);
+                                    myLCD.printf("%f accel",main_data[1]);
                                 }
                             if (choice == 2) //compass
                             {