X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fintellibox.h;h=4740a1ec6d6f2ccb611a5b5d2b4913eaaca5c37e;hb=54392d65e2053d1eacb4cfcc435f1013993f2973;hp=d3008d2f8ed200219d630f939d8c100f68f2dfee;hpb=8b828fc32fd210b6e335ac6614d269aa892d4d57;p=r2c2.git

diff --git a/source/libr2c2/intellibox.h b/source/libr2c2/intellibox.h
index d3008d2..4740a1e 100644
--- a/source/libr2c2/intellibox.h
+++ b/source/libr2c2/intellibox.h
@@ -62,7 +62,7 @@ private:
 		ERR_NO_I2C_SPACE,
 		ERR_LOW_TURNOUT_SPACE=0x40,
 		ERR_LOK_HALTED,
-		ERR_LOK_POWER_OFF,
+		ERR_LOK_POWER_OFF
 	};
 
 	enum Protocol
@@ -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();
 	};
@@ -140,9 +142,18 @@ public:
 	virtual void set_loco_function(unsigned, unsigned, bool);
 
 	virtual void add_turnout(unsigned, const TrackType &);
+private:
+	void 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;
 
+	virtual void add_signal(unsigned, const SignalType &);
+	virtual void set_signal(unsigned, unsigned);
+	virtual unsigned get_signal(unsigned) const;
+
+public:
 	virtual void add_sensor(unsigned);
 	virtual void set_sensor(unsigned, bool) { }
 	virtual bool get_sensor(unsigned) const;