X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Farducontrol.cpp;h=fa95a6936be746bd6e2d4ee4ff3244986a5d4574;hb=5bc94d60a17039dfd5d46caaa292d3667fa87fb3;hp=dbe3013ddd9e5f057d1733e65f2340bc6ecb35c4;hpb=f7238194310b77f21385286150295b284127b887;p=r2c2.git

diff --git a/source/libr2c2/arducontrol.cpp b/source/libr2c2/arducontrol.cpp
index dbe3013..fa95a69 100644
--- a/source/libr2c2/arducontrol.cpp
+++ b/source/libr2c2/arducontrol.cpp
@@ -405,6 +405,8 @@ void ArduControl::tick()
 			acc.state.set(acc.state^lowest_bit);
 			PendingCommand cmd(acc, Accessory::ACTIVATE, i);
 			command_queue.push(cmd);
+
+			monitor.reset_peak();
 		}
 		else
 			accessory_queue.pop_front();
@@ -415,8 +417,23 @@ void ArduControl::tick()
 		Time::TimeStamp t = Time::now();
 		if(t>off_timeout)
 		{
+			Accessory &acc = *active_accessory;
+
+			if(acc.kind==Accessory::TURNOUT && monitor.get_peak()<0.5f)
+			{
+				unsigned bit = 1<<active_index;
+				if(acc.uncertain&bit)
+					acc.uncertain &= ~bit;
+				else
+				{
+					signal_turnout_failed.emit(acc.address);
+					acc.state.rollback();
+					acc.target ^= bit;
+				}
+			}
+
 			off_timeout = Time::TimeStamp();
-			PendingCommand cmd(*active_accessory, Accessory::DEACTIVATE, active_index);
+			PendingCommand cmd(acc, Accessory::DEACTIVATE, active_index);
 			command_queue.push(cmd);
 		}
 	}
@@ -526,6 +543,8 @@ ArduControl::Accessory::Accessory(Kind k, unsigned a, unsigned b):
 	address(a),
 	bits(b),
 	state(0),
+	uncertain((1<<bits)-1),
+	target(0),
 	active_time(500*Time::msec)
 { }