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

diff --git a/source/libr2c2/arducontrol.h b/source/libr2c2/arducontrol.h
index 4373a84..292700d 100644
--- a/source/libr2c2/arducontrol.h
+++ b/source/libr2c2/arducontrol.h
@@ -226,12 +226,23 @@ private:
 	class Task
 	{
 	protected:
-		Task() { }
+		std::string name;
+		unsigned priority;
+		Msp::Time::TimeStamp sleep_timeout;
+
+		Task(const std::string &, unsigned = 0);
 	public:
 		virtual ~Task() { }
 
+		const std::string &get_name() const { return name; }
+
 		virtual bool get_work(PendingCommand &) = 0;
 		virtual void process_reply(const char *, unsigned) { }
+
+		unsigned get_priority() const { return priority; }
+		const Msp::Time::TimeStamp &get_sleep_timeout() const { return sleep_timeout; }
+	protected:
+		void sleep(const Msp::Time::TimeDelta &);
 	};
 
 	class CommandQueueTask: public Task
@@ -240,6 +251,8 @@ private:
 		Queue<PendingCommand> queue;
 
 	public:
+		CommandQueueTask();
+
 		virtual bool get_work(PendingCommand &);
 
 		void push(const PendingCommand &);
@@ -276,7 +289,6 @@ private:
 		ArduControl &control;
 		unsigned n_octets;
 		unsigned octets_remaining;
-		unsigned delay;
 
 	public:
 		S88Task(ArduControl &);
@@ -292,7 +304,6 @@ private:
 	{
 	private:
 		unsigned serial;
-		Msp::Time::TimeStamp next;
 
 	public:
 		MfxAnnounceTask();
@@ -308,7 +319,6 @@ private:
 	private:
 		ArduControl &control;
 		unsigned next_address;
-		Msp::Time::TimeStamp next;
 		unsigned size;
 		unsigned bits;
 		unsigned misses;
@@ -331,7 +341,6 @@ private:
 		float current;
 		float base_level;
 		float peak_level;
-		Msp::Time::TimeStamp next_poll;
 		unsigned next_type;
 
 	public:
@@ -449,6 +458,9 @@ public:
 	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();
 private: