X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fcentralstation.cpp;h=5e82f2e5f117c23d9137bb80ff41b0b4359d2ecb;hb=b78b49d85fbb9b2901c77e6450cfd41c0a818ac1;hp=82a0dfdb16878ae308f0b18d5ea6fd52a67a78e4;hpb=64d23de66c33d0f77454c3db2e40cccc18f7851b;p=r2c2.git

diff --git a/source/libr2c2/centralstation.cpp b/source/libr2c2/centralstation.cpp
index 82a0dfd..5e82f2e 100644
--- a/source/libr2c2/centralstation.cpp
+++ b/source/libr2c2/centralstation.cpp
@@ -1,4 +1,5 @@
 #include <algorithm>
+#include <msp/core/maputils.h>
 #include <msp/core/refptr.h>
 #include <msp/io/print.h>
 #include <msp/net/resolve.h>
@@ -14,7 +15,7 @@ using namespace Msp;
 
 namespace R2C2 {
 
-CentralStation::CentralStation(const string &host):
+CentralStation::CentralStation(const Options &opts):
 	socket(Net::INET),
 	pending_commands(0),
 	power(false),
@@ -23,7 +24,7 @@ CentralStation::CentralStation(const string &host):
 	accessories_synced(false),
 	sensors_synced(false)
 {
-	RefPtr<Net::SockAddr> addr = Net::resolve(host+":15471");
+	RefPtr<Net::SockAddr> addr = Net::resolve(opts.get<string>(string())+":15471");
 	socket.connect(*addr);
 
 	IO::print("Connected to central station at %s\n", addr->str());
@@ -88,7 +89,7 @@ unsigned CentralStation::get_protocol_speed_steps(const string &name) const
 	}
 }
 
-void CentralStation::add_loco(unsigned addr, const string &proto_name, const VehicleType &type)
+unsigned CentralStation::add_loco(unsigned addr, const string &proto_name, const VehicleType &type)
 {
 	Protocol proto = map_protocol(proto_name);
 
@@ -109,6 +110,15 @@ void CentralStation::add_loco(unsigned addr, const string &proto_name, const Veh
 	}
 	else
 		command(format("request(%d, view, control, force)", id));
+
+	return addr;
+}
+
+void CentralStation::remove_loco(unsigned addr)
+{
+	unsigned id = map_address(locos, loco_addr, addr);
+	if(id)
+		command(format("release(%d, view, control)", id));
 }
 
 void CentralStation::set_loco_speed(unsigned addr, unsigned speed)
@@ -140,7 +150,7 @@ void CentralStation::set_loco_function(unsigned addr, unsigned func, bool state)
 		command(format("set(%d, func[%d, %d])", id, func, state));
 }
 
-void CentralStation::add_turnout(unsigned addr, const TrackType &type)
+unsigned CentralStation::add_turnout(unsigned addr, const TrackType &type)
 {
 	unsigned straight = type.get_paths();
 	bool left = false;
@@ -173,6 +183,13 @@ void CentralStation::add_turnout(unsigned addr, const TrackType &type)
 
 	MagnetAccessory &turnout = add_accessory(addr, MagnetAccessory::TURNOUT, symbol);
 	turnout.bits = type.get_state_bits();
+
+	return addr;
+}
+
+void CentralStation::remove_turnout(unsigned addr)
+{
+	remove_accessory(addr);
 }
 
 void CentralStation::set_turnout(unsigned addr, unsigned state)
@@ -185,9 +202,15 @@ unsigned CentralStation::get_turnout(unsigned addr) const
 	return get_accessory_state(addr, MagnetAccessory::TURNOUT);
 }
 
-void CentralStation::add_signal(unsigned addr, const SignalType &)
+unsigned CentralStation::add_signal(unsigned addr, const SignalType &)
 {
 	add_accessory(addr, MagnetAccessory::SIGNAL, MagnetAccessory::SEMAPHORE_HOME);
+	return addr;
+}
+
+void CentralStation::remove_signal(unsigned addr)
+{
+	remove_accessory(addr);
 }
 
 void CentralStation::set_signal(unsigned addr, unsigned state)
@@ -230,6 +253,13 @@ CentralStation::MagnetAccessory &CentralStation::add_accessory(unsigned addr, Ma
 	}
 }
 
+void CentralStation::remove_accessory(unsigned addr)
+{
+	unsigned id = map_address(accessories, accessory_addr, addr);
+	if(id)
+		command(format("release(%d, view, control)", id));
+}
+
 void CentralStation::set_accessory_state(unsigned addr, MagnetAccessory::Type type, unsigned state)
 {
 	unsigned id = map_address(accessories, accessory_addr, addr);
@@ -274,7 +304,7 @@ void CentralStation::accessory_state_changed(const MagnetAccessory &accessory) c
 		signal_signal.emit(accessory.address, accessory.state);
 }
 
-void CentralStation::add_sensor(unsigned addr)
+unsigned CentralStation::add_sensor(unsigned addr)
 {
 	sensors.insert(SensorMap::value_type(addr, Sensor()));
 
@@ -283,6 +313,12 @@ void CentralStation::add_sensor(unsigned addr)
 		if(addr>s88.size()*16)
 			command("create(26, add[0])");
 	}
+
+	return addr;
+}
+
+void CentralStation::remove_sensor(unsigned)
+{
 }
 
 bool CentralStation::get_sensor(unsigned addr) const
@@ -293,6 +329,11 @@ bool CentralStation::get_sensor(unsigned addr) const
 	return false;
 }
 
+float CentralStation::get_telemetry_value(const string &name) const
+{
+	throw key_error(name);
+}
+
 void CentralStation::tick()
 {
 	while(Message msg = receive())