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:
- 60:8d2320a54a32
- Parent:
- 57:86f491f5b25d
- Child:
- 62:80a81e4ad9f8
--- a/Map/Objectif/objectif.h Wed May 04 21:04:50 2016 +0200
+++ b/Map/Objectif/objectif.h Wed May 04 23:35:03 2016 +0200
@@ -9,19 +9,19 @@
class objectif {
public:
- objectif (int type, float x_obj, float y_obj, float thet_obj, AX12 * nA1, AX12 * nA2, AX12 * nA3, Stepper * nS1, Stepper * nS2);
+ objectif (int ntype, float nx_obj, float ny_obj, float nthet_obj, AX12 * np, ControlleurPince npince);
bool Action ();
float getX() { return x_objectif; }
float getY() { return y_objectif; }
- float getThet() { return thet_object; }
+ float getThet() { return thet_objectif; }
private:
bool obj_bloc_action();
-
+ bool obj_para_action();
+
int type;
- float x_objectif, y_objectif, thet_object;
- AX12 * A1, * A2, * A3;
- Stepper * S1, * S2;
-};
+ float x_objectif, y_objectif, thet_objectif;
+ AX12 * Parasol;
+ ControlleurPince pince;
#endif
\ No newline at end of file