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.h
- Revision:
- 64:24e1057a97f7
- Parent:
- 63:176d04975f06
- Child:
- 75:195dd2bb13a3
diff -r 176d04975f06 -r 24e1057a97f7 Map/Objectif/objectif.h
--- a/Map/Objectif/objectif.h Wed May 04 21:51:00 2016 +0000
+++ b/Map/Objectif/objectif.h Thu May 05 01:30:14 2016 +0200
@@ -1,16 +1,17 @@
#ifndef OBJECTIF_H
#define OBJECTIF_H
-/* Dernier Changement : Romain 20h20
+/* Dernier Changement : Romain 0h20
Inclu dans : map.h */
#include "objectif_type.h"
#include "../../AX12/AX12.h"
+#include "../../Odometry/Odometry.h"
#include "../../ControlleurPince/ControlleurPince.h"
class objectif {
public:
- objectif (int ntype, float nx_obj, float ny_obj, float nthet_obj, AX12 * np, ControlleurPince * npince);
+ objectif (int ntype, float nx_obj, float ny_obj, float nthet_obj, Odometry * nCodo, AX12 * np, ControlleurPince * npince, float arr = 0);
bool Action ();
float getX() { return x_objectif; }
float getY() { return y_objectif; }
@@ -22,8 +23,10 @@
int type;
float x_objectif, y_objectif, thet_objectif;
+ float marche_arriere;
AX12 * Parasol;
ControlleurPince * pince;
+ Odometry * Codo;
};
#endif
\ No newline at end of file