Simulate a delay for switching turnouts in the Dummy driver

[r2c2.git] / source / libr2c2 / dummy.cpp

diff --git a/source/libr2c2/dummy.cpp b/source/libr2c2/dummy.cpp
index 99e4a5e3d189d952a1ad7a5978494fb350e17330..cb625dd6bf1f691650b72b8a820e394912f1bbea 100644 (file)
--- a/source/libr2c2/dummy.cpp
+++ b/source/libr2c2/dummy.cpp
@@ -1,12 +1,28 @@
+#include <msp/strings/utils.h>
+#include <msp/time/utils.h>
 #include "dummy.h"
 
 using namespace std;
+using namespace Msp;
 
 namespace R2C2 {
 
-Dummy::Dummy():
+Dummy::Dummy(const string &params):
        power(true)
-{ }
+{
+       vector<string> opts = split(params, ':');
+       for(vector<string>::const_iterator i=opts.begin(); i!=opts.end(); ++i)
+       {
+               string::size_type equals = i->find('=');
+               if(equals!=string::npos)
+               {
+                       string name = i->substr(0, equals);
+                       string value = i->substr(equals+1);
+                       if(name=="turnout_delay")
+                               turnout_delay = lexical_cast<unsigned>(value)*Time::msec;
+               }
+       }
+}
 
 void Dummy::set_power(bool p)
 {
@@ -33,19 +49,29 @@ void Dummy::add_turnout(unsigned addr, const TrackType &)
 
 void Dummy::set_turnout(unsigned addr, unsigned state)
 {
-       if(turnouts[addr]!=state)
+       TurnoutState &turnout = turnouts[addr];
+       if(turnout.state==state && turnout.pending==state)
+       {
+               signal_turnout.emit(addr, state);
+               return;
+       }
+
+       turnout.pending = state;
+       if(turnout_delay)
+               turnout.timeout = Time::now()+turnout_delay;
+       else
        {
-               turnouts[addr] = state;
+               turnout.state = state;
                signal_turnout.emit(addr, state);
        }
 }
 
 unsigned Dummy::get_turnout(unsigned addr) const
 {
-       map<unsigned, unsigned>::const_iterator i = turnouts.find(addr);
+       map<unsigned, TurnoutState>::const_iterator i = turnouts.find(addr);
        if(i!=turnouts.end())
-               return i->second;
-       return false;
+               return i->second.state;
+       return 0;
 }
 
 void Dummy::set_loco_speed(unsigned addr, unsigned speed)
@@ -84,4 +110,18 @@ bool Dummy::get_sensor(unsigned addr) const
        return false;
 }
 
+void Dummy::tick()
+{
+       Time::TimeStamp t = Time::now();
+       for(map<unsigned, TurnoutState>::iterator i=turnouts.begin(); i!=turnouts.end(); ++i)
+       {
+               if(i->second.timeout && t>=i->second.timeout)
+               {
+                       i->second.state = i->second.pending;
+                       i->second.timeout = Time::TimeStamp();
+                       signal_turnout.emit(i->first, i->second.state);
+               }
+       }
+}
+
 } // namespace R2C2