/* $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
*/
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);
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));
+ 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)
{
unsigned char data[2];
data[0]=addr&0xFF;
- data[1]=((addr>>8)&0x7) | (on ? 0x40 : 0) | (route==0 ? 0x80 : 0);
+ 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);
}
}
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);
}
}