]> git.tdb.fi Git - r2c2.git/blobdiff - source/libmarklin/timetable.h
Make LCD output selectable at runtime through an extra I/O pin
[r2c2.git] / source / libmarklin / timetable.h
index 72e12d3d9980f5ca1a66732678c88abfd17cf20e..b4f9cc1b2fd2972ed097926e54c31a45824101f5 100644 (file)
@@ -34,13 +34,15 @@ public:
                void speed(unsigned);
                void travel(const std::string &);
                void wait(unsigned);
+               void wait_train(unsigned, const std::string &);
        };
 
        enum RowType
        {
                GOTO,
                TRAVEL,
-               WAIT,
+               WAIT_TIME,
+               WAIT_TRAIN,
                ARRIVE,
                SPEED,
                REVERSE,
@@ -74,6 +76,7 @@ private:
        unsigned current_row;
        bool executing;
        Block *pending_block;
+       Train *pending_train;
        Msp::Time::TimeStamp wait_timeout;
 
 public: