#include <msp/time/utils.h>
#include "control.h"
#include "except.h"
+#include "layout.h"
#include "route.h"
#include "tracktype.h"
#include "trafficmanager.h"
path = trfc_mgr.get_control().get_turnout(cur_track->get_turnout_id()).get_path();
offset += get_real_speed(loco.get_speed())*(dt/Time::sec);
- if(offset>cur_track->get_type().get_path_length(path))
+ float path_len = cur_track->get_type().get_path_length(path);
+ if(offset>path_len)
{
unsigned out = cur_track->traverse(cur_track_ep, path);
Track *next = cur_track->get_link(out);
- if(next)
- cur_track_ep = next->get_endpoint_by_link(*cur_track);
- cur_track = next;
- offset = 0;
+
+ bool ok = false;
+ for(list<BlockRef>::const_iterator i=cur_blocks.begin(); (!ok && i!=cur_blocks.end()); ++i)
+ ok = i->block->get_tracks().count(next);
+
+ if(ok)
+ {
+ if(next)
+ cur_track_ep = next->get_endpoint_by_link(*cur_track);
+ cur_track = next;
+ offset = 0;
+ }
+ else
+ offset = path_len-0.001;
}
if(cur_track)
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));
+ if(route)
+ st.push_back((DataFile::Statement("route"), route->get_name()));
+
+ if(!cur_blocks.empty())
+ {
+ list<BlockRef> blocks = cur_blocks;
+ if(loco.get_reverse())
+ reverse_blocks(blocks);
+
+ Block *prev = blocks.front().block->get_endpoints()[blocks.front().entry].link;
+ st.push_back((DataFile::Statement("block_hint"), prev->get_id()));
+
+ for(list<BlockRef>::const_iterator i=blocks.begin(); i!=blocks.end(); ++i)
+ st.push_back((DataFile::Statement("block"), i->block->get_id()));
+ }
}
void Train::locomotive_reverse_changed(bool)
for(list<BlockRef>::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
i->block->reserve(0);
rsv_blocks.clear();
- cur_blocks.reverse();
- for(list<BlockRef>::iterator i=cur_blocks.begin(); i!=cur_blocks.end(); ++i)
- i->entry = i->block->traverse(i->entry);
+ reverse_blocks(cur_blocks);
reserve_more();
if(cur_track)
if(state)
{
+ // Find the first sensor block from our reserved blocks that isn't this sensor
list<BlockRef>::iterator i;
for(i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
if(i->block->get_sensor_id() && i->block->get_sensor_id()!=addr)
if(i!=rsv_blocks.begin())
{
+ // Compute speed and update related state
float travel_time_secs = (Time::now()-last_entry_time)/Time::sec;
travel_speed = static_cast<int>(round(travel_dist/travel_time_secs*87*3.6/5))*5;
{
j->block->traverse(j->entry, &block_len);
travel_dist += block_len;
+
+ if(j->block->get_sensor_id()==addr)
+ set_position(j->block->get_endpoints()[j->entry]);
}
last_entry_time = Time::now();
pure_speed = true;
+ // Move blocks up to the next sensor to our current blocks
cur_blocks.splice(cur_blocks.end(), rsv_blocks, rsv_blocks.begin(), i);
- }
-
- for(i=cur_blocks.begin(); i!=cur_blocks.end(); ++i)
- if(i->block->get_sensor_id()==addr)
- set_position(i->block->get_endpoints()[i->entry]);
- if(target_speed && reserve_more()<2)
- update_speed();
+ // Try to get more blocks if we're moving
+ if(target_speed && reserve_more()<2)
+ update_speed();
+ }
}
else
{
+ // Find the first sensor in our current blocks that's still active
+ list<BlockRef>::iterator end = cur_blocks.begin();
for(list<BlockRef>::iterator i=cur_blocks.begin(); i!=cur_blocks.end(); ++i)
- if(unsigned b_addr = i->block->get_sensor_id())
+ if(i->block->get_sensor_id())
{
- if(b_addr==addr)
- {
- ++i;
- for(list<BlockRef>::iterator j=cur_blocks.begin(); j!=i; ++j)
- j->block->reserve(0);
- cur_blocks.erase(cur_blocks.begin(), i);
- }
- break;
+ if(trfc_mgr.get_control().get_sensor(i->block->get_sensor_id()).get_state())
+ break;
+ else
+ end = i;
}
+
+ if(end!=cur_blocks.begin())
+ {
+ // Free blocks up to the last inactive sensor
+ ++end;
+ for(list<BlockRef>::iterator i=cur_blocks.begin(); i!=end; ++i)
+ i->block->reserve(0);
+ cur_blocks.erase(cur_blocks.begin(), end);
+ }
+ // XXX Should watch for trfc_mgr.signal_block_reserved rather than sensors
if(target_speed && pending_block && addr==pending_block->get_sensor_id())
reserve_more();
}
blocks.clear();
}
+void Train::reverse_blocks(list<BlockRef> &blocks) const
+{
+ blocks.reverse();
+ for(list<BlockRef>::iterator i=blocks.begin(); i!=blocks.end(); ++i)
+ i->entry = i->block->traverse(i->entry);
+}
+
Train::RealSpeed::RealSpeed():
speed(0),
Train::Loader::Loader(Train &t):
- DataFile::BasicLoader<Train>(t)
+ DataFile::BasicLoader<Train>(t),
+ prev_block(0)
{
+ add("block", &Loader::block);
+ add("block_hint", &Loader::block_hint);
add("name", &Train::name);
add("real_speed", &Loader::real_speed);
+ add("route", &Loader::route);
+}
+
+void Train::Loader::block(unsigned id)
+{
+ Block &blk = obj.trfc_mgr.get_block(id);
+ int entry = -1;
+ if(prev_block)
+ entry = blk.get_endpoint_by_link(*prev_block);
+ if(entry<0)
+ entry = 0;
+
+ blk.reserve(&obj);
+ obj.cur_blocks.push_back(BlockRef(&blk, entry));
+ obj.status = "Stopped";
+ obj.set_position(blk.get_endpoints()[entry]);
+
+ prev_block = &blk;
+}
+
+void Train::Loader::block_hint(unsigned id)
+{
+ prev_block = &obj.trfc_mgr.get_block(id);
}
void Train::Loader::real_speed(unsigned i, float speed, float weight)
obj.real_speed[i].weight = weight;
}
+void Train::Loader::route(const string &n)
+{
+ obj.route = &obj.trfc_mgr.get_layout().get_route(n);
+}
+
} // namespace Marklin
projects / r2c2.git / blobdiff