Avoid hogging the serial link with S88 read commands

[r2c2.git] / source / libr2c2 / arducontrol.h

diff --git a/source/libr2c2/arducontrol.h b/source/libr2c2/arducontrol.h
index 69311f8280fecbb94ce0671b636a0ec4bf9fcf0d..a8bdfa7a7ba1b018d3798c9ff3d50f25f8d640ff 100644 (file)
--- 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
        {
@@ -133,6 +146,12 @@ private:
 
        struct MfxInfo: public DetectedLocomotive
        {
+               class Loader: public Msp::DataFile::ObjectLoader<MfxInfo>
+               {
+               public:
+                       Loader(MfxInfo &);
+               };
+
                unsigned id;
        };
 
@@ -188,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:
@@ -199,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:
@@ -229,6 +269,7 @@ private:
                ArduControl &control;
                unsigned n_octets;
                unsigned octets_remaining;
+               unsigned delay;
 
        public:
                S88Task(ArduControl &);
@@ -252,6 +293,7 @@ private:
                virtual bool get_work(PendingCommand &);
 
                void set_serial(unsigned);
+               unsigned get_serial() const { return serial; }
        };
 
        class MfxSearchTask: public Task
@@ -263,8 +305,7 @@ private:
                unsigned size;
                unsigned bits;
                unsigned misses;
-               std::list<MfxInfo> queue;
-               Msp::Mutex mutex;
+               Queue<MfxInfo> queue;
 
        public:
                MfxSearchTask(ArduControl &);
@@ -272,9 +313,7 @@ private:
                virtual bool get_work(PendingCommand &);
                virtual void process_reply(const char *, unsigned);
 
-       private:
-               void push_info(const MfxInfo &);
-       public:
+               void set_next_address(unsigned);
                bool pop_info(MfxInfo &);
        };
 
@@ -305,6 +344,7 @@ private:
 
        Msp::IO::Serial serial;
        unsigned debug;
+       Msp::FS::Path state_file;
 
        ControlledVariable<bool> power;
 
@@ -314,12 +354,12 @@ private:
        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;
@@ -345,6 +385,9 @@ public:
 
        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);
@@ -374,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