X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fintellibox.h;h=caf84905dbe617524167838468fabeac6a106010;hb=3907520897611cb1b5f2f938c60d3eaff34477a5;hp=e35da477236a6bc59e80d2d466678f39b380dd6e;hpb=3e3675f8d86b06cdea7df197dfe8866ffb285aec;p=r2c2.git

diff --git a/source/libr2c2/intellibox.h b/source/libr2c2/intellibox.h
index e35da47..caf8490 100644
--- a/source/libr2c2/intellibox.h
+++ b/source/libr2c2/intellibox.h
@@ -85,6 +85,7 @@ private:
 		Locomotive();
 	};
 
+	// These are used for signals as well, but Intellibox calls them turnouts.
 	struct Turnout
 	{
 		unsigned bits;
@@ -93,6 +94,7 @@ private:
 		bool synced;
 		unsigned pending;
 		Msp::Time::TimeStamp off_timeout;
+		bool signal;
 
 		Turnout();
 	};
@@ -125,7 +127,7 @@ private:
 	Msp::Time::TimeStamp next_event_query;
 
 public:
-	Intellibox(const std::string &);
+	Intellibox(const Options &);
 
 	virtual void set_power(bool);
 	virtual bool get_power() const { return power; }
@@ -134,24 +136,36 @@ public:
 
 	virtual const char *enumerate_protocols(unsigned) const;
 	virtual unsigned get_protocol_speed_steps(const std::string &) const;
-	virtual void add_loco(unsigned, const std::string &, const VehicleType &);
+	virtual DetectedLocomotive *enumerate_detected_locos(unsigned) const { return 0; }
+	virtual unsigned add_loco(unsigned, const std::string &, const VehicleType &);
+	virtual void remove_loco(unsigned);
 	virtual void set_loco_speed(unsigned, unsigned);
 	virtual void set_loco_reverse(unsigned, bool);
 	virtual void set_loco_function(unsigned, unsigned, bool);
 
-	virtual void add_turnout(unsigned, const TrackType &);
+	virtual unsigned add_turnout(unsigned, const TrackType &);
+	virtual void remove_turnout(unsigned);
+private:
+	unsigned add_turnout(unsigned, unsigned, bool);
+	void turnout_state_changed(unsigned, const Turnout &) const;
+public:
 	virtual void set_turnout(unsigned, unsigned);
 	virtual unsigned get_turnout(unsigned) const;
 
-	// TODO implement these
-	virtual void add_signal(unsigned, const SignalType &) { }
-	virtual void set_signal(unsigned, unsigned) { }
-	virtual unsigned get_signal(unsigned) const { return 0; }
+	virtual unsigned add_signal(unsigned, const SignalType &);
+	virtual void remove_signal(unsigned);
+	virtual void set_signal(unsigned, unsigned);
+	virtual unsigned get_signal(unsigned) const;
 
-	virtual void add_sensor(unsigned);
+public:
+	virtual unsigned add_sensor(unsigned);
+	virtual void remove_sensor(unsigned);
 	virtual void set_sensor(unsigned, bool) { }
 	virtual bool get_sensor(unsigned) const;
 
+	virtual const TelemetryInfo *enumerate_telemetry(unsigned) const { return 0; }
+	virtual float get_telemetry_value(const std::string &) const;
+
 	virtual void tick();
 	virtual void flush();