X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrain.cpp;h=0c741722d7b7dfecf749be196183bbb1df3a3e58;hb=a4566a4a23ff676f11a90615e8e468ef50107946;hp=24ccfa2448bf1abf814afc4d728da7c935a9908b;hpb=a9180bc4bb7ff4c403e206cc2c785ff32544a0d6;p=r2c2.git diff --git a/source/libmarklin/train.cpp b/source/libmarklin/train.cpp index 24ccfa2..0c74172 100644 --- 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)); @@ -57,10 +59,14 @@ Train::Train(Layout &l, const LocoType &t, unsigned a): 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)); + + control->signal_control_changed.connect(signal_control_changed); } Train::~Train() { + delete control; + delete timetable; for(vector::iterator i=vehicles.begin(); i!=vehicles.end(); ++i) delete *i; layout.remove_train(*this); @@ -90,7 +96,6 @@ const Vehicle &Train::get_vehicle(unsigned i) const void Train::set_control(const string &n, float v) { control->set_control(n, v); - signal_control_changed.emit(n, control->get_control(n).value); } void Train::set_active(bool a) @@ -197,6 +202,7 @@ void Train::place(Block &block, unsigned entry) release_blocks(cur_blocks); set_active(false); + accurate_position = false; if(!block.reserve(this)) { @@ -301,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); @@ -309,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); @@ -317,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; @@ -335,16 +343,21 @@ void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt) if(!active) set_active(true); - Track *track = vehicles[0]->get_track(); + Vehicle &vehicle = *(reverse ? vehicles.back() : vehicles.front()); + Track *track = vehicle.get_track(); bool ok = false; for(list::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) + vehicle.advance(reverse ? -d : d); + else if(accurate_position) { - float d = get_real_speed(current_speed)*(dt/Time::sec); - vehicles[0]->advance(reverse ? -d : d); + 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) @@ -354,6 +367,11 @@ void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt) void Train::save(list &st) const { st.push_back((DataFile::Statement("name"), name)); + + for(vector::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)); @@ -388,6 +406,7 @@ void Train::loco_speed_event(unsigned addr, unsigned speed, bool) { current_speed = speed; speed_changing = false; + pure_speed = false; } } @@ -412,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::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; @@ -450,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) @@ -477,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 { @@ -648,6 +684,12 @@ unsigned Train::reserve_more() last = &rsv_blocks.back(); } + // Make any sensorless blocks at the beginning immediately current + list::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; } @@ -784,6 +826,7 @@ Train::Loader::Loader(Train &t): add("real_speed", &Loader::real_speed); add("route", &Loader::route); add("timetable", &Loader::timetable); + add("vehicle", &Loader::vehicle); } void Train::Loader::block(unsigned id) @@ -799,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); @@ -837,4 +880,12 @@ void Train::Loader::timetable() load_sub(*obj.timetable); } +void Train::Loader::vehicle(unsigned n) +{ + const VehicleType &vtype = obj.layout.get_catalogue().get_vehicle(n); + Vehicle *veh = new Vehicle(obj.layout, vtype); + obj.vehicles.back()->attach_back(*veh); + obj.vehicles.push_back(veh); +} + } // namespace Marklin