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

diff --git a/source/libr2c2/arducontrol.h b/source/libr2c2/arducontrol.h
index 2431cf9..69311f8 100644
--- a/source/libr2c2/arducontrol.h
+++ b/source/libr2c2/arducontrol.h
@@ -75,7 +75,8 @@ private:
 
 	enum GeneralCommand
 	{
-		POWER
+		POWER,
+		NEW_LOCO
 	};
 
 	enum Protocol
@@ -130,6 +131,11 @@ private:
 		unsigned create_speed_func_command(unsigned, char *) const;
 	};
 
+	struct MfxInfo: public DetectedLocomotive
+	{
+		unsigned id;
+	};
+
 	struct Accessory
 	{
 		enum Kind
@@ -257,12 +263,19 @@ private:
 		unsigned size;
 		unsigned bits;
 		unsigned misses;
+		std::list<MfxInfo> queue;
+		Msp::Mutex mutex;
 
 	public:
 		MfxSearchTask(ArduControl &);
 
 		virtual bool get_work(PendingCommand &);
 		virtual void process_reply(const char *, unsigned);
+
+	private:
+		void push_info(const MfxInfo &);
+	public:
+		bool pop_info(MfxInfo &);
 	};
 
 	class ControlThread: public Msp::Thread
@@ -285,6 +298,7 @@ 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;
@@ -295,6 +309,7 @@ private:
 	ControlledVariable<bool> power;
 
 	LocomotiveMap locomotives;
+	MfxInfoArray mfx_info;
 	AccessoryMap accessories;
 	AccessoryPtrList accessory_queue;
 	Accessory *active_accessory;
@@ -328,7 +343,7 @@ 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 &);
 	virtual void remove_loco(unsigned);
 	virtual void set_loco_speed(unsigned, unsigned);