Generalize turnouts to magnet accessories in the central station driver

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

diff --git a/source/libr2c2/centralstation.h b/source/libr2c2/centralstation.h
index 4539e0b10d00f56db768b9c416b5d138e87ab546..ad3d771f312094e3098b9d5aa2979a8b8b1a6498 100644 (file)
--- a/source/libr2c2/centralstation.h
+++ b/source/libr2c2/centralstation.h
@@ -68,25 +68,31 @@ private:
                Locomotive();
        };
 
-       struct Turnout
+       struct MagnetAccessory
        {
+               enum Type
+               {
+                       TURNOUT
+               };
+
                enum Symbol
                {
-                       LEFT = 0,
-                       RIGHT = 1,
-                       THREEWAY = 2,
-                       DOUBLESLIP = 3,
-                       CURVED_LEFT = 21,
-                       CURVED_RIGHT = 22
+                       TURNOUT_LEFT = 0,
+                       TURNOUT_RIGHT = 1,
+                       TURNOUT_THREEWAY = 2,
+                       TURNOUT_DOUBLESLIP = 3,
+                       TURNOUT_CURVED_LEFT = 21,
+                       TURNOUT_CURVED_RIGHT = 22
                };
 
                unsigned address;
-               unsigned symbol;
+               Type type;
+               Symbol symbol;
                unsigned state;
                unsigned bits;
                bool synced;
 
-               Turnout();
+               MagnetAccessory();
        };
 
        struct Sensor
@@ -98,7 +104,7 @@ private:
 
        typedef std::map<unsigned, unsigned> AddressMap;
        typedef std::map<unsigned, Locomotive> LocoMap;
-       typedef std::map<unsigned, Turnout> TurnoutMap;
+       typedef std::map<unsigned, MagnetAccessory> AccessoryMap;
        typedef std::map<unsigned, Sensor> SensorMap;
 
        Msp::Net::StreamSocket socket;
@@ -110,9 +116,9 @@ private:
        LocoMap locos;
        AddressMap loco_addr;
        bool locos_synced;
-       TurnoutMap turnouts;
-       AddressMap turnout_addr;
-       bool turnouts_synced;
+       AccessoryMap accessories;
+       AddressMap accessory_addr;
+       bool accessories_synced;
        SensorMap sensors;
        std::vector<unsigned> s88;
        bool sensors_synced;
@@ -138,6 +144,13 @@ public:
        virtual void set_turnout(unsigned, unsigned);
        virtual unsigned get_turnout(unsigned) const;
 
+private:
+       MagnetAccessory &add_accessory(unsigned, MagnetAccessory::Type, MagnetAccessory::Symbol);
+       void set_accessory_state(unsigned, MagnetAccessory::Type, unsigned);
+       unsigned get_accessory_state(unsigned, MagnetAccessory::Type) const;
+       void accessory_state_changed(const MagnetAccessory &) const;
+
+public:
        virtual void add_sensor(unsigned);
        virtual void set_sensor(unsigned, bool) { }
        virtual bool get_sensor(unsigned) const;