【将动力学信息提出】

protos/device_state.proto

@@ -65,67 +65,73 @@ message StationState{
 message TrainState{
   //列车索引
   string id = 1;
-  //列车初始运行方向，即添加列车时
+  //列车初始link运行方向
-  //true  - 上行方向运行
-  //false - 下行方向运行
   bool up = 2;
-  //车头所在link的索引
-  string headLinkId = 3;
-  //车头所在link内的偏移量，单位为mm
-  int64 headLinkOffset = 4;
-  //车尾所在link的索引
-  string tailLinkId = 5;
-  //车尾所在link内的偏移量，单位为mm
-  int64 tailLinkOffset = 6;
-  //列车所占用的link的索引的列表
-  //顺序为从车头到车尾
-  repeated string occupiedLinkIndex = 7;
-  //生命信号
-  int32 heartbeat = 8;
-  //列车所在位置坡度值,1=1‰
-  int32 slope = 9;
-  //列车所在位置坡度走势,1=上坡true，0=下坡false
-  bool upslope = 10;
-  //列车当前运行方向,1 =上行true 0 =下行false
-  bool runningUp = 11;
-  //实际运行阻力（总）,1=1KN
-  float runningResistanceSum = 12;
-  //阻力1（空气阻力）,1=1KN
-  float airResistance = 13;
-  //阻力2（坡道阻力）,1=1KN
-  float rampResistance = 14;
-  //阻力3（曲线阻力）,1=1KN
-  float curveResistance = 15;
-  //列车运行速度,1=1km/h
-  float speed = 16;
-  //头车速传1速度值,1=1km/h
-  float headSensorSpeed1 = 17;
-  //头车速传2速度值,1=1km/h
-  float headSensorSpeed2 = 18;
-  //尾车速传1速度值,1=1km/h
-  float tailSensorSpeed1 = 19;
-  //尾车速度2速度值,1=1km/h
-  float tailSensorSpeed2 = 20;
-  //头车雷达速度值,1=1km/h
-  float headRadarSpeed = 21;
-  //尾车雷达速度值,1=1km/h
-  float tailRadarSpeed = 22;
   //列车长度,1=1mm
-  int64 trainLength = 23;
+  int64 trainLength = 3;
   //列车是否显示
-  bool show = 24;
+  bool show = 4;
   // 列车车头所在设备ID
-  string headDeviceId = 25;
+  string headDeviceId = 5;
   // 列车车头所在设备偏移量
-  int64 headOffset = 26;
+  int64 headOffset = 6;
   // 设备端口
-  string devicePort = 27;
+  string devicePort = 7;
   // 运行方向指向(区段：A-B,道岔：-> 岔心)
-  bool pointTo = 28;
+  bool pointTo = 8;
   // 运行上下行（公里标 上行：小 -> 大，下行：大 -> 小）
-  bool runDirection = 29;
+  bool runDirection = 9;
   // 列车车头方向
-  bool headDirection = 30;
+  bool headDirection = 10;
+  // 动力学信息
+  TrainDynamicState dynamicState = 11;
+  // 半实物信息
+  TrainVobcState vobcState = 12;
+}
+
+// 动力学列车状态
+message TrainDynamicState {
+	// 生命信号	每个周期+1
+	int32 heartbeat = 1;
+	//车头所在link的索引
+	string headLinkId = 2;
+	//车头所在link内的偏移量，单位为mm
+	int64 headLinkOffset = 3;
+	//车尾所在link的索引
+	string tailLinkId = 4;
+	//车尾所在link内的偏移量，单位为mm
+	int64 tailLinkOffset = 5;
+	//列车所占用的link的索引的列表
+	//顺序为从车头到车尾
+	repeated string occupiedLinkIndex = 6;
+	//列车所在位置坡度值,1=1‰
+	int32 slope = 7;
+	//列车所在位置坡度走势,1=上坡true，0=下坡false
+	bool upslope = 8;
+	//列车当前运行方向,1 =上行true 0 =下行false
+	bool runningUp = 9; 
+	//实际运行阻力（总）（N）totalResistance,1=1KN 
+	float runningResistanceSum = 10;
+	//阻力1（空气阻力）（N）airResistance,1=1KN 
+	int32 airResistance = 11;
+	//阻力2（坡道阻力）（N）slopeResistance,1=1KN
+	int32 rampResistance  = 11;
+	//阻力3（曲线阻力）（N）curveResistance,1=1KN
+	int32 curveResistance = 12;
+	//列车运行速度（m/s）speed,1=1km/h
+	float speed = 13;
+	//头车速传1速度值（m/s）headSensorSpeed1,1=1km/h
+	float headSpeed1 = 14; 
+	//头车速度2速度值（m/s）headSensorSpeed2,1=1km/h
+	float headSpeed2 = 15;
+	//尾车速传1速度值（m/s）tailSensorSpeed1,1=1km/h
+	float tailSpeed1 = 16;
+	//尾车速度2速度值（m/s）tailSensorSpeed2,1=1km/h
+	float tailSpeed2 = 17;
+	//头车雷达速度值（m/s）headRadarSpeed,1=1km/h
+	float headRadarSpeed = 18;
+	//尾车雷达速度值（m/s）tailRadarSpeed,1=1km/h
+	float tailRadarSpeed = 19;
 }
 
 // vobc发过来的列车信息