Move further stuff from the ArduControl main class into Task classes

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

diff --git a/source/libr2c2/arducontrol.h b/source/libr2c2/arducontrol.h
index d794d00cd83150e4a6bcbb9c455d5faaaf049c1a..e354ecf0fed0c6f88824167ee8b7138399475863 100644 (file)
--- a/source/libr2c2/arducontrol.h
+++ b/source/libr2c2/arducontrol.h
@@ -193,20 +193,32 @@ private:
        class RefreshTask: public Task
        {
        private:
-               ArduControl &control;
+               typedef std::list<Locomotive *> LocomotivePtrList;
+
+               LocomotivePtrList cycle;
+               LocomotivePtrList::iterator next;
+               unsigned round;
                Locomotive *loco;
                unsigned phase;
+               Msp::Mutex mutex;
 
        public:
-               RefreshTask(ArduControl &);
+               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:
@@ -214,24 +226,30 @@ private:
 
                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:
-               ArduControl &control;
+               unsigned serial;
                Msp::Time::TimeStamp next;
 
        public:
-               MfxAnnounceTask(ArduControl &);
+               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;
@@ -263,7 +281,6 @@ private:
        };
 
        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;
@@ -274,9 +291,6 @@ private:
        ControlledVariable<bool> power;
 
        LocomotiveMap locomotives;
-       LocomotivePtrList refresh_cycle;
-       LocomotivePtrList::iterator next_refresh;
-       unsigned refresh_counter;
        AccessoryMap accessories;
        AccessoryPtrList accessory_queue;
        Accessory *active_accessory;
@@ -285,12 +299,12 @@ private:
        std::list<Tag> completed_commands;
 
        SensorMap sensors;
-       unsigned n_s88_octets;
-
-       unsigned mfx_announce_serial;
-       unsigned next_mfx_address;
 
        Msp::Mutex mutex;
+       RefreshTask refresh;
+       S88Task s88;
+       MfxAnnounceTask mfx_announce;
+       MfxSearchTask mfx_search;
        ControlThread thread;
 
        static ProtocolInfo protocol_info[2];
@@ -315,13 +329,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);