X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Flibmarklin%2Fturnout.cpp;h=d5f96179be74de4dc71f49129340f9f9bb05a06d;hb=6dc18b0e518407bd2a86602bae1e9bbae05da7c8;hp=60bab121042bf1f8b8c46aaebe36b6245cab7edf;hpb=3df8cb5c78fbb0b919bcb79677c6c788b8028482;p=r2c2.git

diff --git a/source/libmarklin/turnout.cpp b/source/libmarklin/turnout.cpp
index 60bab12..d5f9617 100644
--- a/source/libmarklin/turnout.cpp
+++ b/source/libmarklin/turnout.cpp
@@ -20,7 +20,7 @@ namespace Marklin {
 Turnout::Turnout(Control &c, unsigned a, bool d):
 	control(c),
 	addr(a),
-	route(0),
+	path(0),
 	dual(d)
 {
 	control.add_turnout(*this);
@@ -28,37 +28,38 @@ Turnout::Turnout(Control &c, unsigned a, bool d):
 	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;
+	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;
+		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)
+void Turnout::set_path(unsigned p)
 {
-	route=r;
+	signal_path_changing.emit(p);
 
+	path = p;
 	command(true);
 	control.set_timer(200*Time::msec).signal_timeout.connect(sigc::mem_fun(this, &Turnout::switch_timeout));
 
-	signal_route_changed.emit(route);
+	signal_path_changed.emit(path);
 }
 
 void Turnout::command(bool on)
 {
 	unsigned char data[2];
-	data[0]=addr&0xFF;
-	data[1]=((addr>>8)&0x7) | (on ? 0x40 : 0) | (route&1 ? 0 : 0x80);
+	data[0] = addr&0xFF;
+	data[1] = ((addr>>8)&0x7) | (on ? 0x40 : 0) | (path&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);
+		data[0] = (addr+1)&0xFF;
+		data[1] = (((addr+1)>>8)&0x7) | (on ? 0x40 : 0) | (path&2 ? 0 : 0x80);
 		control.command(CMD_TURNOUT, data, 2);
 	}
 }
@@ -67,10 +68,10 @@ void Turnout::status_reply(const Reply &reply, bool high)
 {
 	if(reply.get_error()==ERR_NO_ERROR)
 	{
-		bool v=!(reply.get_data()[0]&0x04);
-		unsigned b=(high?2:1);
-		route=(route&~b)|(v?b:0);
-		signal_route_changed.emit(route);
+		bool v = !(reply.get_data()[0]&0x04);
+		unsigned b = (high?2:1);
+		path = (path&~b)|(v?b:0);
+		signal_path_changed.emit(path);
 	}
 }
 
@@ -81,17 +82,17 @@ bool Turnout::switch_timeout()
 	return false;
 }
 
-void Turnout::turnout_event(unsigned a, bool r)
+void Turnout::turnout_event(unsigned a, bool p)
 {
-	if(a==addr && r!=(route&1))
+	if(a==addr && p!=(path&1))
 	{
-		route=(route&2)|(r?1:0);
-		signal_route_changed.emit(route);
+		path = (path&2)|(p?1:0);
+		signal_path_changed.emit(path);
 	}
-	else if(dual && a==addr+1 && r!=((route>>1)&1))
+	else if(dual && a==addr+1 && p!=((path>>1)&1))
 	{
-		route=(route&1)|(r?2:0);
-		signal_route_changed.emit(route);
+		path = (path&1)|(p?2:0);
+		signal_path_changed.emit(path);
 	}
 }