/* $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
*/
#include <msp/strings/formatter.h>
#include <msp/time/units.h>
#include <msp/time/utils.h>
-#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;
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),
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<unsigned, Sensor *> &sensors = trfc_mgr.get_control().get_sensors();
- for(map<unsigned, Sensor *>::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));
-
- const map<unsigned, Turnout *> &turnouts = trfc_mgr.get_control().get_turnouts();
- for(map<unsigned, Turnout *>::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));
- }
+ 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));
+}
- trfc_mgr.signal_block_reserved.connect(sigc::mem_fun(this, &Train::block_reserved));
+Train::~Train()
+{
+ layout.remove_train(*this);
}
void Train::set_name(const string &n)
if(!target_speed)
{
pending_block = 0;
- trfc_mgr.get_control().set_timer(3*Time::sec).signal_timeout.connect(
- sigc::bind_return(sigc::bind(
- sigc::mem_fun(this, static_cast<void (Train::*)(list<BlockRef> &)>(&Train::release_blocks)),
- sigc::ref(rsv_blocks)), false));
+ stop_timeout = Time::now()+(800+current_speed*150)*Time::msec;
}
else
reserve_more();
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)
return -1;
}
-void Train::tick(const Time::TimeStamp &, const Time::TimeDelta &dt)
+void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt)
{
+ 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)
{
if(!cur_blocks.empty())
{
list<BlockRef> blocks = cur_blocks;
- if(loco.get_reverse())
+ if(reverse)
reverse_blocks(blocks);
Block *prev = blocks.front().block->get_endpoints()[blocks.front().entry].link;
}
}
-void Train::locomotive_reverse_changed(bool)
+void Train::loco_speed_event(unsigned addr, unsigned speed, bool rev)
{
- release_blocks(rsv_blocks);
- 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<<func;
+ else
+ functions &= ~(1<<func);
+ signal_function_changed.emit(func, state);
+ }
+}
+
+void Train::sensor_event(unsigned addr, bool state)
+{
if(state)
{
// Find the first sensor block from our reserved blocks that isn't this sensor
if(pure_speed)
{
- RealSpeed &rs = real_speed[loco.get_speed()];
+ RealSpeed &rs = real_speed[current_speed];
rs.add(travel_dist/travel_time_secs, travel_time_secs);
}
for(list<BlockRef>::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;
}
}
-void Train::turnout_path_changing(unsigned, Turnout *turnout)
-{
- unsigned tid = turnout->get_address();
- for(list<BlockRef>::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<BlockRef>::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;
- }
-}
-
-void Train::turnout_path_changed(unsigned, Turnout *turnout)
+void Train::turnout_event(unsigned addr, bool)
{
- unsigned tid = turnout->get_address();
- for(list<BlockRef>::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
- if(i->block->get_turnout_id()==tid)
- {
- release_blocks(rsv_blocks, i, rsv_blocks.end());
- reserve_more();
- return;
- }
-
- if(pending_block && tid==pending_block->get_turnout_id())
+ if(pending_block && addr==pending_block->get_turnout_id())
reserve_more();
}
good = last;
good_sens = nsens;
- Turnout &turnout = trfc_mgr.get_control().get_turnout(link->get_turnout_id());
-
// 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)
path = i;
}
- if(path!=turnout.get_path())
+ if(path!=static_cast<int>(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;
}
}
void Train::update_speed()
{
+ Driver &driver = layout.get_driver();
+
+ unsigned speed;
if(!target_speed)
{
- loco.set_speed(0);
+ speed = 0;
set_status("Stopped");
}
else
unsigned slow_speed = find_speed(0.1); // 31.3 km/h
if(nsens==0)
{
- loco.set_speed(0);
+ speed = 0;
pure_speed = false;
set_status("Blocked");
}
else if(nsens==1 && target_speed>slow_speed)
{
- loco.set_speed(slow_speed);
+ speed = slow_speed;
pure_speed = false;
set_status("Slow");
}
else
{
- loco.set_speed(target_speed);
+ 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
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);
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)
void Train::Loader::route(const string &n)
{
- obj.set_route(&obj.trfc_mgr.get_layout().get_route(n));
+ obj.set_route(&obj.layout.get_route(n));
}
} // namespace Marklin
projects / r2c2.git / blobdiff