X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Farducontrol.h;h=c1e7256ee3f00674b113c4b4e429a77f0700ec79;hb=2c08ce7d004b20a1cd9bc68fccbf734a6ba2d242;hp=2431cf927ae8d59b7dfc11a411b7e99e7159e83d;hpb=77f1712e7f8913af3ce33efc0e1e4ebbe0e5f93a;p=r2c2.git

diff --git a/source/libr2c2/arducontrol.h b/source/libr2c2/arducontrol.h
index 2431cf9..c1e7256 100644
--- a/source/libr2c2/arducontrol.h
+++ b/source/libr2c2/arducontrol.h
@@ -3,6 +3,8 @@
 
 #include <msp/core/mutex.h>
 #include <msp/core/thread.h>
+#include <msp/datafile/objectloader.h>
+#include <msp/fs/path.h>
 #include <msp/io/serial.h>
 #include <msp/time/timedelta.h>
 #include <msp/time/timestamp.h>
@@ -12,6 +14,17 @@ namespace R2C2 {
 
 class ArduControl: public Driver
 {
+public:
+	class Loader: public Msp::DataFile::ObjectLoader<ArduControl>
+	{
+	public:
+		Loader(ArduControl &);
+
+	private:
+		void mfx_announce_serial(unsigned);
+		void mfx_locomotive(unsigned);
+	};
+
 private:
 	enum Command
 	{
@@ -75,7 +88,8 @@ private:
 
 	enum GeneralCommand
 	{
-		POWER
+		POWER,
+		NEW_LOCO
 	};
 
 	enum Protocol
@@ -130,6 +144,17 @@ private:
 		unsigned create_speed_func_command(unsigned, char *) const;
 	};
 
+	struct MfxInfo: public DetectedLocomotive
+	{
+		class Loader: public Msp::DataFile::ObjectLoader<MfxInfo>
+		{
+		public:
+			Loader(MfxInfo &);
+		};
+
+		unsigned id;
+	};
+
 	struct Accessory
 	{
 		enum Kind
@@ -182,6 +207,18 @@ private:
 		PendingCommand(Accessory &, Accessory::Command, unsigned = 0);
 	};
 
+	template<typename T>
+	class Queue
+	{
+	private:
+		std::list<T> items;
+		Msp::Mutex mutex;
+
+	public:
+		void push(const T &);
+		bool pop(T &);
+	};
+
 	class Task
 	{
 	protected:
@@ -193,6 +230,15 @@ private:
 		virtual void process_reply(const char *, unsigned) { }
 	};
 
+	class CommandQueueTask: public Task
+	{
+	private:
+		Queue<PendingCommand> queue;
+
+	public:
+		virtual bool get_work(PendingCommand &);
+	};
+
 	class RefreshTask: public Task
 	{
 	private:
@@ -223,6 +269,7 @@ private:
 		ArduControl &control;
 		unsigned n_octets;
 		unsigned octets_remaining;
+		unsigned delay;
 
 	public:
 		S88Task(ArduControl &);
@@ -246,6 +293,7 @@ private:
 		virtual bool get_work(PendingCommand &);
 
 		void set_serial(unsigned);
+		unsigned get_serial() const { return serial; }
 	};
 
 	class MfxSearchTask: public Task
@@ -257,12 +305,16 @@ private:
 		unsigned size;
 		unsigned bits;
 		unsigned misses;
+		Queue<MfxInfo> queue;
 
 	public:
 		MfxSearchTask(ArduControl &);
 
 		virtual bool get_work(PendingCommand &);
 		virtual void process_reply(const char *, unsigned);
+
+		void set_next_address(unsigned);
+		bool pop_info(MfxInfo &);
 	};
 
 	class ControlThread: public Msp::Thread
@@ -285,26 +337,29 @@ private:
 	};
 
 	typedef std::map<unsigned, Locomotive> LocomotiveMap;
+	typedef std::vector<MfxInfo> MfxInfoArray;
 	typedef std::map<unsigned, Accessory> AccessoryMap;
 	typedef std::list<Accessory *> AccessoryPtrList;
 	typedef std::map<unsigned, Sensor> SensorMap;
 
 	Msp::IO::Serial serial;
 	unsigned debug;
+	Msp::FS::Path state_file;
 
 	ControlledVariable<bool> power;
 
 	LocomotiveMap locomotives;
+	MfxInfoArray mfx_info;
 	AccessoryMap accessories;
 	AccessoryPtrList accessory_queue;
 	Accessory *active_accessory;
 	Msp::Time::TimeStamp off_timeout;
-	std::list<PendingCommand> command_queue;
-	std::list<Tag> completed_commands;
 
 	SensorMap sensors;
 
 	Msp::Mutex mutex;
+	Queue<PendingCommand> command_queue;
+	Queue<Tag> completed_commands;
 	RefreshTask refresh;
 	S88Task s88;
 	MfxAnnounceTask mfx_announce;
@@ -314,7 +369,7 @@ private:
 	static ProtocolInfo protocol_info[2];
 
 public:
-	ArduControl(const std::string &);
+	ArduControl(const Options &);
 	~ArduControl();
 
 	virtual void set_power(bool);
@@ -328,8 +383,11 @@ private:
 public:
 	virtual unsigned get_protocol_speed_steps(const std::string &) const;
 
-	virtual const DetectedLocomotive *enumerate_detected_locos(unsigned) const { return 0; }
+	virtual const DetectedLocomotive *enumerate_detected_locos(unsigned) const;
 	virtual unsigned add_loco(unsigned, const std::string &, const VehicleType &);
+private:
+	MfxInfoArray::iterator add_mfx_info(const MfxInfo &);
+public:
 	virtual void remove_loco(unsigned);
 	virtual void set_loco_speed(unsigned, unsigned);
 	virtual void set_loco_reverse(unsigned, bool);
@@ -359,12 +417,8 @@ public:
 
 	virtual void tick();
 	virtual void flush();
-
 private:
-	void push_command(const PendingCommand &);
-	bool pop_command(PendingCommand &);
-	void push_completed_tag(const Tag &);
-	Tag pop_completed_tag();
+	void save_state() const;
 };
 
 } // namespace R2C2