From 3f7c1141e46c38c6697c4c349d611217d984dc9b Mon Sep 17 00:00:00 2001 From: becquet Date: Wed, 16 May 2007 07:28:35 +0000 Subject: mise a jour avant départ --- i/chuck/src/motor/motor.cc | 14 +------------- i/chuck/src/motor/motor.hh | 2 -- i/chuck/src/motor/test_motor.cc | 1 - 3 files changed, 1 insertion(+), 16 deletions(-) (limited to 'i/chuck/src/motor') 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), -- cgit v1.2.3