Edgar Ochoa
/
ProyectoNivel
Important changes to repositories hosted on mbed.com
Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.
To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.
It is also possible to export all your personal repositories from the account settings page.
Revision 7:c6894362b51d, committed 2016-02-10
- Comitter:
- vikglz
- Date:
- Wed Feb 10 19:09:23 2016 +0000
- Parent:
- 6:7544bfc8d3d4
- Parent:
- 5:8fcc1b94a287
- Child:
- 8:65d3551067f3
- Child:
- 13:7c2f780db459
- Commit message:
- Final;
Changed in this revision
| main.cpp | Show annotated file Show diff for this revision Revisions of this file |
| main.cpp.orig | Show annotated file Show diff for this revision Revisions of this file |
--- a/main.cpp Wed Feb 10 18:58:16 2016 +0000 +++ b/main.cpp Wed Feb 10 19:09:23 2016 +0000 @@ -36,4 +36,6 @@ //pues no he cambiado nada pero hay vamos jaja //ya llegué mundo, atte:erik -//este es un cambio \ No newline at end of file +<<<<<<< local +//este es un cambio ======= +//sigo cambiando el programa ;)>>>>>>> other
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/main.cpp.orig Wed Feb 10 19:09:23 2016 +0000
@@ -0,0 +1,39 @@
+#include "mbed.h"
+#include "MMA8451Q.h"
+MMA8451Q acc(PTE25, PTE24);
+PwmOut r(LED_RED);
+PwmOut g(LED_GREEN);
+PwmOut b(LED_BLUE);
+
+Serial pc(USBTX,USBRX);
+int16_t data[3];
+int main() {
+
+ pc.baud(9600); //velocidad serial//
+ pc.format(8,SerialBase::None ,1) ;
+ pc.putc(65);
+
+ while(1) {
+
+ acc.getAccAllAxis(data);
+
+ r = 1.0 - abs(data[0]/16500.0);
+ g = 1.0 - abs(data[1]/16500.0);
+ b = 1.0 - abs(data[2]/16500.0);
+
+
+ pc.printf("%d,%d,%d,\n",data[0],data[1],data[2]);
+
+ wait(0.4);
+
+ }
+
+ }
+
+
+//Hola Mundo!!! jajajaja
+//otro cambio
+//pues no he cambiado nada pero hay vamos jaja
+//ya llegué mundo, atte:erik
+
+//este es un cambio
\ No newline at end of file
