Halt all trains in various unexpected situations

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

diff --git a/source/libmarklin/train.cpp b/source/libmarklin/train.cpp
index 6d963396e3baa81bb5cdffa26b8b0546adfad139..0c741722d7b7dfecf749be196183bbb1df3a3e58 100644 (file)
--- a/source/libmarklin/train.cpp
+++ b/source/libmarklin/train.cpp
@@ -44,7 +44,9 @@ Train::Train(Layout &l, const LocoType &t, unsigned a):
        status("Unplaced"),
        travel_dist(0),
        pure_speed(false),
-       real_speed(15)
+       real_speed(15),
+       accurate_position(false),
+       overshoot_dist(false)
 {
        vehicles.push_back(new Vehicle(layout, loco_type));
 
@@ -200,6 +202,7 @@ void Train::place(Block &block, unsigned entry)
        release_blocks(cur_blocks);
 
        set_active(false);
+       accurate_position = false;
 
        if(!block.reserve(this))
        {
@@ -304,6 +307,8 @@ void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt)
                stop_timeout = Time::TimeStamp();
        }
 
+       Driver &driver = layout.get_driver();
+
        if(timetable)
                timetable->tick(t);
        control->tick(dt);
@@ -312,7 +317,7 @@ void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt)
 
        if(speed && (speed<0)!=reverse)
        {
-               layout.get_driver().set_loco_reverse(address, speed<0);
+               driver.set_loco_reverse(address, speed<0);
                reverse = speed<0;
 
                release_blocks(rsv_blocks);
@@ -320,10 +325,10 @@ void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt)
 
                reserve_more();
        }
-       if(speed_notch!=current_speed && !speed_changing)
+       if(speed_notch!=current_speed && !speed_changing && !driver.is_halted() && driver.get_power())
        {
                speed_changing = true;
-               layout.get_driver().set_loco_speed(address, speed_notch);
+               driver.set_loco_speed(address, speed_notch);
 
                pure_speed = false;
 
@@ -345,10 +350,14 @@ void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt)
                for(list<BlockRef>::const_iterator i=cur_blocks.begin(); (!ok && i!=cur_blocks.end()); ++i)
                        ok = i->block->get_tracks().count(track);
 
+               float d = get_real_speed(current_speed)*(dt/Time::sec);
                if(ok)
-               {
-                       float d = get_real_speed(current_speed)*(dt/Time::sec);
                        vehicle.advance(reverse ? -d : d);
+               else if(accurate_position)
+               {
+                       overshoot_dist += d;
+                       if(overshoot_dist>40*layout.get_catalogue().get_scale())
+                               layout.emergency(name+" has not arrived at sensor");
                }
        }
        else if(end_of_route)
@@ -358,6 +367,11 @@ void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt)
 void Train::save(list<DataFile::Statement> &st) const
 {
        st.push_back((DataFile::Statement("name"), name));
+
+       for(vector<Vehicle *>::const_iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
+               if(i!=vehicles.begin())
+                       st.push_back((DataFile::Statement("vehicle"), (*i)->get_type().get_article_number()));
+
        for(unsigned i=0; i<=14; ++i)
                if(real_speed[i].weight)
                        st.push_back((DataFile::Statement("real_speed"), i, real_speed[i].speed, real_speed[i].weight));
@@ -392,6 +406,7 @@ void Train::loco_speed_event(unsigned addr, unsigned speed, bool)
        {
                current_speed = speed;
                speed_changing = false;
+               pure_speed = false;
        }
 }
 
@@ -416,11 +431,24 @@ void Train::sensor_event(unsigned addr, bool state)
        {
                // Find the first sensor block from our reserved blocks that isn't this sensor
                list<BlockRef>::iterator i;
+               unsigned result = 0;
                for(i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
-                       if(i->block->get_sensor_id() && i->block->get_sensor_id()!=addr)
-                               break;
+                       if(i->block->get_sensor_id())
+                       {
+                               if(i->block->get_sensor_id()!=addr)
+                               {
+                                       if(result==0)
+                                               result = 2;
+                                       else if(result==1)
+                                               break;
+                               }
+                               else if(result==0)
+                                       result = 1;
+                               else if(result==2)
+                                       result = 3;
+                       }
 
-               if(i!=rsv_blocks.begin())
+               if(result==1 && i!=rsv_blocks.begin())
                {
                        // Compute speed and update related state
                        float travel_time_secs = (Time::now()-last_entry_time)/Time::sec;
@@ -454,6 +482,8 @@ void Train::sensor_event(unsigned addr, bool state)
                        }
                        last_entry_time = Time::now();
                        pure_speed = true;
+                       accurate_position = true;
+                       overshoot_dist = 0;
 
                        // Check if we've reached the next route
                        if(next_route)
@@ -481,6 +511,8 @@ void Train::sensor_event(unsigned addr, bool state)
                                        signal_arrived.emit();
                        }
                }
+               else if(result==3)
+                       layout.emergency("Sensor for "+name+" triggered out of order");
        }
        else
        {
@@ -652,6 +684,12 @@ unsigned Train::reserve_more()
                        last = &rsv_blocks.back();
        }
 
+       // Make any sensorless blocks at the beginning immediately current
+       list<BlockRef>::iterator i;
+       for(i=rsv_blocks.begin(); (i!=rsv_blocks.end() && !i->block->get_sensor_id()); ++i) ;
+       if(i!=rsv_blocks.begin())
+               cur_blocks.splice(cur_blocks.end(), rsv_blocks, rsv_blocks.begin(), i);
+
        return good_sens;
 }
 
@@ -804,7 +842,7 @@ void Train::Loader::block(unsigned id)
        obj.cur_blocks.push_back(BlockRef(&blk, entry));
        obj.set_status("Stopped");
        const Block::Endpoint &bep = blk.get_endpoints()[entry];
-       obj.vehicles.back()->place(bep.track, bep.track_ep, 0, Vehicle::BACK_BUFFER);
+       obj.vehicles.front()->place(bep.track, bep.track_ep, 0, Vehicle::BACK_BUFFER);
 
        if(blk.get_sensor_id())
                obj.layout.get_driver().set_sensor(blk.get_sensor_id(), true);