X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Flibr2c2%2Farducontrol.h;h=4e9ef63b248c631821055aecf2ad0bc53ce5fbeb;hb=daecd71f20c275fb6df128a3aaa4cfdda24b6886;hp=cbdecad3a27513c70bb0e168b661d1bd6349a2e8;hpb=8a31a3ab3ab7abda30de0ed3a6d0753760f3bb1d;p=r2c2.git

diff --git a/source/libr2c2/arducontrol.h b/source/libr2c2/arducontrol.h
index cbdecad..4e9ef63 100644
--- a/source/libr2c2/arducontrol.h
+++ b/source/libr2c2/arducontrol.h
@@ -17,6 +17,7 @@ private:
 	{
 		POWER_ON = 0x01,
 		POWER_OFF = 0x02,
+		READ_POWER_STATE = 0x03,
 		READ_TRACK_CURRENT = 0x08,
 		SET_OVERCURRENT_LIMIT = 0x09,
 		READ_INPUT_VOLTAGE = 0x0A,
@@ -35,6 +36,7 @@ private:
 		OVERCURRENT = 0xA0,
 		TRACK_CURRENT = 0xC0,
 		INPUT_VOLTAGE = 0xC1,
+		POWER_STATE = 0xC2,
 		S88_DATA = 0xD0
 	};
 
@@ -52,7 +54,7 @@ private:
 		Type type;
 		unsigned char command;
 		unsigned short serial;
-		unsigned address;
+		unsigned id;
 
 		Tag();
 
@@ -66,10 +68,16 @@ private:
 
 	enum Protocol
 	{
-		NONE,
 		MM
 	};
 
+	struct ProtocolInfo
+	{
+		unsigned max_address;
+		unsigned max_speed;
+		unsigned max_func;
+	};
+
 	template<typename T>
 	struct ControlledVariable
 	{
@@ -95,6 +103,7 @@ private:
 			FUNCTIONS
 		};
 
+		unsigned id;
 		Protocol proto;
 		unsigned address;
 		ControlledVariable<unsigned> speed;
@@ -201,6 +210,8 @@ private:
 	Msp::Mutex mutex;
 	ControlThread thread;
 
+	static ProtocolInfo protocol_info[2];
+
 public:
 	ArduControl(const std::string &);
 	~ArduControl();
@@ -216,7 +227,7 @@ private:
 public:
 	virtual unsigned get_protocol_speed_steps(const std::string &) const;
 
-	virtual void add_loco(unsigned, const std::string &, const VehicleType &);
+	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);
@@ -228,24 +239,24 @@ private:
 	void advance_next_refresh();
 
 public:
-	virtual void add_turnout(unsigned, const TrackType &);
+	virtual unsigned add_turnout(unsigned, const TrackType &);
 	virtual void remove_turnout(unsigned);
 	virtual void set_turnout(unsigned, unsigned);
 	virtual unsigned get_turnout(unsigned) const;
 
-	virtual void add_signal(unsigned, const SignalType &);
+	virtual unsigned add_signal(unsigned, const SignalType &);
 	virtual void remove_signal(unsigned);
 	virtual void set_signal(unsigned, unsigned);
 	virtual unsigned get_signal(unsigned) const;
 
 private:
-	void add_accessory(Accessory::Kind, unsigned, unsigned);
+	unsigned add_accessory(Accessory::Kind, unsigned, unsigned);
 	void remove_accessory(Accessory::Kind, unsigned);
 	void set_accessory(Accessory::Kind, unsigned, unsigned);
 	unsigned get_accessory(Accessory::Kind, unsigned) const;
 
 public:
-	virtual void add_sensor(unsigned);
+	virtual unsigned add_sensor(unsigned);
 	virtual void remove_sensor(unsigned);
 	virtual void set_sensor(unsigned, bool) { }
 	virtual bool get_sensor(unsigned) const;