Romain Ame
/
Timer71pt
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 62:80a81e4ad9f8, committed 2016-05-04
- Comitter:
- IceTeam
- Date:
- Wed May 04 23:38:38 2016 +0200
- Parent:
- 61:4a414820870f
- Child:
- 63:176d04975f06
- Commit message:
- Correction bug
Changed in this revision
| Map/Objectif/objectif.cpp | Show annotated file Show diff for this revision Revisions of this file |
| Map/Objectif/objectif.h | Show annotated file Show diff for this revision Revisions of this file |
--- a/Map/Objectif/objectif.cpp Wed May 04 23:37:16 2016 +0200
+++ b/Map/Objectif/objectif.cpp Wed May 04 23:38:38 2016 +0200
@@ -10,7 +10,8 @@
y_objectif = ny_obj;
thet_objectif = nthet_obj;
}
-bool Objectif::Action () {
+
+bool objectif::Action () {
switch(type) {
case OBJ_BLOC:
return obj_bloc_action();
@@ -23,10 +24,10 @@
}
}
-bool Objectif::obj_bloc_action () {
+bool objectif::obj_bloc_action () {
return true;
}
-bool Objectif::obj_para_action(); () {
+bool objectif::obj_para_action(); () {
return true;
}
\ No newline at end of file
--- a/Map/Objectif/objectif.h Wed May 04 23:37:16 2016 +0200
+++ b/Map/Objectif/objectif.h Wed May 04 23:38:38 2016 +0200
@@ -5,7 +5,7 @@
Inclu dans : map.h */
#include "../../AX12/AX12.h"
-#include "../../StepperMotor/Stepper.h"
+#include "../../ControlleurPince/ControlleurPince.h"
class objectif {
public:
@@ -18,7 +18,7 @@
private:
bool obj_bloc_action();
bool obj_para_action();
-
+
int type;
float x_objectif, y_objectif, thet_objectif;
AX12 * Parasol;