Jose Gutierrez Cabello / Mbed 2 deprecated ProjecteRobotFinal

Projecte final de Sistemes Encastats

Dependencies:   Hc05 RawSerialPc mbed-rtos mbed

Files at this revision

API Documentation at this revision

Revision 9:75a136453e21, committed 2016-01-19

Comitter:
jcabello7
Date:
Tue Jan 19 14:47:31 2016 +0000
Parent:
8:019cd6583613
Commit message:
- Canvi del port s?rie per un que funciona; - Afegides funcions ultrasons (Eva); - Afegit un fil que comprova continuament la dist?ncia dels objectes; - El robot no pot avan?ar si hi ha un obstacle en el seu cam?; - Incorporat el mode autom?tic de l'Eva

Changed in this revision

Hc05.lib Show annotated file Show diff for this revision Revisions of this file
main.cpp Show annotated file Show diff for this revision Revisions of this file
mbed-rtos.lib Show annotated file Show diff for this revision Revisions of this file
mbed.bld Show annotated file Show diff for this revision Revisions of this file 
diff -r 019cd6583613 -r 75a136453e21 Hc05.lib
--- a/Hc05.lib	Wed Dec 23 18:25:42 2015 +0000
+++ b/Hc05.lib	Tue Jan 19 14:47:31 2016 +0000
@@ -1,1 +1,1 @@
-https://developer.mbed.org/users/jcabello7/code/Hc05/#c594d33c7523
+https://developer.mbed.org/users/jcabello7/code/Hc05/#92151b9067e4

diff -r 019cd6583613 -r 75a136453e21 main.cpp
--- a/main.cpp	Wed Dec 23 18:25:42 2015 +0000
+++ b/main.cpp	Tue Jan 19 14:47:31 2016 +0000
@@ -4,7 +4,7 @@
 #include "RawSerialPc.h"
 
 //JOSEP
-RawSerialPc pc(USBTX, USBRX);    //Per provar si funciona, no cal al programa
+RawSerialPc pc(PC_10, PC_11);    //Port serie TX->PC_10 RX->PC_11
 Hc05 bt(D8, D2);        //Crea l'objecte bt, connectat als pins D8 (TX) i D2 (RX) (és la connexió sèrie BT)
 
 //EVA
@@ -205,7 +205,7 @@
     //char m[128];                        //Per visualitzar el mode i el timer, no es necessari
     while (true) {
         //pc.enviaString(bt.strLlegit);   //Per veure l'ultim string llegit, no es necessari
-        bt.calculaMotors(); //Calcula com s'han de moure els motors
+        bt.calculaMotors(S1, S2, S3); //Calcula com s'han de moure els motors
         //snprintf(m, 128, "Mode: %d | timer: %dms", bt.getMode(), bt.getTimer()); //Per visualitzar el mode i el timer, no es necessari
         //pc.enviaString(m);              //Per visualitzar el mode i el timer, no es necessari
         //pc.enviaString(bt.strPos);      //Per visualitzar la posicio on ha d'anar el robot, no es necessari

diff -r 019cd6583613 -r 75a136453e21 mbed-rtos.lib
--- a/mbed-rtos.lib	Wed Dec 23 18:25:42 2015 +0000
+++ b/mbed-rtos.lib	Tue Jan 19 14:47:31 2016 +0000
@@ -1,1 +1,1 @@
-http://developer.mbed.org/users/mbed_official/code/mbed-rtos/#c825593ece39
+http://developer.mbed.org/users/mbed_official/code/mbed-rtos/#3d9d2b8b8f17

diff -r 019cd6583613 -r 75a136453e21 mbed.bld
--- a/mbed.bld	Wed Dec 23 18:25:42 2015 +0000
+++ b/mbed.bld	Tue Jan 19 14:47:31 2016 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/users/mbed_official/code/mbed/builds/4336505e4b1c
\ No newline at end of file
+http://mbed.org/users/mbed_official/code/mbed/builds/6f327212ef96
\ No newline at end of file