Merge remote-tracking branch 'origin/master'

protos/device_state.proto

@@ -6,6 +6,7 @@ package state;
 option java_package = "club.joylink.bjrtss.ats.verify.protos";
 option java_outer_classname = "DeviceStateProto";
 option go_package = "joylink.club/bj-rtsts-server/dto/state_proto";
+//option go_package = "dto/state_proto;";
 
 
 //状态定义面向物理层即只定义物理状态，不定义逻辑层状态
@@ -121,6 +122,17 @@ message StationState{
   //车站索引
   uint32  id = 1;
 }
+
+//列车连接状态
+message TrainConnState{
+  bool conn = 1;
+  TrainConnType connType = 2;
+  enum TrainConnType{
+    NONE = 0;//未知连接
+    VOBC = 1; //半实物
+    PC_SIM = 2; //PC仿真
+  }
+}
 //列车状态
 message TrainState{
   //列车索引
@@ -169,6 +181,8 @@ message TrainState{
   string tailDevicePort = 22;
   // BTM状态
   BTMState btmState = 23;
+  //列车连接三方状态
+  TrainConnState connState = 24;
 }
 
 // 动力学列车状态
@@ -422,6 +436,7 @@ message TrainMapState{
   string tailDevicePort = 68;
   // BTM状态
   BTMState btmState = 69;
+  TrainConnState connState = 70;
 }
 
 message BTMState {