X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fdriver.h;h=3f5a75ce2a6b959d31071d38436c2d73bbef8f0e;hb=e8b19bb2711913226580b93ba127b0628839c10d;hp=7c762d0066b4b9b668030edb0e53dec09d0ebf50;hpb=77f1712e7f8913af3ce33efc0e1e4ebbe0e5f93a;p=r2c2.git

diff --git a/source/libr2c2/driver.h b/source/libr2c2/driver.h
index 7c762d0..3f5a75c 100644
--- a/source/libr2c2/driver.h
+++ b/source/libr2c2/driver.h
@@ -1,8 +1,10 @@
 #ifndef LIBR2C2_DRIVER_H_
 #define LIBR2C2_DRIVER_H_
 
+#include <map>
 #include <string>
 #include <sigc++/signal.h>
+#include <msp/strings/lexicalcast.h>
 
 namespace R2C2 {
 
@@ -13,6 +15,29 @@ class VehicleType;
 class Driver
 {
 public:
+	class Options
+	{
+	private:
+		typedef std::map<std::string, std::string> OptionMap;
+
+		OptionMap opts;
+
+	public:
+		Options() { }
+		Options(const std::string &);
+
+		void set(const std::string &, const std::string &);
+
+		template<typename T>
+		T get(const std::string &k, const T &d = T()) const
+		{
+			OptionMap::const_iterator i = opts.find(k);
+			if(i==opts.end())
+				return d;
+			return Msp::lexical_cast<T>(i->second);
+		}
+	};
+
 	struct DetectedLocomotive
 	{
 		std::string protocol;
@@ -20,6 +45,14 @@ public:
 		std::string name;
 	};
 
+	struct TelemetryInfo
+	{
+		const char *name;
+		const char *label;
+		const char *unit;
+		unsigned precision;
+	};
+
 	sigc::signal<void, bool> signal_power;
 	sigc::signal<void, bool> signal_halt;
 	sigc::signal<void, const DetectedLocomotive &> signal_locomotive_detected;
@@ -27,6 +60,7 @@ public:
 	sigc::signal<void, unsigned, unsigned, bool> signal_loco_speed;
 	sigc::signal<void, unsigned, unsigned, bool> signal_loco_function;
 	sigc::signal<void, unsigned, unsigned> signal_turnout;
+	sigc::signal<void, unsigned> signal_turnout_failed;
 	sigc::signal<void, unsigned, unsigned> signal_signal;
 	sigc::signal<void, unsigned, bool> signal_sensor;
 
@@ -65,6 +99,9 @@ public:
 	virtual void set_sensor(unsigned, bool) = 0;
 	virtual bool get_sensor(unsigned) const = 0;
 
+	virtual const TelemetryInfo *enumerate_telemetry(unsigned) const = 0;
+	virtual float get_telemetry_value(const std::string &) const = 0;
+
 	virtual void tick() = 0;
 	virtual void flush() = 0;