-/* $Id$
-
-This file is part of the MSP Märklin suite
-Copyright © 2009 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
#include "packets.h"
#include "protocol.h"
-namespace Marklin {
+namespace R2C2 {
Protocol::Protocol()
{
+ add<DriverStatePacket>() (&DriverStatePacket::power)
+ (&DriverStatePacket::halt);
+ add<EmergencyPacket>() (&EmergencyPacket::message);
add<TrainInfoPacket>() (&TrainInfoPacket::address)
(&TrainInfoPacket::loco_type) (&TrainInfoPacket::name);
- add<TrainSpeedPacket>() (&TrainSpeedPacket::address)
- (&TrainSpeedPacket::speed) (&TrainSpeedPacket::reverse);
+ add<TrainControlPacket>() (&TrainControlPacket::address)
+ (&TrainControlPacket::control) (&TrainControlPacket::value);
add<TrainFunctionPacket>() (&TrainFunctionPacket::address)
(&TrainFunctionPacket::functions);
add<TrainStatusPacket>() (&TrainStatusPacket::address)
add<ErrorPacket>() (&ErrorPacket::message);
}
-} // namespace Marklin
+} // namespace R2C2