X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fdummy.cpp;h=0c3c351d968d01b23a79597aa4e725791dea5d62;hb=b3cc0d29a0fda2d48443d66881214c81a04b1729;hp=9c78234f644b7fe3a897fbfeb11cfa9b49a07b1f;hpb=247742fbc1c27bfc9fdef4630afcdc2408cdd550;p=r2c2.git

diff --git a/source/libr2c2/dummy.cpp b/source/libr2c2/dummy.cpp
index 9c78234..0c3c351 100644
--- a/source/libr2c2/dummy.cpp
+++ b/source/libr2c2/dummy.cpp
@@ -1,18 +1,17 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
+#include <cstdlib>
+#include <msp/strings/utils.h>
+#include <msp/time/utils.h>
 #include "dummy.h"
 
 using namespace std;
+using namespace Msp;
 
 namespace R2C2 {
 
-Dummy::Dummy():
-	power(true)
+Dummy::Dummy(const Options &opts):
+	power(true),
+	turnout_delay(opts.get("turnout_delay", 0.0f)*Time::sec),
+	turnout_fail_rate(opts.get("turnout_fail_rate", 0.0f)*RAND_MAX)
 { }
 
 void Dummy::set_power(bool p)
@@ -21,6 +20,18 @@ void Dummy::set_power(bool p)
 	signal_power.emit(power);
 }
 
+void Dummy::halt(bool h)
+{
+	halted = h;
+	if(halted)
+	{
+		for(map<unsigned, LocoState>::iterator i=locos.begin(); i!=locos.end(); ++i)
+			if(i->second.speed)
+				set_loco_speed(i->first, 0);
+	}
+	signal_halt.emit(halted);
+}
+
 const char *Dummy::enumerate_protocols(unsigned i) const
 {
 	if(i==0)
@@ -33,30 +44,45 @@ unsigned Dummy::get_protocol_speed_steps(const string &) const
 	return 0;
 }
 
-void Dummy::add_turnout(unsigned addr, const TrackType &)
+unsigned Dummy::add_turnout(unsigned addr, const TrackType &)
 {
 	turnouts[addr];
+	return addr;
 }
 
 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;
+		if(!turnout_fail_rate || rand()>=turnout_fail_rate)
+			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)
 {
+	if(speed && halted)
+		return;
+
 	LocoState &loco = locos[addr];
 	loco.speed = speed;
 	signal_loco_speed.emit(addr, speed, loco.reverse);
@@ -91,4 +117,23 @@ 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)
+		{
+			if(turnout_fail_rate && rand()<turnout_fail_rate)
+			{
+				signal_turnout_failed.emit(i->first);
+				i->second.pending = i->second.state;
+			}
+			i->second.state = i->second.pending;
+			i->second.timeout = Time::TimeStamp();
+			signal_turnout.emit(i->first, i->second.state);
+		}
+	}
+}
+
 } // namespace R2C2