X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Farducontrol.h;h=a48f6f0990aa59997b9c45bdde7778cd3506c17c;hb=25aacc9bfe66f1a2bffd196c735d3444adac6fe3;hp=555280985767a7e37ea512607a0337359ac11618;hpb=1e655686513ef60e1972fc9ca9bcf7b434a09e40;p=r2c2.git

diff --git a/source/libr2c2/arducontrol.h b/source/libr2c2/arducontrol.h
index 5552809..a48f6f0 100644
--- a/source/libr2c2/arducontrol.h
+++ b/source/libr2c2/arducontrol.h
@@ -117,6 +117,7 @@ private:
 
 		bool set(T v) { if(v==pending) return false; pending = v; ++serial; return true; }
 		bool commit(unsigned short s) { if(s!=serial) return false; current = pending; return true; }
+		void rollback() { pending = current; ++serial; }
 
 		operator T() const { return current; }
 	};
@@ -172,11 +173,13 @@ private:
 		Kind kind;
 		unsigned address;
 		unsigned bits;
+		unsigned valid_states;
 		ControlledVariable<unsigned> state;
+		unsigned uncertain;
 		unsigned target;
 		Msp::Time::TimeDelta active_time;
 
-		Accessory(Kind, unsigned, unsigned);
+		Accessory(Kind, unsigned, unsigned, unsigned);
 
 		unsigned create_state_command(unsigned, bool, char *) const;
 	};
@@ -217,17 +220,30 @@ private:
 	public:
 		void push(const T &);
 		bool pop(T &);
+		unsigned size() const;
+		bool empty() const;
 	};
 
 	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
@@ -236,7 +252,13 @@ private:
 		Queue<PendingCommand> queue;
 
 	public:
+		CommandQueueTask();
+
 		virtual bool get_work(PendingCommand &);
+
+		void push(const PendingCommand &);
+		unsigned size() const { return queue.size(); }
+		bool empty() const { return queue.empty(); }
 	};
 
 	class RefreshTask: public Task
@@ -269,7 +291,8 @@ private:
 		ArduControl &control;
 		unsigned n_octets;
 		unsigned octets_remaining;
-		unsigned delay;
+		Msp::Time::TimeStamp last_poll;
+		Msp::Time::TimeDelta latency;
 
 	public:
 		S88Task(ArduControl &);
@@ -279,13 +302,14 @@ private:
 
 		void set_n_octets(unsigned);
 		void grow_n_octets(unsigned);
+
+		const Msp::Time::TimeDelta &get_latency() const { return latency; }
 	};
 
 	class MfxAnnounceTask: public Task
 	{
 	private:
 		unsigned serial;
-		Msp::Time::TimeStamp next;
 
 	public:
 		MfxAnnounceTask();
@@ -301,7 +325,6 @@ private:
 	private:
 		ArduControl &control;
 		unsigned next_address;
-		Msp::Time::TimeStamp next;
 		unsigned size;
 		unsigned bits;
 		unsigned misses;
@@ -324,7 +347,6 @@ private:
 		float current;
 		float base_level;
 		float peak_level;
-		Msp::Time::TimeStamp next_poll;
 		unsigned next_type;
 
 	public:
@@ -354,8 +376,9 @@ private:
 		virtual void main();
 		void init_baud_rate();
 		bool get_work(PendingCommand &);
-		unsigned do_command(const PendingCommand &);
+		unsigned do_command(const PendingCommand &, const Msp::Time::TimeDelta &);
 		unsigned process_reply(const char *, unsigned);
+		void set_power(bool);
 	};
 
 	typedef std::map<unsigned, Locomotive> LocomotiveMap;
@@ -369,6 +392,7 @@ private:
 	Msp::FS::Path state_file;
 
 	ControlledVariable<bool> power;
+	bool halted;
 
 	LocomotiveMap locomotives;
 	MfxInfoArray mfx_info;
@@ -380,8 +404,8 @@ private:
 
 	SensorMap sensors;
 
-	Msp::Mutex mutex;
-	Queue<PendingCommand> command_queue;
+	Msp::Time::TimeDelta command_timeout;
+	CommandQueueTask command_queue;
 	Queue<Tag> completed_commands;
 	RefreshTask refresh;
 	S88Task s88;
@@ -391,6 +415,7 @@ private:
 	ControlThread thread;
 
 	static ProtocolInfo protocol_info[2];
+	static TelemetryInfo telemetry_info[4];
 
 public:
 	ArduControl(const Options &);
@@ -399,7 +424,7 @@ public:
 	virtual void set_power(bool);
 	virtual bool get_power() const { return power; }
 	virtual void halt(bool);
-	virtual bool is_halted() const { return false; }
+	virtual bool is_halted() const { return halted; }
 
 	virtual const char *enumerate_protocols(unsigned) const;
 private:
@@ -428,10 +453,11 @@ public:
 	virtual unsigned get_signal(unsigned) const;
 
 private:
-	unsigned add_accessory(Accessory::Kind, unsigned, unsigned);
+	unsigned add_accessory(Accessory::Kind, unsigned, unsigned, unsigned);
 	void remove_accessory(Accessory::Kind, unsigned);
 	void set_accessory(Accessory::Kind, unsigned, unsigned);
 	unsigned get_accessory(Accessory::Kind, unsigned) const;
+	void activate_accessory_by_mask(Accessory &, unsigned);
 
 public:
 	virtual unsigned add_sensor(unsigned);
@@ -439,6 +465,9 @@ public:
 	virtual void set_sensor(unsigned, bool) { }
 	virtual bool get_sensor(unsigned) const;
 
+	virtual const TelemetryInfo *enumerate_telemetry(unsigned) const;
+	virtual float get_telemetry_value(const std::string &) const;
+
 	virtual void tick();
 	virtual void flush();
 private: