Allow setting sensor ID for multiple tracks at once

[r2c2.git] / source / libmarklin / turnout.cpp

diff --git a/source/libmarklin/turnout.cpp b/source/libmarklin/turnout.cpp
index ace7976ed6aa808adf72dc053fc5ff49739029de..63687cf9af1bb2a29960aeb53a486cc929d1d4c4 100644 (file)
--- a/source/libmarklin/turnout.cpp
+++ b/source/libmarklin/turnout.cpp
@@ -1,7 +1,7 @@
 /* $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
 */
 
@@ -10,6 +10,7 @@ Distributed under the GPL
 #include <msp/time/units.h>
 #include "command.h"
 #include "control.h"
+#include "reply.h"
 #include "turnout.h"
 
 using namespace std;
@@ -17,20 +18,26 @@ 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)
@@ -45,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);
        }
 }
@@ -74,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);
        }
 }