summaryrefslogtreecommitdiff
path: root/2005/i/robert/src/motor/motor.cc
diff options
context:
space:
mode:
authorhaller2005-04-28 22:31:07 +0000
committerhaller2005-04-28 22:31:07 +0000
commit236cf50a11672fd15ba62f2eca2e9368d2681c1e (patch)
tree7e1793180fdf4cf7e8d44ef3b1974014099f31d3 /2005/i/robert/src/motor/motor.cc
parent10e9b5ada8232d3ec6320953ad9b6f42bead79ed (diff)
Création de test_motor pour tester la classe motor
Quelques petites modifications Modification du Makefile.defs pour ajouter les objets necessaires
Diffstat (limited to '2005/i/robert/src/motor/motor.cc')
-rw-r--r--2005/i/robert/src/motor/motor.cc11
1 files changed, 5 insertions, 6 deletions
diff --git a/2005/i/robert/src/motor/motor.cc b/2005/i/robert/src/motor/motor.cc
index 896c7f4..0bc7525 100644
--- a/2005/i/robert/src/motor/motor.cc
+++ b/2005/i/robert/src/motor/motor.cc
@@ -79,12 +79,6 @@ void Motor::recalage(void)
// XXX je ne vois pas là
}
-void Motor::setSpeed(double v)
-{
- asserv_.setSpeed(v,v); /// XXX sur ca?
- idle_ = false;
-}
-
bool Motor::idle(void)
{
return idle_;
@@ -107,6 +101,11 @@ bool Motor::sync(void)
return asserv_.sync();
}
+void Motor::wait(int timeout)
+{
+ asserv_.wait(timeout);
+}
+
void Motor::receiveCounter (double lMotor, double rMotor)
{
}