动力学列车数据配置

protos/device_state.proto

@@ -156,6 +156,8 @@ message TrainState{
   int64 controlDelayTime = 15;
   // 列车轮径
   int32 wheelDiameter = 16;
+  //列车动力学配置
+  TrainDynamicConfig trainDynamicConfig = 17;
 }
 
 // 动力学列车状态
@@ -206,42 +208,53 @@ message TrainDynamicState {
   // 加速
   float acceleration = 22;
 
-  TrainDynamicConfig trainDynamicConfig = 23;
+
 }
 //动力学列车配置
 message TrainDynamicConfig{
   //列车的质量（100=1ton）
-  int32 mass=1;
+//  int32 mass=1;
   //基本阻力参数A
-  float baseResistanceParamA=2;
+  float baseResistanceParamA=1;
 //  基本阻力参数B
-  float baseResistanceParamB=3;
+  float baseResistanceParamB=2;
 //  基本阻力参数C
-  float baseResistanceParamC=4;
+  float baseResistanceParamC=3;
       //曲线阻力参数R1
-  float curveResistanceParamR1=5;
+  float curveResistanceParamR1=4;
 //  曲线阻力参数R2
-  float curveResistanceParamR2=6;
+  float curveResistanceParamR2=5;
 //  曲线阻力参数R3
-  float curveResistanceParamR3=7;
+  float curveResistanceParamR3=6;
   //  曲线阻力参数R4
-  float curveResistanceParamR4=8;
+  float curveResistanceParamR4=7;
       //旋转质量参数
-  float revolvingMassParam=9;
+  float revolvingMassParam=8;
       //是否跳跃
-  bool jump=10;
+  bool jump=9;
       //打滑（%）
-  float slip=11;
+  float slip=10;
       //前溜/后溜（mm）（正数前溜，负数后溜）
-  int32 slide = 12;
+  int32 slide = 11;
   //过标/欠标（mm）（正数过标，负数欠标）
-  int32 stopSign=13;
+  int32 stopSign=12;
+  //列车A端
+  TrainEndsState trainEndsA = 13;
+  //列车B端
+  TrainEndsState trainEndsB = 14;
+
+}
+//列车一端的状态
+message TrainEndsState{
+  //速度传感器
+  bool speedSensorEnableA = 1;
+  bool speedSensorEnableB = 2;
   //雷达是否有效
-  bool radarEnable = 14;
+  bool radarEnable = 3;
   //雷达测速数值
-  float radarCheckSpeed = 15;
+  float radarCheckSpeed = 4;
   //雷达检测时间(秒)
-  int32 radarCheckTime = 16;
+  int32 radarCheckTime = 5;
 }
 
 // vobc发过来的列车信息