summaryrefslogtreecommitdiff
path: root/i/chuck/src/motor
diff options
context:
space:
mode:
authorbecquet2007-05-16 07:28:35 +0000
committerbecquet2007-05-16 07:28:35 +0000
commit3f7c1141e46c38c6697c4c349d611217d984dc9b (patch)
tree01278b5a44e430cb8b3a56875d8ec23089d52af6 /i/chuck/src/motor
parent0652c9a30a33b3b07f1852e23b9d2e41f3638c99 (diff)
mise a jour avant d├ępart
Diffstat (limited to 'i/chuck/src/motor')
-rw-r--r--i/chuck/src/motor/motor.cc14
-rw-r--r--i/chuck/src/motor/motor.hh2
-rw-r--r--i/chuck/src/motor/test_motor.cc1
3 files changed, 1 insertions, 16 deletions
diff --git a/i/chuck/src/motor/motor.cc b/i/chuck/src/motor/motor.cc
index 1572845..c79d9a9 100644
--- a/i/chuck/src/motor/motor.cc
+++ b/i/chuck/src/motor/motor.cc
@@ -141,19 +141,7 @@ Motor::receiveAck (int seq)
}
}
}
-/// The Best Evite Program ;p
-void
-Motor::avoidrobot(void)
-{
- rotate(3.14116/2);//faire calcul ailleur
- move(100,0);
- rotate(3.14116/2*(-1));//voir plus haut
- move(300,0);
- rotate(3.14116/2*(-1));
- move(100,0);
- rotate(3.14116/2);
- move(300,0);
-}
+
void
Motor::receiveCounterStat (int l, int r)
diff --git a/i/chuck/src/motor/motor.hh b/i/chuck/src/motor/motor.hh
index 2534c21..548c7bd 100644
--- a/i/chuck/src/motor/motor.hh
+++ b/i/chuck/src/motor/motor.hh
@@ -69,8 +69,6 @@ class Motor : public Asserv::Receiver
void reset (void);
/// get the position of robal
void getPosition(double & x, double & y, double & a) const;
- ///Avoid un truk
- void avoidrobot(void);
private:
/// Next seq number.
inline void nextSeq (void);
diff --git a/i/chuck/src/motor/test_motor.cc b/i/chuck/src/motor/test_motor.cc
index 1cb5e28..760dfd6 100644
--- a/i/chuck/src/motor/test_motor.cc
+++ b/i/chuck/src/motor/test_motor.cc
@@ -62,7 +62,6 @@ class TestMotor : public Tester
void preRun (void)
{
Interpreter &i = getInterpreter ();
- i.add ("avoid",Interpreter::memFunc(motor_,&Motor::avoidrobot),"j evite un super robot");
i.add ("wait", Interpreter::memFunc (*this, &TestMotor::wait),
"wait MS\nwait for a delay in millisecond");
i.add ("move", Interpreter::memFunc (motor_, &Motor::move),