X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Farducontrol.h;h=c170e4203c9c2eb3de864de49d958a0a10b6e794;hb=23e1a988da2efae47e39d93babe7e37b1c0ca554;hp=ad14e2d4239a5182f6223b70ae3f7bea9ac88ab3;hpb=26fbc0321526ccc41a81a332f0d60b7cc42b6567;p=r2c2.git

diff --git a/source/libr2c2/arducontrol.h b/source/libr2c2/arducontrol.h
index ad14e2d..c170e42 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,7 +251,12 @@ private:
 		Queue<PendingCommand> queue;
 
 	public:
+		CommandQueueTask();
+
 		virtual bool get_work(PendingCommand &);
+
+		void push(const PendingCommand &);
+		bool empty() const { return queue.empty(); }
 	};
 
 	class RefreshTask: public Task
@@ -273,7 +289,6 @@ private:
 		ArduControl &control;
 		unsigned n_octets;
 		unsigned octets_remaining;
-		unsigned delay;
 
 	public:
 		S88Task(ArduControl &);
@@ -289,7 +304,6 @@ private:
 	{
 	private:
 		unsigned serial;
-		Msp::Time::TimeStamp next;
 
 	public:
 		MfxAnnounceTask();
@@ -305,7 +319,6 @@ private:
 	private:
 		ArduControl &control;
 		unsigned next_address;
-		Msp::Time::TimeStamp next;
 		unsigned size;
 		unsigned bits;
 		unsigned misses;
@@ -328,7 +341,6 @@ private:
 		float current;
 		float base_level;
 		float peak_level;
-		Msp::Time::TimeStamp next_poll;
 		unsigned next_type;
 
 	public:
@@ -387,7 +399,7 @@ private:
 	SensorMap sensors;
 
 	Msp::Time::TimeDelta command_timeout;
-	Queue<PendingCommand> command_queue;
+	CommandQueueTask command_queue;
 	Queue<Tag> completed_commands;
 	RefreshTask refresh;
 	S88Task s88;