X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrain.cpp;h=63a14e991c9e814a525ce43139ccc9366d42ea64;hb=651698847d5293cfb15b6fb23a394701388c0151;hp=e992f418ed4cc324a4ff84d900ded8ac37700a0d;hpb=80dcfa55c913037066e43fa115ae56fa51b974f2;p=r2c2.git diff --git a/source/libmarklin/train.cpp b/source/libmarklin/train.cpp index e992f41..63a14e9 100644 --- a/source/libmarklin/train.cpp +++ b/source/libmarklin/train.cpp @@ -1,7 +1,7 @@ /* $Id$ This file is part of the MSP Märklin suite -Copyright © 2006-2009 Mikkosoft Productions, Mikko Rasa +Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -9,12 +9,11 @@ Distributed under the GPL #include #include #include -#include "control.h" -#include "except.h" +#include "driver.h" #include "layout.h" +#include "locotype.h" #include "route.h" #include "tracktype.h" -#include "trafficmanager.h" #include "train.h" using namespace std; @@ -22,11 +21,14 @@ using namespace Msp; namespace Marklin { -Train::Train(TrafficManager &tm, Locomotive &l): - trfc_mgr(tm), - loco(l), +Train::Train(Layout &l, const LocoType &t, unsigned a): + layout(l), + loco_type(t), + address(a), pending_block(0), target_speed(0), + current_speed(0), + reverse(false), route(0), status("Unplaced"), travel_dist(0), @@ -35,20 +37,20 @@ Train::Train(TrafficManager &tm, Locomotive &l): real_speed(15), cur_track(0) { - trfc_mgr.add_train(this); + layout.add_train(*this); - loco.signal_reverse_changed.connect(sigc::mem_fun(this, &Train::locomotive_reverse_changed)); + layout.get_driver().add_loco(address); + layout.get_driver().signal_loco_speed.connect(sigc::mem_fun(this, &Train::loco_speed_event)); + layout.get_driver().signal_loco_function.connect(sigc::mem_fun(this, &Train::loco_func_event)); - const map &sensors = trfc_mgr.get_control().get_sensors(); - for(map::const_iterator i=sensors.begin(); i!=sensors.end(); ++i) - i->second->signal_state_changed.connect(sigc::bind(sigc::mem_fun(this, &Train::sensor_event), i->second)); + layout.signal_block_reserved.connect(sigc::mem_fun(this, &Train::block_reserved)); + layout.get_driver().signal_sensor.connect(sigc::mem_fun(this, &Train::sensor_event)); + layout.get_driver().signal_turnout.connect(sigc::mem_fun(this, &Train::turnout_event)); +} - const map &turnouts = trfc_mgr.get_control().get_turnouts(); - for(map::const_iterator i=turnouts.begin(); i!=turnouts.end(); ++i) - { - i->second->signal_path_changing.connect(sigc::bind(sigc::mem_fun(this, &Train::turnout_path_changing), i->second)); - i->second->signal_path_changed.connect(sigc::bind(sigc::mem_fun(this, &Train::turnout_path_changed), i->second)); - } +Train::~Train() +{ + layout.remove_train(*this); } void Train::set_name(const string &n) @@ -67,8 +69,8 @@ void Train::set_speed(unsigned speed) target_speed = speed; if(!target_speed) { - trfc_mgr.get_control().set_timer(3*Time::sec).signal_timeout.connect( - sigc::bind_return(sigc::bind(sigc::mem_fun(this, &Train::release_blocks), sigc::ref(rsv_blocks)), false)); + pending_block = 0; + stop_timeout = Time::now()+(800+current_speed*150)*Time::msec; } else reserve_more(); @@ -81,7 +83,43 @@ void Train::set_speed(unsigned speed) void Train::set_reverse(bool rev) { - loco.set_reverse(rev); + if(rev==reverse) + return; + + if(target_speed) + { + set_speed(0); + return; + } + else if(stop_timeout) + return; + + layout.get_driver().set_loco_reverse(address, rev); + + release_blocks(rsv_blocks); + reverse_blocks(cur_blocks); + + if(cur_track) + { + unsigned path = cur_track->get_active_path(); + cur_track_ep = cur_track->traverse(cur_track_ep, path); + offset = cur_track->get_type().get_path_length(path)-offset; + } +} + +void Train::set_function(unsigned func, bool state) +{ + if(!loco_type.get_functions().count(func)) + throw InvalidParameterValue("Invalid function"); + if(func<5) + layout.get_driver().set_loco_function(address, func, state); + else + layout.get_driver().set_loco_function(address+1, func-4, state); +} + +bool Train::get_function(unsigned func) const +{ + return (functions>>func)&1; } void Train::set_route(const Route *r) @@ -119,9 +157,7 @@ bool Train::free_block(Block &block) { if(nsens<1) return false; - for(list::iterator j=i; j!=rsv_blocks.end(); ++j) - j->block->reserve(0); - rsv_blocks.erase(i, rsv_blocks.end()); + release_blocks(rsv_blocks, i, rsv_blocks.end()); update_speed(); return true; } @@ -145,16 +181,17 @@ int Train::get_entry_to_block(Block &block) const void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt) { - if(try_reserve && t>try_reserve) - reserve_more(); + if(stop_timeout && t>=stop_timeout) + { + release_blocks(rsv_blocks); + stop_timeout = Time::TimeStamp(); + } if(cur_track) { - unsigned path = 0; - if(cur_track->get_turnout_id()) - path = trfc_mgr.get_control().get_turnout(cur_track->get_turnout_id()).get_path(); + unsigned path = cur_track->get_active_path(); - offset += get_real_speed(loco.get_speed())*(dt/Time::sec); + offset += get_real_speed(current_speed)*(dt/Time::sec); float path_len = cur_track->get_type().get_path_length(path); if(offset>path_len) { @@ -193,7 +230,7 @@ void Train::save(list &st) const if(!cur_blocks.empty()) { list blocks = cur_blocks; - if(loco.get_reverse()) + if(reverse) reverse_blocks(blocks); Block *prev = blocks.front().block->get_endpoints()[blocks.front().entry].link; @@ -204,28 +241,35 @@ void Train::save(list &st) const } } -void Train::locomotive_reverse_changed(bool) +void Train::loco_speed_event(unsigned addr, unsigned speed, bool rev) { - for(list::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i) - i->block->reserve(0); - rsv_blocks.clear(); - reverse_blocks(cur_blocks); - reserve_more(); - - if(cur_track) + if(addr==address) { - unsigned path = 0; - if(unsigned turnout = cur_track->get_turnout_id()) - path = trfc_mgr.get_control().get_turnout(turnout).get_path(); - cur_track_ep = cur_track->traverse(cur_track_ep, path); - offset = cur_track->get_type().get_path_length(path)-offset; + current_speed = speed; + reverse = rev; + + signal_speed_changed.emit(current_speed); + signal_reverse_changed.emit(reverse); } } -void Train::sensor_event(bool state, Sensor *sensor) +void Train::loco_func_event(unsigned addr, unsigned func, bool state) { - unsigned addr = sensor->get_address(); + if(addr==address || (addr==address+1 && loco_type.get_max_function()>4)) + { + if(addr==address+1) + func += 4; + if(state) + functions |= 1<::iterator i=cur_blocks.begin(); i!=cur_blocks.end(); ++i) if(i->block->get_sensor_id()) { - if(trfc_mgr.get_control().get_sensor(i->block->get_sensor_id()).get_state()) + if(layout.get_driver().get_sensor(i->block->get_sensor_id())) break; else end = i; @@ -284,54 +328,20 @@ void Train::sensor_event(bool state, Sensor *sensor) { // Free blocks up to the last inactive sensor ++end; - for(list::iterator i=cur_blocks.begin(); i!=end; ++i) - i->block->reserve(0); - cur_blocks.erase(cur_blocks.begin(), end); + release_blocks(cur_blocks, 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(); } } -void Train::turnout_path_changing(unsigned, Turnout *turnout) +void Train::turnout_event(unsigned addr, bool) { - unsigned tid = turnout->get_address(); - for(list::const_iterator i=cur_blocks.begin(); i!=cur_blocks.end(); ++i) - if(i->block->get_turnout_id()==tid) - throw TurnoutBusy(this); - - unsigned nsens = 0; - for(list::const_iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i) - { - if(i->block->get_turnout_id()==tid) - { - if(nsens<1) - throw TurnoutBusy(this); - break; - } - else if(i->block->get_sensor_id()) - ++nsens; - } + if(pending_block && addr==pending_block->get_turnout_id()) + reserve_more(); } -void Train::turnout_path_changed(unsigned, Turnout *turnout) +void Train::block_reserved(const Block &block, const Train *train) { - unsigned tid = turnout->get_address(); - for(list::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i) - if(i->block->get_turnout_id()==tid) - { - while(i!=rsv_blocks.end()) - { - i->block->reserve(0); - i = rsv_blocks.erase(i); - } - reserve_more(); - return; - } - - if(pending_block && tid==pending_block->get_turnout_id()) + if(&block==pending_block && !train) reserve_more(); } @@ -365,11 +375,15 @@ unsigned Train::reserve_more() break; int entry = link->get_endpoint_by_link(*last->block); + if(entry<0) + throw LogicError("Block links are inconsistent!"); if(!link->reserve(this)) { - // If we found another train going in the same direction as us, we can keep the blocks we got + // If we found another train and it's not headed straight for us, we can keep the blocks we got int other_entry = link->get_train()->get_entry_to_block(*link); - if(other_entry==entry || link->traverse(entry)==link->traverse(other_entry)) + if(other_entry<0) + throw LogicError("Block reservation inconsistency"); + if(static_cast(entry)!=link->traverse(other_entry)) { good = last; good_sens = nsens; @@ -383,21 +397,16 @@ unsigned Train::reserve_more() const Block::Endpoint &ep = link->get_endpoints()[entry]; const Endpoint &track_ep = ep.track->get_type().get_endpoints()[ep.track_ep]; - if(track_ep.paths&(track_ep.paths-1)) - { - // We're facing the points - keep the blocks reserved so far - good = last; - good_sens = nsens; - } - - Turnout &turnout = trfc_mgr.get_control().get_turnout(link->get_turnout_id()); + // Keep the blocks reserved so far, as either us or the other train can diverge + good = last; + good_sens = nsens; // Figure out what path we'd like to take on the turnout int path = -1; if(route) path = route->get_turnout(link->get_turnout_id()); if(path<0) - path = turnout.get_path(); + path = ep.track->get_active_path(); if(!((track_ep.paths>>path)&1)) { for(unsigned i=0; track_ep.paths>>i; ++i) @@ -405,12 +414,12 @@ unsigned Train::reserve_more() path = i; } - if(path!=turnout.get_path()) + if(path!=static_cast(ep.track->get_active_path())) { // The turnout is set to wrong path - switch and wait for it link->reserve(0); pending_block = link; - turnout.set_path(path); + ep.track->set_active_path(path); break; } } @@ -441,10 +450,12 @@ unsigned Train::reserve_more() void Train::update_speed() { + Driver &driver = layout.get_driver(); + + unsigned speed; if(!target_speed) { - loco.set_speed(0); - try_reserve = Time::TimeStamp(); + speed = 0; set_status("Stopped"); } else @@ -457,25 +468,24 @@ void Train::update_speed() unsigned slow_speed = find_speed(0.1); // 31.3 km/h if(nsens==0) { - loco.set_speed(0); + speed = 0; pure_speed = false; - try_reserve = Time::now()+2*Time::sec; set_status("Blocked"); } else if(nsens==1 && target_speed>slow_speed) { - loco.set_speed(slow_speed); + speed = slow_speed; pure_speed = false; - try_reserve = Time::now()+2*Time::sec; set_status("Slow"); } else { - loco.set_speed(target_speed); - try_reserve = Time::TimeStamp(); + speed = target_speed; set_status(format("Traveling %d kmh", travel_speed)); } } + + driver.set_loco_speed(address, speed); } float Train::get_real_speed(unsigned i) const @@ -550,9 +560,17 @@ void Train::set_position(const Block::Endpoint &bep) void Train::release_blocks(list &blocks) { - for(list::iterator i=blocks.begin(); i!=blocks.end(); ++i) - i->block->reserve(0); - blocks.clear(); + release_blocks(blocks, blocks.begin(), blocks.end()); +} + +void Train::release_blocks(list &blocks, list::iterator begin, list::iterator end) +{ + while(begin!=end) + { + Block *block = begin->block; + blocks.erase(begin++); + block->reserve(0); + } } void Train::reverse_blocks(list &blocks) const @@ -581,14 +599,14 @@ Train::Loader::Loader(Train &t): { add("block", &Loader::block); add("block_hint", &Loader::block_hint); - add("name", &Train::name); + add("name", &Loader::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); + Block &blk = obj.layout.get_block(id); int entry = -1; if(prev_block) entry = blk.get_endpoint_by_link(*prev_block); @@ -597,7 +615,7 @@ void Train::Loader::block(unsigned id) blk.reserve(&obj); obj.cur_blocks.push_back(BlockRef(&blk, entry)); - obj.status = "Stopped"; + obj.set_status("Stopped"); obj.set_position(blk.get_endpoints()[entry]); prev_block = &blk; @@ -605,7 +623,12 @@ void Train::Loader::block(unsigned id) void Train::Loader::block_hint(unsigned id) { - prev_block = &obj.trfc_mgr.get_block(id); + prev_block = &obj.layout.get_block(id); +} + +void Train::Loader::name(const string &n) +{ + obj.set_name(n); } void Train::Loader::real_speed(unsigned i, float speed, float weight) @@ -616,7 +639,7 @@ void Train::Loader::real_speed(unsigned i, float speed, float weight) void Train::Loader::route(const string &n) { - obj.route = &obj.trfc_mgr.get_layout().get_route(n); + obj.set_route(&obj.layout.get_route(n)); } } // namespace Marklin