X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fintellibox.cpp;h=3f3edf2aad00774b7262fbe0fe9a3f94c71a9787;hb=c0e076401ee76fd9a5a96ff919a8e7b4d058c51b;hp=338aed2544127844dff4de200cf7bbffc90f2a2a;hpb=ce2ff9a6e154f5b245cfb35114566489ab3e597c;p=r2c2.git

diff --git a/source/libr2c2/intellibox.cpp b/source/libr2c2/intellibox.cpp
index 338aed2..3f3edf2 100644
--- a/source/libr2c2/intellibox.cpp
+++ b/source/libr2c2/intellibox.cpp
@@ -1,6 +1,4 @@
-#include <fcntl.h>
-#include <termios.h>
-#include <sys/poll.h>
+#include <msp/core/maputils.h>
 #include <msp/io/print.h>
 #include <msp/time/units.h>
 #include <msp/time/utils.h>
@@ -13,8 +11,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 +91,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 +110,8 @@ 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)
@@ -197,9 +197,9 @@ 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)
 {
-	add_turnout(addr, type.get_state_bits(), false);
+	return add_turnout(addr, type.get_state_bits(), false);
 }
 
 void Intellibox::remove_turnout(unsigned addr)
@@ -207,7 +207,7 @@ void Intellibox::remove_turnout(unsigned addr)
 	turnouts.erase(addr);
 }
 
-void Intellibox::add_turnout(unsigned addr, unsigned bits, bool signal)
+unsigned Intellibox::add_turnout(unsigned addr, unsigned bits, bool signal)
 {
 	if(!turnouts.count(addr))
 	{
@@ -229,6 +229,8 @@ void Intellibox::add_turnout(unsigned addr, unsigned bits, bool signal)
 			command(CMD_TURNOUT_STATUS, addr+i, data, 2);
 		}
 	}
+
+	return addr;
 }
 
 void Intellibox::turnout_state_changed(unsigned addr, const Turnout &turnout) const
@@ -269,9 +271,9 @@ unsigned Intellibox::get_turnout(unsigned addr) const
 	return 0;
 }
 
-void Intellibox::add_signal(unsigned addr, const SignalType &)
+unsigned Intellibox::add_signal(unsigned addr, const SignalType &)
 {
-	add_turnout(addr, 1, true);
+	return add_turnout(addr, 1, true);
 }
 
 void Intellibox::remove_signal(unsigned addr)
@@ -289,13 +291,15 @@ unsigned Intellibox::get_signal(unsigned addr) const
 	return get_turnout(addr);
 }
 
-void Intellibox::add_sensor(unsigned addr)
+unsigned Intellibox::add_sensor(unsigned addr)
 {
 	if(!sensors.count(addr))
 	{
 		sensors[addr];
 		update_sensors = true;
 	}
+
+	return addr;
 }
 
 void Intellibox::remove_sensor(unsigned addr)
@@ -312,6 +316,11 @@ bool Intellibox::get_sensor(unsigned addr) const
 	return false;
 }
 
+float Intellibox::get_telemetry_value(const string &name) const
+{
+	throw key_error(name);
+}
+
 void Intellibox::tick()
 {
 	const Time::TimeStamp t = Time::now();