X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Fsimplecontroller.cpp;h=574418826151b26809a39c8d53845b0b8148bb31;hb=182ee232f01d5bb25ddc4cf6e00249698871412f;hp=01d041126d1491e517bc3ded3f1920fb0f259b95;hpb=2571c111ec85b0d6a56ae369c83b5763b1975f93;p=r2c2.git diff --git a/source/libmarklin/simplecontroller.cpp b/source/libmarklin/simplecontroller.cpp index 01d0411..5744188 100644 --- a/source/libmarklin/simplecontroller.cpp +++ b/source/libmarklin/simplecontroller.cpp @@ -15,8 +15,8 @@ using namespace Msp; namespace Marklin { SimpleController::SimpleController(): - target_speed(TrainControl::continuous("speed", 0, 1000)), - reverse(TrainControl::binary("reverse")), + target_speed(Control::continuous("speed", 0, 1000)), + reverse(Control::binary("reverse")), accel(0.07), speed(0) { @@ -39,7 +39,7 @@ void SimpleController::set_control(const string &name, float v) } } -const TrainControl &SimpleController::get_control(const string &name) const +const Controller::Control &SimpleController::get_control(const string &name) const { if(name=="speed") return target_speed;