Diff: main.cpp

Revision:

15:29157e15b78e

Parent:

14:93d715bd49a7

Child:

16:c7dc10ccba1d

--- a/main.cpp	Fri Feb 12 13:41:02 2016 +0000
+++ b/main.cpp	Fri Feb 12 14:54:02 2016 +0000
@@ -1,15 +1,18 @@
+
 #include "mbed.h"
-
-#include "MMA8451Q.h"
- 
- MMA8451Q acc(PTE25, PTE24);
- PwmOut rled(LED_RED);
+PwmOut rled(LED_RED);
  PwmOut gled(LED_GREEN);
  PwmOut bled(LED_BLUE);
  int16_t dato[3];
  int16_t x = 0;
  int16_t y = 0;                           
  int16_t z = 0;
+#include "arturo.h"
+#include "mejia.h"
+#include "MMA8451Q.h"
+ 
+ MMA8451Q acc(PTE25, PTE24);
+ 
 
 int main() {
   while(1) {
@@ -18,46 +21,10 @@
           x = dato[0] * 0.03;
           y = dato[1] * 0.03;
           z = dato[2] * 0.03;
-
-     if(dato[0]<=-200){
-         rled=0;
-           wait(.2);
-           rled=1;
-         }else{
-           bled=1;
-           gled=0;
-              wait(.2);
-              gled=1;
-             }
-       
-       
-       if(dato[1]>=350){
-         bled=1;
-         rled=0;
-        
-           wait(.2);
-           
-           rled=1;
-         }else{
-           bled=1;
-           gled=0;
-          
-              wait(.2);
-              gled=1;
-             }
+      arturo_mensaje();
+      mejia_mensaje();
+     
      
-     if(dato[2]<=16200){
-         bled=1;
-         rled=0;
-        
-           wait(.2);
-           
-           rled=1;
-         }else{
-           bled=1;
-           gled=0;
-          
-              wait(.2);
-              gled=1;
-             }   }
+    
 }
+}
\ No newline at end of file