X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fintellibox.cpp;h=4c8f2ac783b1e6fbf73bdff9aa73d2f2b1a73e2c;hb=74f8c3beba5a6947a523119e3f26cf745725b511;hp=82623e1760891a4b4e0e9d55a3094eddb5bc1f5e;hpb=621c5c938d70ba0d155e0eda91a708db0a52c0dc;p=r2c2.git

diff --git a/source/libr2c2/intellibox.cpp b/source/libr2c2/intellibox.cpp
index 82623e1..4c8f2ac 100644
--- a/source/libr2c2/intellibox.cpp
+++ b/source/libr2c2/intellibox.cpp
@@ -13,8 +13,8 @@ using namespace Msp;
 
 namespace R2C2 {
 
-Intellibox::Intellibox(const string &dev):
-	serial(dev),
+Intellibox::Intellibox(const Options &opts):
+	serial(opts.get<string>(string(), "ttyUSB0")),
 	power(false),
 	halted(false),
 	update_sensors(false),
@@ -93,7 +93,7 @@ unsigned Intellibox::get_protocol_speed_steps(const string &proto_name) const
 	return 0;
 }
 
-void Intellibox::add_loco(unsigned addr, const string &proto_name, const VehicleType &type)
+unsigned Intellibox::add_loco(unsigned addr, const string &proto_name, const VehicleType &type)
 {
 	Protocol proto = map_protocol(proto_name);
 
@@ -112,6 +112,13 @@ void Intellibox::add_loco(unsigned addr, const string &proto_name, const Vehicle
 		data[1] = (addr>>8)&0xFF;
 		command(CMD_LOK_STATUS, addr, data, 2);
 	}
+
+	return addr;
+}
+
+void Intellibox::remove_loco(unsigned addr)
+{
+	locos.erase(addr);
 }
 
 void Intellibox::set_loco_speed(unsigned addr, unsigned speed)
@@ -192,12 +199,23 @@ void Intellibox::set_loco_function(unsigned addr, unsigned func, bool state)
 	signal_loco_function.emit(addr, func, state);
 }
 
-void Intellibox::add_turnout(unsigned addr, const TrackType &type)
+unsigned Intellibox::add_turnout(unsigned addr, const TrackType &type)
+{
+	return add_turnout(addr, type.get_state_bits(), false);
+}
+
+void Intellibox::remove_turnout(unsigned addr)
+{
+	turnouts.erase(addr);
+}
+
+unsigned Intellibox::add_turnout(unsigned addr, unsigned bits, bool signal)
 {
 	if(!turnouts.count(addr))
 	{
 		Turnout &turnout = turnouts[addr];
-		turnout.bits = type.get_state_bits();
+		turnout.bits = bits;
+		turnout.signal = signal;
 
 		unsigned char data[2];
 		data[0] = addr&0xFF;
@@ -213,6 +231,16 @@ void Intellibox::add_turnout(unsigned addr, const TrackType &type)
 			command(CMD_TURNOUT_STATUS, addr+i, data, 2);
 		}
 	}
+
+	return addr;
+}
+
+void Intellibox::turnout_state_changed(unsigned addr, const Turnout &turnout) const
+{
+	if(turnout.signal)
+		signal_signal.emit(addr, turnout.state);
+	else
+		signal_turnout.emit(addr, turnout.state);
 }
 
 void Intellibox::set_turnout(unsigned addr, unsigned state)
@@ -223,7 +251,7 @@ void Intellibox::set_turnout(unsigned addr, unsigned state)
 	{
 		turnout.state = state;
 		turnout.pending = state;
-		signal_turnout.emit(addr, state);
+		turnout_state_changed(addr, turnout);
 		return;
 	}
 
@@ -245,13 +273,41 @@ unsigned Intellibox::get_turnout(unsigned addr) const
 	return 0;
 }
 
-void Intellibox::add_sensor(unsigned addr)
+unsigned Intellibox::add_signal(unsigned addr, const SignalType &)
+{
+	return add_turnout(addr, 1, true);
+}
+
+void Intellibox::remove_signal(unsigned addr)
+{
+	remove_turnout(addr);
+}
+
+void Intellibox::set_signal(unsigned addr, unsigned state)
+{
+	set_turnout(addr, state);
+}
+
+unsigned Intellibox::get_signal(unsigned addr) const
+{
+	return get_turnout(addr);
+}
+
+unsigned Intellibox::add_sensor(unsigned addr)
 {
 	if(!sensors.count(addr))
 	{
 		sensors[addr];
 		update_sensors = true;
 	}
+
+	return addr;
+}
+
+void Intellibox::remove_sensor(unsigned addr)
+{
+	sensors.erase(addr);
+	update_sensors = true;
 }
 
 bool Intellibox::get_sensor(unsigned addr) const
@@ -472,7 +528,7 @@ void Intellibox::process_reply(const Time::TimeStamp &t)
 			unsigned bit = !(data[1]&0x80);
 			turnout.state = (turnout.state&~mask) | (bit*mask);
 			turnout.pending = turnout.state;
-			signal_turnout.emit(addr, turnout.state);
+			turnout_state_changed(addr,turnout);
 		}
 	}
 	else if(cmd==CMD_EVENT_SENSOR)
@@ -541,7 +597,7 @@ void Intellibox::process_reply(const Time::TimeStamp &t)
 			if(turnout.active)
 			{
 				if(turnout.state==turnout.pending)
-					signal_turnout.emit(addr, turnout.state);
+					turnout_state_changed(addr, turnout);
 				turnout.off_timeout = t+500*Time::msec;
 			}
 		}
@@ -573,7 +629,7 @@ void Intellibox::process_reply(const Time::TimeStamp &t)
 			{
 				turnout.state = (turnout.state&~mask) | (bit*mask);
 				turnout.pending = turnout.state;
-				signal_turnout.emit(addr, turnout.state);
+				turnout_state_changed(addr, turnout);
 			}
 
 			turnout.synced = true;
@@ -711,10 +767,12 @@ void Intellibox::error(Command cmd, Error err)
 
 
 Intellibox::Locomotive::Locomotive():
+	protocol(NONE),
 	ext_func(false),
 	speed(0),
 	reverse(false),
-	funcs(0)
+	funcs(0),
+	pending_half_step(0)
 { }
 
 
@@ -723,7 +781,8 @@ Intellibox::Turnout::Turnout():
 	state(0),
 	active(false),
 	synced(false),
-	pending(0)
+	pending(0),
+	signal(false)
 { }