X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Farducontrol.h;h=fffaf8cc36854d691860e8064548fcd589579aac;hb=b85fa11e45805cd71383577642030d8d01f43447;hp=292700d5c452d8daee03e2815542e34b7297404e;hpb=b78b49d85fbb9b2901c77e6450cfd41c0a818ac1;p=r2c2.git

diff --git a/source/libr2c2/arducontrol.h b/source/libr2c2/arducontrol.h
index 292700d..fffaf8c 100644
--- a/source/libr2c2/arducontrol.h
+++ b/source/libr2c2/arducontrol.h
@@ -1,6 +1,7 @@
 #ifndef LIBR2C2_ARDUCONTROL_H_
 #define LIBR2C2_ARDUCONTROL_H_
 
+#include <deque>
 #include <msp/core/mutex.h>
 #include <msp/core/thread.h>
 #include <msp/datafile/objectloader.h>
@@ -44,6 +45,7 @@ private:
 		MFX_SEARCH = 0x23,
 		MFX_ASSIGN_ADDRESS = 0x24,
 		MFX_PING = 0x25,
+		MFX_READ = 0x26,
 		MFX_SPEED = 0x28,
 		MFX_SPEED_FUNCS8 = 0x29,
 		MFX_SPEED_FUNCS16 = 0x2A,
@@ -62,7 +64,8 @@ private:
 		POWER_STATE = 0xC2,
 		S88_DATA = 0xD0,
 		MFX_SEARCH_FEEDBACK = 0xD1,
-		MFX_PING_FEEDBACK = 0xD2
+		MFX_PING_FEEDBACK = 0xD2,
+		MFX_READ_FEEDBACK = 0xD3
 	};
 
 	struct Tag
@@ -214,12 +217,13 @@ private:
 	class Queue
 	{
 	private:
-		std::list<T> items;
+		std::deque<T> items;
 		Msp::Mutex mutex;
 
 	public:
 		void push(const T &);
 		bool pop(T &);
+		unsigned size() const;
 		bool empty() const;
 	};
 
@@ -256,6 +260,7 @@ private:
 		virtual bool get_work(PendingCommand &);
 
 		void push(const PendingCommand &);
+		unsigned size() const { return queue.size(); }
 		bool empty() const { return queue.empty(); }
 	};
 
@@ -289,6 +294,8 @@ private:
 		ArduControl &control;
 		unsigned n_octets;
 		unsigned octets_remaining;
+		Msp::Time::TimeStamp last_poll;
+		Msp::Time::TimeDelta latency;
 
 	public:
 		S88Task(ArduControl &);
@@ -298,6 +305,8 @@ private:
 
 		void set_n_octets(unsigned);
 		void grow_n_octets(unsigned);
+
+		const Msp::Time::TimeDelta &get_latency() const { return latency; }
 	};
 
 	class MfxAnnounceTask: public Task
@@ -324,6 +333,13 @@ private:
 		unsigned misses;
 		Queue<MfxInfo> queue;
 
+		MfxInfo *pending_info;
+		unsigned read_array;
+		unsigned read_offset;
+		unsigned read_length;
+		char read_data[0x40];
+		unsigned block_size;
+
 	public:
 		MfxSearchTask(ArduControl &);
 
@@ -361,10 +377,15 @@ private:
 		ArduControl &control;
 		bool done;
 		std::vector<Task *> tasks;
+		unsigned cmd_rate;
+		unsigned cmd_count;
+		Msp::Time::TimeStamp cmd_rate_start;
 
 	public:
 		ControlThread(ArduControl &);
 
+		unsigned get_command_rate() const { return cmd_rate; }
+
 		void exit();
 	private:
 		virtual void main();
@@ -409,6 +430,7 @@ private:
 	ControlThread thread;
 
 	static ProtocolInfo protocol_info[2];
+	static TelemetryInfo telemetry_info[6];
 
 public:
 	ArduControl(const Options &);
@@ -429,6 +451,7 @@ public:
 	virtual unsigned add_loco(unsigned, const std::string &, const VehicleType &);
 private:
 	MfxInfoArray::iterator add_mfx_info(const MfxInfo &);
+	MfxInfo *find_mfx_info(unsigned);
 public:
 	virtual void remove_loco(unsigned);
 	virtual void set_loco_speed(unsigned, unsigned);
@@ -458,7 +481,7 @@ public:
 	virtual void set_sensor(unsigned, bool) { }
 	virtual bool get_sensor(unsigned) const;
 
-	virtual const TelemetryInfo *enumerate_telemetry(unsigned) const { return 0; }
+	virtual const TelemetryInfo *enumerate_telemetry(unsigned) const;
 	virtual float get_telemetry_value(const std::string &) const;
 
 	virtual void tick();