/* $Id$
-This file is part of the MSP Märklin suite
-Copyright © 2009 Mikkosoft Productions, Mikko Rasa
+This file is part of R²C²
+Copyright © 2009-2010 Mikkosoft Productions, Mikko Rasa
Distributed under the GPL
*/
#include <msp/net/inet.h>
-#include "libmarklin/control.h"
-#include "libmarklin/layout.h"
-#include "libmarklin/locomotive.h"
-#include "libmarklin/locotype.h"
-#include "libmarklin/route.h"
+#include "libr2c2/driver.h"
+#include "libr2c2/route.h"
+#include "libr2c2/train.h"
+#include "libr2c2/vehicletype.h"
#include "server.h"
using namespace std;
using namespace Msp;
-namespace Marklin {
+namespace R2C2 {
-Server::Server(TrafficManager &tm):
- trfc_mgr(tm),
+Server::Server(Layout &l):
+ layout(l),
listen_sock(Net::INET),
event_disp(0)
{
- const list<Train *> &trains = trfc_mgr.get_trains();
- for(list<Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
- train_added(**i);
+ layout.get_driver().signal_power.connect(sigc::hide(sigc::mem_fun(this, &Server::driver_state_changed)));
+ layout.get_driver().signal_halt.connect(sigc::hide(sigc::mem_fun(this, &Server::driver_state_changed)));
+ layout.signal_emergency.connect(sigc::mem_fun(this, &Server::emergency));
+
+ layout.signal_train_added.connect(sigc::mem_fun(this, &Server::train_added));
+
+ const map<unsigned, Train *> &trains = layout.get_trains();
+ for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
+ train_added(*i->second);
listen_sock.listen(Net::InetAddr(0, 8315), 4);
listen_sock.signal_data_available.connect(sigc::mem_fun(this, &Server::incoming_connection));
connections.push_back(new Connection(*this, sock));
}
+void Server::driver_state_changed()
+{
+ DriverStatePacket pkt;
+ pkt.power = layout.get_driver().get_power();
+ pkt.halt = layout.get_driver().is_halted();
+ send(pkt);
+}
+
+void Server::emergency(const string &msg)
+{
+ EmergencyPacket pkt;
+ pkt.message = msg;
+ send(pkt);
+}
+
void Server::train_added(Train &train)
{
- Locomotive &loco = train.get_locomotive();
- train.signal_target_speed_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Server::train_speed_changed), sigc::ref(train)));
- loco.signal_reverse_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Server::train_reverse_changed), sigc::ref(train)));
- loco.signal_function_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Server::train_function_changed), sigc::ref(train)));
+ train.signal_control_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Server::train_control_changed), sigc::ref(train)));
+ train.signal_function_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Server::train_function_changed), sigc::ref(train)));
train.signal_route_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Server::train_route_changed), sigc::ref(train)));
train.signal_status_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Server::train_status_changed), sigc::ref(train)));
TrainInfoPacket pkt;
- pkt.address = loco.get_address();
- pkt.loco_type = loco.get_type().get_article_number();
+ pkt.address = train.get_address();
+ pkt.loco_type = train.get_locomotive_type().get_article_number().str();
pkt.name = train.get_name();
send(pkt);
}
-void Server::train_speed_changed(const Train &train, unsigned speed)
-{
- TrainSpeedPacket pkt;
- pkt.address = train.get_locomotive().get_address();
- pkt.speed = speed;
- pkt.reverse = train.get_locomotive().get_reverse();
- send(pkt);
-}
-
-void Server::train_reverse_changed(const Train &train, bool reverse)
+void Server::train_control_changed(const Train &train, const string &control, float value)
{
- TrainSpeedPacket pkt;
- pkt.address = train.get_locomotive().get_address();
- pkt.speed = train.get_target_speed();
- pkt.reverse = reverse;
+ TrainControlPacket pkt;
+ pkt.address = train.get_address();
+ pkt.control = control;
+ pkt.value = value;
send(pkt);
}
void Server::train_function_changed(const Train &train, unsigned, bool)
{
TrainFunctionPacket pkt;
- pkt.address = train.get_locomotive().get_address();
- pkt.functions = train.get_locomotive().get_functions();
+ pkt.address = train.get_address();
+ pkt.functions = train.get_functions();
send(pkt);
}
void Server::train_route_changed(const Train &train, const Route *route)
{
TrainRoutePacket pkt;
- pkt.address = train.get_locomotive().get_address();
+ pkt.address = train.get_address();
if(route)
pkt.route = route->get_name();
send(pkt);
void Server::train_status_changed(const Train &train, const string &status)
{
TrainStatusPacket pkt;
- pkt.address = train.get_locomotive().get_address();
+ pkt.address = train.get_address();
pkt.status = status;
send(pkt);
}
void Server::Connection::handshake_done()
{
- const map<string, Route *> &routes = server.trfc_mgr.get_layout().get_routes();
- for(map<string, Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
{
- RouteInfoPacket pkt;
- pkt.name = i->first;
+ DriverStatePacket pkt;
+ pkt.power = server.layout.get_driver().get_power();
+ pkt.halt = server.layout.get_driver().is_halted();
comm.send(pkt);
}
- const list<Train *> &trains = server.trfc_mgr.get_trains();
- for(list<Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
+ const set<Route *> &routes = server.layout.get_routes();
+ for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
+ if(!(*i)->is_temporary())
+ {
+ RouteInfoPacket pkt;
+ pkt.name = (*i)->get_name();
+ comm.send(pkt);
+ }
+
+ const map<unsigned, Train *> &trains = server.layout.get_trains();
+ for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
{
- Locomotive &loco = (*i)->get_locomotive();
+ const Train &train = *i->second;
{
TrainInfoPacket pkt;
- pkt.address = loco.get_address();
- pkt.loco_type = loco.get_type().get_article_number();
- pkt.name = (*i)->get_name();
+ pkt.address = train.get_address();
+ pkt.loco_type = train.get_locomotive_type().get_article_number().str();
+ pkt.name = train.get_name();
comm.send(pkt);
}
+ for(unsigned j=0;; ++j)
{
- TrainSpeedPacket pkt;
- pkt.address = loco.get_address();
- pkt.speed = (*i)->get_target_speed();
- pkt.reverse = loco.get_reverse();
+ const char *name = train.get_controller().enumerate_controls(j);
+ if(!name)
+ break;
+
+ TrainControlPacket pkt;
+ pkt.address = train.get_address();
+ pkt.control = name;
+ pkt.value = train.get_control(name);
comm.send(pkt);
}
{
TrainFunctionPacket pkt;
- pkt.address = loco.get_address();
- pkt.functions = loco.get_functions();
+ pkt.address = train.get_address();
+ pkt.functions = train.get_functions();
comm.send(pkt);
}
{
TrainStatusPacket pkt;
- pkt.address = loco.get_address();
- pkt.status = (*i)->get_status();
+ pkt.address = train.get_address();
+ pkt.status = train.get_status();
comm.send(pkt);
}
- if((*i)->get_route())
+ if(train.get_route())
{
TrainRoutePacket pkt;
- pkt.address = loco.get_address();
- pkt.route = (*i)->get_route()->get_name();
+ pkt.address = train.get_address();
+ pkt.route = train.get_route()->get_name();
comm.send(pkt);
}
}
stale = true;
}
-void Server::Connection::receive(const TrainSpeedPacket &pkt)
+void Server::Connection::receive(const DriverStatePacket &pkt)
+{
+ Driver &driver = server.layout.get_driver();
+ if(pkt.power!=driver.get_power())
+ driver.set_power(pkt.power);
+ if(pkt.halt!=driver.is_halted())
+ driver.halt(pkt.halt);
+}
+
+void Server::Connection::receive(const TrainControlPacket &pkt)
{
try
{
- Locomotive &loco = server.trfc_mgr.get_control().get_locomotive(pkt.address);
- Train &train = server.trfc_mgr.get_train_by_locomotive(loco);
- if(pkt.reverse!=loco.get_reverse())
- train.set_reverse(pkt.reverse);
- else
- train.set_speed(pkt.speed);
+ Train &train = server.layout.get_train(pkt.address);
+ train.set_control(pkt.control, pkt.value);
}
catch(const Exception &e)
{
{
try
{
- Locomotive &loco = server.trfc_mgr.get_control().get_locomotive(pkt.address);
+ Train &train = server.layout.get_train(pkt.address);
for(unsigned i=0; i<9; ++i)
- if(((pkt.functions^loco.get_functions())>>i)&1)
- loco.set_function(i, (pkt.functions>>i)&1);
+ if(((pkt.functions^train.get_functions())>>i)&1)
+ train.set_function(i, (pkt.functions>>i)&1);
}
catch(const Exception &e)
{
{
try
{
- Locomotive &loco = server.trfc_mgr.get_control().get_locomotive(pkt.address);
- Train &train = server.trfc_mgr.get_train_by_locomotive(loco);
+ Train &train = server.layout.get_train(pkt.address);
if(pkt.route.empty())
train.set_route(0);
else
{
- Route &route = server.trfc_mgr.get_layout().get_route(pkt.route);
+ Route &route = server.layout.get_route(pkt.route);
train.set_route(&route);
}
}
comm.send(pkt);
}
-} // namespace Marklin
+} // namespace R2C2
projects / r2c2.git / blobdiff