Diff: Map/Objectif/objectif.cpp

Revision:

75:195dd2bb13a3

Parent:

70:d70a6db1f635

Child:

76:a862cb10559c

--- a/Map/Objectif/objectif.cpp	Thu May 05 05:49:41 2016 +0200
+++ b/Map/Objectif/objectif.cpp	Thu May 05 04:36:59 2016 +0000
@@ -15,14 +15,14 @@
 
 bool objectif::Action () {
 	switch(type) {
-		case OBJ_BLOC:
+		case OBJ_BLOC_PRISE:
 			return obj_bloc_action();
-			break;
+		case OBJ_BLOC_LACHE:
+			return obj_para_lache_action();
 		case OBJ_PARA:
 			return obj_para_action();
-			break;
 		default:
-			break;
+			return true;
 	}
 
 	if (marche_arriere != 0) {
@@ -31,11 +31,16 @@
 }
 
 bool objectif::obj_bloc_action () {
-	/* Range : 0 -> 100 (mm). pince.home remet à 0 */
-	pince->home();
-	pince->setPos(30,0,0);
+	front_Sharp_activated = false;
+	return true;
 }
 
 bool objectif::obj_para_action() {
 	return true;
+}
+
+bool objectif::obj_para_lache_action() {
+	Codo->GotoDist(-80);
+	front_Sharp_activated = true;
+	return true;
 }
\ No newline at end of file