Fix and improve logic in MfxSearchTask

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

diff --git a/source/libr2c2/arducontrol.h b/source/libr2c2/arducontrol.h
index 4e9ef63b248c631821055aecf2ad0bc53ce5fbeb..46af9238af3fe845e5e19af05ea285b27987361d 100644 (file)
--- a/source/libr2c2/arducontrol.h
+++ b/source/libr2c2/arducontrol.h
@@ -26,6 +26,14 @@ private:
                MOTOROLA_SPEED_DIRECTION = 0x13,
                MOTOROLA_SPEED_FUNCTION = 0x14,
                MOTOROLA_SOLENOID = 0x15,
+               MFX_SET_STATION_ID = 0x21,
+               MFX_ANNOUNCE = 0x22,
+               MFX_SEARCH = 0x23,
+               MFX_ASSIGN_ADDRESS = 0x24,
+               MFX_PING = 0x25,
+               MFX_SPEED = 0x28,
+               MFX_SPEED_FUNCS8 = 0x29,
+               MFX_SPEED_FUNCS16 = 0x2A,
                S88_READ = 0x30,
                COMMAND_OK = 0x80,
                RECEIVE_OVERRUN = 0x81,
@@ -37,7 +45,9 @@ private:
                TRACK_CURRENT = 0xC0,
                INPUT_VOLTAGE = 0xC1,
                POWER_STATE = 0xC2,
-               S88_DATA = 0xD0
+               S88_DATA = 0xD0,
+               MFX_SEARCH_FEEDBACK = 0xD1,
+               MFX_PING_FEEDBACK = 0xD2
        };
 
        struct Tag
@@ -68,7 +78,8 @@ private:
 
        enum Protocol
        {
-               MM
+               MM,
+               MFX
        };
 
        struct ProtocolInfo
@@ -156,11 +167,108 @@ private:
                Sensor(unsigned);
        };
 
+       struct PendingCommand
+       {
+               Tag tag;
+               char command[15];
+               unsigned char length;
+               unsigned repeat_count;
+
+               PendingCommand();
+               PendingCommand(GeneralCommand);
+               PendingCommand(Locomotive &, Locomotive::Command, unsigned = 0);
+               PendingCommand(Accessory &, Accessory::Command, unsigned = 0);
+       };
+
+       class Task
+       {
+       protected:
+               Task() { }
+       public:
+               virtual ~Task() { }
+
+               virtual bool get_work(PendingCommand &) = 0;
+               virtual void process_reply(const char *, unsigned) { }
+       };
+
+       class RefreshTask: public Task
+       {
+       private:
+               typedef std::list<Locomotive *> LocomotivePtrList;
+
+               LocomotivePtrList cycle;
+               LocomotivePtrList::iterator next;
+               unsigned round;
+               Locomotive *loco;
+               unsigned phase;
+               Msp::Mutex mutex;
+
+       public:
+               RefreshTask();
+
+               virtual bool get_work(PendingCommand &);
+
+               void add_loco(Locomotive &);
+               void remove_loco(Locomotive &);
+       private:
+               Locomotive *get_next_loco();
+               void advance();
+       };
+
+       class S88Task: public Task
+       {
+       private:
+               ArduControl &control;
+               unsigned n_octets;
+               unsigned octets_remaining;
+
+       public:
+               S88Task(ArduControl &);
+
+               virtual bool get_work(PendingCommand &);
+               virtual void process_reply(const char *, unsigned);
+
+               void set_n_octets(unsigned);
+               void grow_n_octets(unsigned);
+       };
+
+       class MfxAnnounceTask: public Task
+       {
+       private:
+               unsigned serial;
+               Msp::Time::TimeStamp next;
+
+       public:
+               MfxAnnounceTask();
+
+               virtual bool get_work(PendingCommand &);
+
+               void set_serial(unsigned);
+       };
+
+       class MfxSearchTask: public Task
+       {
+       private:
+               ArduControl &control;
+               unsigned next_address;
+               Msp::Time::TimeStamp next;
+               unsigned size;
+               unsigned bits;
+               unsigned misses;
+
+       public:
+               MfxSearchTask(ArduControl &);
+
+               virtual bool get_work(PendingCommand &);
+               virtual void process_reply(const char *, unsigned);
+       };
+
        class ControlThread: public Msp::Thread
        {
        private:
                ArduControl &control;
                bool done;
+               std::vector<Task *> tasks;
 
        public:
                ControlThread(ArduControl &);
@@ -168,46 +276,36 @@ private:
                void exit();
        private:
                virtual void main();
-       };
-
-       struct QueuedCommand
-       {
-               Tag tag;
-               char command[15];
-               unsigned char length;
-
-               QueuedCommand();
-               QueuedCommand(GeneralCommand);
-               QueuedCommand(Locomotive &, Locomotive::Command, unsigned = 0);
-               QueuedCommand(Accessory &, Accessory::Command, unsigned = 0);
+               bool get_work(PendingCommand &);
+               unsigned do_command(const PendingCommand &);
+               unsigned process_reply(const char *, unsigned);
        };
 
        typedef std::map<unsigned, Locomotive> LocomotiveMap;
-       typedef std::list<Locomotive *> LocomotivePtrList;
        typedef std::map<unsigned, Accessory> AccessoryMap;
        typedef std::list<Accessory *> AccessoryPtrList;
        typedef std::map<unsigned, Sensor> SensorMap;
 
        Msp::IO::Serial serial;
-       bool debug;
+       unsigned debug;
 
        ControlledVariable<bool> power;
 
        LocomotiveMap locomotives;
-       LocomotivePtrList refresh_cycle;
-       LocomotivePtrList::iterator next_refresh;
-       unsigned refresh_counter;
        AccessoryMap accessories;
        AccessoryPtrList accessory_queue;
        Accessory *active_accessory;
        Msp::Time::TimeStamp off_timeout;
-       std::list<QueuedCommand> command_queue;
+       std::list<PendingCommand> command_queue;
        std::list<Tag> completed_commands;
 
        SensorMap sensors;
-       unsigned n_s88_octets;
 
        Msp::Mutex mutex;
+       RefreshTask refresh;
+       S88Task s88;
+       MfxAnnounceTask mfx_announce;
+       MfxSearchTask mfx_search;
        ControlThread thread;
 
        static ProtocolInfo protocol_info[2];
@@ -232,13 +330,7 @@ public:
        virtual void set_loco_speed(unsigned, unsigned);
        virtual void set_loco_reverse(unsigned, bool);
        virtual void set_loco_function(unsigned, unsigned, bool);
-private:
-       void add_loco_to_refresh(Locomotive &);
-       void remove_loco_from_refresh(Locomotive &);
-       Locomotive *get_loco_to_refresh();
-       void advance_next_refresh();
 
-public:
        virtual unsigned add_turnout(unsigned, const TrackType &);
        virtual void remove_turnout(unsigned);
        virtual void set_turnout(unsigned, unsigned);
@@ -265,8 +357,8 @@ public:
        virtual void flush();
 
 private:
-       void push_command(const QueuedCommand &);
-       bool pop_command(QueuedCommand &);
+       void push_command(const PendingCommand &);
+       bool pop_command(PendingCommand &);
        void push_completed_tag(const Tag &);
        Tag pop_completed_tag();
 };