X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Fsimplecontroller.h;h=9b0df261f3495b6f46442e28c963b462fff71734;hb=975ea87cc7be179618b06291cb2506a2523cad1f;hp=c86d537fe36083254306179aace90e9f0189315e;hpb=2571c111ec85b0d6a56ae369c83b5763b1975f93;p=r2c2.git diff --git a/source/libmarklin/simplecontroller.h b/source/libmarklin/simplecontroller.h index c86d537..9b0df26 100644 --- a/source/libmarklin/simplecontroller.h +++ b/source/libmarklin/simplecontroller.h @@ -10,15 +10,14 @@ Distributed under the GPL #include #include "controller.h" -#include "traincontrol.h" namespace Marklin { class SimpleController: public Controller { private: - TrainControl target_speed; - TrainControl reverse; + Control target_speed; + Control reverse; float accel; float speed; @@ -26,7 +25,7 @@ public: SimpleController(); virtual void set_control(const std::string &, float); - virtual const TrainControl &get_control(const std::string &) const; + virtual const Control &get_control(const std::string &) const; virtual float get_speed() const { return speed; } virtual bool get_reverse() const { return reverse.value; }