Proyecto Nivel, Edgar Ochoa, Erik Garcia

Dependencies:   MMA8451Q mbed

Revision:
27:85d44b207258
Parent:
26:e10b8fb4e2ae
Child:
33:387a18af3fb4
diff -r e10b8fb4e2ae -r 85d44b207258 main.cpp
--- a/main.cpp	Fri Feb 12 14:43:46 2016 +0000
+++ b/main.cpp	Fri Feb 12 14:46:54 2016 +0000
@@ -1,16 +1,20 @@
 #include "adcBasic.h"
-#include "mbed.h"
-#include "MMA8451Q.h"
-MMA8451Q acc(PTE25, PTE24);
+
+int16_t data[3];
 PwmOut r(LED_RED);
 PwmOut g(LED_GREEN);
 PwmOut b(LED_BLUE);
 Serial pc(USBTX,USBRX);
 float x,y,z;
+#include "Ochoa.h"
+#include "versionerik.h"
+#include "mbed.h"
+#include "MMA8451Q.h"
+MMA8451Q acc(PTE25, PTE24);
 
 
 
-int16_t data[3];
+
 int main() {
     
     pc.baud(9600); //velocidad serial//