Implement halt mode to ArduControl

diff --git a/source/libr2c2/arducontrol.cpp b/source/libr2c2/arducontrol.cpp
index fa95a6936be746bd6e2d4ee4ff3244986a5d4574..4b89efac1ac57bb013548727fe71ec191c68f6ae 100644 (file)
--- a/source/libr2c2/arducontrol.cpp
+++ b/source/libr2c2/arducontrol.cpp
@@ -23,6 +23,7 @@ ArduControl::ArduControl(const Options &opts):
        debug(opts.get<unsigned>("debug")),
        state_file("arducontrol.state"),
        power(false),
+       halted(false),
        active_accessory(0),
        s88(*this),
        mfx_search(*this),
@@ -67,8 +68,19 @@ void ArduControl::set_power(bool p)
        }
 }
 
-void ArduControl::halt(bool)
+void ArduControl::halt(bool h)
 {
+       if(h==halted)
+               return;
+
+       halted = h;
+       if(halted)
+       {
+               for(LocomotiveMap::const_iterator i=locomotives.begin(); i!=locomotives.end(); ++i)
+                       set_loco_speed(i->first, 0);
+       }
+
+       signal_halt.emit(halted);
 }
 
 const char *ArduControl::enumerate_protocols(unsigned i) const
@@ -146,6 +158,9 @@ void ArduControl::set_loco_speed(unsigned id, unsigned speed)
        if(speed>protocol_info[loco.proto].max_speed)
                throw invalid_argument("ArduControl::set_loco_speed");
 
+       if(speed && halted)
+               return;
+
        if(loco.speed.set(speed))
        {
                PendingCommand cmd(loco, Locomotive::SPEED);

diff --git a/source/libr2c2/arducontrol.h b/source/libr2c2/arducontrol.h
index c3ca7a4106f570a418a6a7166a19a9048c1bcf67..8560a13b969d21257c7e8dfab3aa611113d16682 100644 (file)
--- a/source/libr2c2/arducontrol.h
+++ b/source/libr2c2/arducontrol.h
@@ -371,6 +371,7 @@ private:
        Msp::FS::Path state_file;
 
        ControlledVariable<bool> power;
+       bool halted;
 
        LocomotiveMap locomotives;
        MfxInfoArray mfx_info;
@@ -401,7 +402,7 @@ public:
        virtual void set_power(bool);
        virtual bool get_power() const { return power; }
        virtual void halt(bool);
-       virtual bool is_halted() const { return false; }
+       virtual bool is_halted() const { return halted; }
 
        virtual const char *enumerate_protocols(unsigned) const;
 private: