Export AI control parameters over the network

[r2c2.git] / source / network / protocol.cpp

diff --git a/source/network/protocol.cpp b/source/network/protocol.cpp
index f8e13beb4ac5f4156780a415d9b24cecfd7be2fb..f7a690997088b12d07fa831250a8265dfdc4d630 100644 (file)
--- a/source/network/protocol.cpp
+++ b/source/network/protocol.cpp
@@ -1,23 +1,21 @@
-/* $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<TrainAIControlPacket>() (&TrainAIControlPacket::address)
+               (&TrainAIControlPacket::target_speed) (&TrainAIControlPacket::reverse);
        add<TrainStatusPacket>() (&TrainStatusPacket::address)
                (&TrainStatusPacket::status);
        add<RouteInfoPacket>() (&RouteInfoPacket::name);
@@ -26,4 +24,4 @@ Protocol::Protocol()
        add<ErrorPacket>() (&ErrorPacket::message);
 }
 
-} // namespace Marklin
+} // namespace R2C2