Romain Ame
/
Stressed
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.
Fork of
Robot2016_2-0
by 
ARES
Diff: Map/Objectif/objectif.cpp
- Revision:
- 66:47353c8122de
- Parent:
- 64:24e1057a97f7
- Child:
- 70:d70a6db1f635
--- a/Map/Objectif/objectif.cpp Thu May 05 01:52:34 2016 +0200
+++ b/Map/Objectif/objectif.cpp Wed May 04 23:58:34 2016 +0000
@@ -2,15 +2,15 @@
/* Dernier Changement : Romain 0h20 */
-objectif::objectif (int ntype, float nx_obj, float ny_obj, float nthet_obj, Odometry * nCodo, AX12 * np, ControlleurPince * npince) {
+objectif::objectif (int ntype, float nx_obj, float ny_obj, float nthet_obj, Odometry * nCodo, AX12 * np, ControlleurPince * npince, float arr) {
Parasol = np;
pince = npince;
type = ntype;
x_objectif = nx_obj;
y_objectif = ny_obj;
thet_objectif = nthet_obj;
- Codo = nCode;
- marche_arrière = arr;
+ Codo = nCodo;
+ marche_arriere = arr;
}
bool objectif::Action () {
@@ -25,15 +25,15 @@
break;
}
- if (marche_arrière != 0) {
- odo->GotoDist(-marche_arrière);
+ if (marche_arriere != 0) {
+ Codo->GotoDist(-marche_arriere);
}
}
bool objectif::obj_bloc_action () {
/* Range : 0 -> 10 (cm). pince.home remet à 0 */
- pince.home();
- pince.setPos(3);
+ pince->home();
+ pince->setPos(3,0,0);
}
bool objectif::obj_para_action() {