X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Fturnout.cpp;h=efa98bb5a7b5c49dd62800de0c878091fcda6747;hb=e6b7f8c4dd12199c3c5c0bec555fa73c87079729;hp=30793fcff5727a6aed56e9aa697b02a4bbff0823;hpb=540e931ec79129c8776f48434ff5b230b53337f1;p=r2c2.git

diff --git a/source/libmarklin/turnout.cpp b/source/libmarklin/turnout.cpp
index 30793fc..efa98bb 100644
--- a/source/libmarklin/turnout.cpp
+++ b/source/libmarklin/turnout.cpp
@@ -1,11 +1,10 @@
 /* $Id$
 
 This file is part of the MSP Märklin suite
-Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2009 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
-#include <iostream>
 #include <msp/time/timer.h>
 #include <msp/time/units.h>
 #include "command.h"
@@ -18,25 +17,33 @@ using namespace Msp;
 
 namespace Marklin {
 
-Turnout::Turnout(Control &c, unsigned a):
+Turnout::Turnout(Control &c, unsigned a, bool d):
 	control(c),
 	addr(a),
-	route(0)
+	route(0),
+	dual(d)
 {
 	control.add_turnout(*this);
 
 	control.signal_turnout_event.connect(sigc::mem_fun(this, &Turnout::turnout_event));
 
 	unsigned char data[2];
-	data[0]=addr&0xFF;
-	data[1]=(addr>>8)&0xFF;
-	control.command(CMD_TURNOUT_STATUS, data, 2).signal_done.connect(sigc::mem_fun(this, &Turnout::status_reply));
+	data[0] = addr&0xFF;
+	data[1] = (addr>>8)&0xFF;
+	control.command(CMD_TURNOUT_STATUS, data, 2).signal_done.connect(sigc::bind(sigc::mem_fun(this, &Turnout::status_reply), false));
+	if(dual)
+	{
+		data[0] = (addr+1)&0xFF;
+		data[1] = ((addr+1)>>8)&0xFF;
+		control.command(CMD_TURNOUT_STATUS, data, 2).signal_done.connect(sigc::bind(sigc::mem_fun(this, &Turnout::status_reply), true));
+	}
 }
 
 void Turnout::set_route(unsigned r)
 {
-	route=r;
+	signal_route_changing.emit(r);
 
+	route = r;
 	command(true);
 	control.set_timer(200*Time::msec).signal_timeout.connect(sigc::mem_fun(this, &Turnout::switch_timeout));
 
@@ -46,16 +53,24 @@ void Turnout::set_route(unsigned r)
 void Turnout::command(bool on)
 {
 	unsigned char data[2];
-	data[0]=addr&0xFF;
-	data[1]=((addr>>8)&0x7) | (on ? 0x40 : 0) | (route==0 ? 0x80 : 0);
+	data[0] = addr&0xFF;
+	data[1] = ((addr>>8)&0x7) | (on ? 0x40 : 0) | (route&1 ? 0 : 0x80);
 	control.command(CMD_TURNOUT, data, 2);
+	if(dual)
+	{
+		data[0] = (addr+1)&0xFF;
+		data[1] = (((addr+1)>>8)&0x7) | (on ? 0x40 : 0) | (route&2 ? 0 : 0x80);
+		control.command(CMD_TURNOUT, data, 2);
+	}
 }
 
-void Turnout::status_reply(const Reply &reply)
+void Turnout::status_reply(const Reply &reply, bool high)
 {
 	if(reply.get_error()==ERR_NO_ERROR)
 	{
-		route=(reply.get_data()[0]&0x04) ? 0 : 1;
+		bool v = !(reply.get_data()[0]&0x04);
+		unsigned b = (high?2:1);
+		route = (route&~b)|(v?b:0);
 		signal_route_changed.emit(route);
 	}
 }
@@ -69,9 +84,14 @@ bool Turnout::switch_timeout()
 
 void Turnout::turnout_event(unsigned a, bool r)
 {
-	if(a==addr && r!=route)
+	if(a==addr && r!=(route&1))
+	{
+		route = (route&2)|(r?1:0);
+		signal_route_changed.emit(route);
+	}
+	else if(dual && a==addr+1 && r!=((route>>1)&1))
 	{
-		route=r;
+		route = (route&1)|(r?2:0);
 		signal_route_changed.emit(route);
 	}
 }