X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnetwork%2Fpackets.h;h=1982eea5966525e07d4978b45e182daf0ab41af8;hb=66a30fdf63df6ae092fb3d335c30a37e4e6ef40d;hp=31fd56d11350ff8390585cdfa7c97745956b1319;hpb=2fe7cbcb761487bc7409b93b372da6f8ab3c581e;p=r2c2.git

diff --git a/source/network/packets.h b/source/network/packets.h
index 31fd56d..1982eea 100644
--- a/source/network/packets.h
+++ b/source/network/packets.h
@@ -1,29 +1,33 @@
-/* $Id$
+#ifndef R2C2_NET_PACKETS_H_
+#define R2C2_NET_PACKETS_H_
 
-This file is part of the MSP Märklin suite
-Copyright © 2009  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
+#include <string>
 
-#ifndef MARKLINNET_PACKETS_H_
-#define MARKLINNET_PACKETS_H_
+namespace R2C2 {
 
-#include <string>
+struct DriverStatePacket
+{
+	char power;
+	char halt;
+};
 
-namespace Marklin {
+struct EmergencyPacket
+{
+	std::string message;
+};
 
 struct TrainInfoPacket
 {
 	unsigned address;
-	unsigned loco_type;
+	std::string loco_type;
 	std::string name;
 };
 
-struct TrainSpeedPacket
+struct TrainControlPacket
 {
 	unsigned address;
-	unsigned speed;
-	char reverse;
+	std::string control;
+	float value;
 };
 
 struct TrainFunctionPacket
@@ -32,6 +36,13 @@ struct TrainFunctionPacket
 	unsigned functions;
 };
 
+struct TrainAIControlPacket
+{
+	unsigned address;
+	float target_speed;
+	char reverse;
+};
+
 struct TrainStatusPacket
 {
 	unsigned address;
@@ -54,6 +65,6 @@ struct ErrorPacket
 	std::string message;
 };
 
-} // namespace Marklin
+} // namespace R2C2
 
 #endif