列车控制连接

protos/device_state.proto

@@ -128,12 +128,13 @@ message TrainConnState{
   bool conn = 1;//连接状态
   TrainConnType connType = 2;
   uint32 TrainControlMapId = 3; //关联的列车控制mapId
+  string typeName = 4;//连接名称
   enum TrainConnType{
     NONE = 0;//未知连接
     VOBC = 1; //半实物
     PC_SIM = 2; //PC仿真
-    PC_SIM_A = 3; //PC仿真
-    PC_SIM_B = 4; //PC仿真
+    /*PC_SIM_A = 3; //PC仿真
+    PC_SIM_B = 4; //PC仿真*/
   }
 }
 //列车状态
@@ -345,20 +346,20 @@ message TrainVobcState {
 //    ATO发车按钮
   bool atoSendTrainBtn = 31;
 //  列车完整性
-  bool trainIntegrity = 32;
+//  bool trainIntegrity = 32;
 //    车载ATP/ATO旁路状态
     bool atpOrAtoBypassState = 33;
 //    车辆牵引已切除状态
     bool trainTractionCuted = 34;
 //    障碍物检测按钮
     bool obstacleCheckBtn = 35;
-//    驾驶室激活反馈按钮
-    bool driverActiveReportBtn = 36;
+//    驾驶室激活反馈
+//    bool driverActiveReportBtn = 36;
 //    制动重故障按钮
     bool brakeHeavyFault = 37;
-//    左门状态按钮
+//    左门状态
     bool leftDoorState = 38;
-//    右门状态按钮
+//    右门状态
   bool rightDoorState = 39;
 //  唤醒按钮
   bool wakeUpBtn = 40;
@@ -385,7 +386,7 @@ message TrainVobcState {
   // MM人开人关
   bool doorModeMM=51;
   //    外部紧急制动反馈
-  bool outerEmergentBrakeReport = 52;
+//  bool outerEmergentBrakeReport = 52;
   //    车门外指示灯
   bool trainDoorOutLed = 53;
 
@@ -434,6 +435,16 @@ message TrainVobcState {
     uint32 mockInfo = 75; //车载接口输出的模拟量信息
 //  atp 切除开关
   bool atpCutSwitch = 76;
+  //紧急制动指示灯
+    bool lightEmergencyBrakingStatus = 77;
+    //切牵引指示灯
+    bool lightTractionSafetyCircuit = 78;
+    //车头方向指示灯1
+    bool lightDir1 = 79;
+    //车头方向指示灯2
+    bool lightDir2 = 80;
+    //驾驶室激活
+    bool lightDriverActive = 81;
 //  request.TrainControl.Direction historyDir = 76; //历史行驶方向，用于列车操控时，方向旋钮更改方向时使用，不在前端显示
 }
 
@@ -885,14 +896,14 @@ message SimulationThirdPartyApiServiceState {
 //列车控制状态
 message TrainControlState{
 
-  repeated ControlButton buttons = 1;
+  map<string,ControlButton> buttons = 1;
   repeated DriverKeySwitch driverKey = 2; //驾驶端激活
   DirectionKeySwitch dirKey = 3; //接车运行方向
   PushHandler pushHandler = 4; //牵引制动手柄
   map<string, ControlLight> lightMaps = 5;
   int64 lineInitTimeStamp12 = 6; //12号线列出初始化时间戳
   bool line12ConnErr = 7;//12号线连接错误，因为12号线atp故障（此时atp需要重启）时，还是会发送数据通过此次属性标记atp状态情况(多次观察atp故障时，atp输出数字量返回的数据最后一个直接是0)
-  uint32 initCount = 8;//初始化计数器
+//  uint32 initCount = 8;//初始化计数器
   message ControlButton{
     uint32 id = 1;
     bool passed = 3;