ARES / Mbed 2 deprecated Robot 2015

Robot's source code

Dependencies:   mbed

Diff: Map/Objectifs/Obj_clap.cpp

Revision:
117:f8c147141a0c
Parent:
109:53918ba98306
Child:
123:55e5e9acc541
diff -r c88c058ced64 -r f8c147141a0c Map/Objectifs/Obj_clap.cpp
--- a/Map/Objectifs/Obj_clap.cpp	Wed May 06 06:51:49 2015 +0000
+++ b/Map/Objectifs/Obj_clap.cpp	Wed May 06 11:22:17 2015 +0000
@@ -1,11 +1,8 @@
 #include "Obj_clap.h"
 
-#ifdef PLAN_A
-    Obj_clap::Obj_clap(float x, float y, float theta, Asserv<float> *asserv, AX12 *ax12_brasG, AX12 *ax12_brasD)
-#else
-    Obj_clap::Obj_clap(float x, float y, float theta, aserv_planB *asserv, AX12 *ax12_brasG, AX12 *ax12_brasD)
-#endif
-:Objectif(x,y,theta,asserv)
+
+Obj_clap::Obj_clap(float x, float y, float theta, AX12 *ax12_brasG, AX12 *ax12_brasD)
+:Objectif(x,y,theta)
 {
     this->ax12_brasG = ax12_brasG;
     this->ax12_brasD = ax12_brasD;