X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Fturnout.cpp;h=3e6e10dcc69f0d37c3148b3abf7506c3fadb6f35;hb=7839b7c3d782abb5c98a24d51cae109407068c02;hp=a6e3f2d171739734e3a412cfb6ac9ec4436689a3;hpb=52cbe8d99669f843f8f75c51128e2748584dd03a;p=r2c2.git

diff --git a/source/libmarklin/turnout.cpp b/source/libmarklin/turnout.cpp
index a6e3f2d..3e6e10d 100644
--- a/source/libmarklin/turnout.cpp
+++ b/source/libmarklin/turnout.cpp
@@ -1,8 +1,15 @@
-#include <iostream>
+/* $Id$
+
+This file is part of the MSP Märklin suite
+Copyright © 2006-2009 Mikkosoft Productions, Mikko Rasa
+Distributed under the GPL
+*/
+
 #include <msp/time/timer.h>
 #include <msp/time/units.h>
 #include "command.h"
 #include "control.h"
+#include "reply.h"
 #include "turnout.h"
 
 using namespace std;
@@ -10,26 +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));
 
-	char cmd[3];
-	cmd[0]=CMD_TURNOUT_STATUS;
-	cmd[1]=addr&0xFF;
-	cmd[2]=(addr>>8)&0xFF;
-	control.command(string(cmd,3)).signal_done.connect(sigc::mem_fun(this, &Turnout::status_reply));
+	unsigned char data[2];
+	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));
 
@@ -38,22 +52,25 @@ void Turnout::set_route(unsigned r)
 
 void Turnout::command(bool on)
 {
-	char cmd[3];
-	cmd[0]=CMD_TURNOUT;
-	cmd[1]=addr&0xFF;
-	cmd[2]=((addr>>8)&0x7);
-	if(on)
-		cmd[2]|=0x40;
-	if(route==0)
-		cmd[2]|=0x80;
-	control.command(string(cmd,3));
+	unsigned char data[2];
+	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(Error err, const string &reply)
+void Turnout::status_reply(const Reply &reply, bool high)
 {
-	if(err==ERR_NO_ERROR)
+	if(reply.get_error()==ERR_NO_ERROR)
 	{
-		route=(reply[0]&4)?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);
 	}
 }
@@ -67,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);
 	}
 }