Make LCD output selectable at runtime through an extra I/O pin

[r2c2.git] / source / libmarklin / train.h

diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h
index e8785f5e5994deb4ae275e670a0187676dd03534..a13c422a9d8c2d35f989d2704e11447152d908f5 100644 (file)
--- a/source/libmarklin/train.h
+++ b/source/libmarklin/train.h
@@ -12,10 +12,12 @@ Distributed under the GPL
 #include <sigc++/trackable.h>
 #include <msp/time/timestamp.h>
 #include "block.h"
+#include "blockiter.h"
+#include "controller.h"
 
 namespace Marklin {
 
-class ControlModel;
+class ArticleNumber;
 class Route;
 class Timetable;
 class Vehicle;
@@ -33,13 +35,14 @@ public:
        public:
                Loader(Train &);
        private:
+               virtual void finish();
                void block(unsigned);
                void block_hint(unsigned);
                void name(const std::string &);
                void real_speed(unsigned, float, float);
                void route(const std::string &);
                void timetable();
-               void vehicle(unsigned);
+               void vehicle(ArticleNumber);
        };
 
        sigc::signal<void, const std::string &> signal_name_changed;
@@ -50,13 +53,12 @@ public:
        sigc::signal<void, const std::string &> signal_status_changed;
 
 private:
-       struct BlockRef
+       struct RouteRef
        {
-               Block *block;
-               unsigned entry;
+               const Route *route;
+               unsigned diversion;
 
-               BlockRef(Block *, unsigned);
-               BlockRef next() const;
+               RouteRef(const Route *, unsigned = 0);
        };
 
        struct RealSpeed
@@ -68,25 +70,31 @@ private:
                void add(float, float);
        };
 
+       typedef std::list<BlockIter> BlockList;
+
        Layout &layout;
        const VehicleType &loco_type;
        unsigned address;
+       std::string protocol;
        std::string name;
        int priority;
+       const Train *yielding_to;
        std::vector<Vehicle *> vehicles;
-       std::list<BlockRef> cur_blocks;
-       std::list<BlockRef> rsv_blocks;
+       BlockList blocks;
+       BlockList::iterator cur_blocks_end;
+       BlockList::iterator clear_blocks_end;
        Block *pending_block;
-       ControlModel *control;
+       bool reserving;
+       bool advancing;
+       Controller *controller;
        Timetable *timetable;
        bool active;
-       unsigned current_speed;
+       unsigned current_speed_step;
        bool speed_changing;
        bool reverse;
        Msp::Time::TimeStamp stop_timeout;
        unsigned functions;
-       const Route *route;
-       const Route *next_route;
+       std::list<RouteRef> routes;
        bool end_of_route;
        std::string status;
 
@@ -98,17 +106,19 @@ private:
        float overshoot_dist;
 
 public:
-       Train(Layout &, const VehicleType &, unsigned);
+       Train(Layout &, const VehicleType &, unsigned, const std::string &);
        ~Train();
 
        Layout &get_layout() const { return layout; }
        const VehicleType &get_locomotive_type() const { return loco_type; }
        unsigned get_address() const { return address; }
+       const std::string &get_protocol() const { return protocol; }
        void set_name(const std::string &);
        const std::string &get_name() const { return name; }
        void set_priority(int);
+       void yield_to(const Train &);
        int get_priority() const { return priority; }
-       ControlModel &get_control() const { return *control; }
+       Controller &get_controller() const { return *controller; }
 
        void add_vehicle(const VehicleType &);
        void remove_vehicle(unsigned);
@@ -120,6 +130,7 @@ public:
        void set_active(bool);
        void set_function(unsigned, bool);
        float get_control(const std::string &) const;
+       float get_speed() const;
        bool is_active() const { return active; }
        bool get_function(unsigned) const;
        unsigned get_functions() const { return functions; }
@@ -127,12 +138,15 @@ public:
        void set_timetable(Timetable *);
        Timetable *get_timetable() { return timetable; }
 
-       void set_route(const Route *);
-       void go_to(const Track &);
-       const Route *get_route() const { return route; }
+       bool set_route(const Route *);
+       bool go_to(Track &);
+       bool divert(Track &);
+       const Route *get_route() const;
        void place(Block &, unsigned);
-       bool is_placed() const { return !cur_blocks.empty(); }
+       void unplace();
+       bool is_placed() const { return !blocks.empty(); }
        bool free_block(Block &);
+       void free_noncritical_blocks();
        int get_entry_to_block(Block &) const;
        float get_reserved_distance() const;
 
@@ -142,20 +156,26 @@ public:
 
        void save(std::list<Msp::DataFile::Statement> &) const;
 private:
+       void control_changed(const Controller::Control &);
        void loco_speed_event(unsigned, unsigned, bool);
        void loco_func_event(unsigned, unsigned, bool);
        void sensor_event(unsigned, bool);
-       void turnout_event(unsigned, bool);
+       void turnout_path_changed(Track &);
        void halt_event(bool);
        void block_reserved(const Block &, const Train *);
-       unsigned reserve_more();
+       void reserve_more();
+       void check_turnout_paths(bool);
+       float get_reserved_distance_until(const Block *, bool) const;
        float get_real_speed(unsigned) const;
-       unsigned find_speed(float) const;
+       unsigned find_speed_step(float) const;
        float get_travel_speed() const;
        void set_status(const std::string &);
-       void release_blocks(std::list<BlockRef> &);
-       void release_blocks(std::list<BlockRef> &, std::list<BlockRef>::iterator, std::list<BlockRef>::iterator);
-       void reverse_blocks(std::list<BlockRef> &) const;
+       void release_blocks();
+       void release_blocks(BlockList::iterator, BlockList::iterator);
+       void reverse_blocks(BlockList &) const;
+       bool advance_route(std::list<RouteRef>::iterator &, Track &);
+       Route *create_lead_route(Route *, const Route *);
+       bool is_valid_diversion(const Route &, const TrackIter &);
 };
 
 } // namespace Marklin