Merge remote-tracking branch 'origin/master'

protos/device_state.proto

@@ -125,7 +125,7 @@ message StationState{
 
 //列车连接状态
 message TrainConnState{
-  bool conn = 1;
+  bool conn = 1;//连接状态
   TrainConnType connType = 2;
   uint32 TrainControlMapId = 3; //关联的列车控制mapId
   enum TrainConnType{
@@ -293,6 +293,104 @@ message TrainVobcState {
   bool udpInterruption = 25;
   // 更新时间
   int64 updateTime = 26;
+  //强制门允许
+  bool forceDoorAllow = 27;
+//    模式降级按钮
+  bool modeLevelDownBtn = 28;
+//    确认按钮
+  bool confirmBtn = 29;
+//    模式升级按钮
+  bool modeLevelUpBtn = 30;
+//    ATO发车按钮
+  bool atoSendTrainBtn = 31;
+//  列车完整性
+  bool trainIntegrity = 32;
+//    车载ATP/ATO旁路状态
+    bool atpOrAtoBypassState = 33;
+//    车辆牵引已切除状态
+//    bool trainTractionCuted = 34;
+//    障碍物检测按钮
+    bool obstacleCheckBtn = 35;
+//    驾驶室激活反馈按钮
+    bool driverActiveReportBtn = 36;
+//    制动重故障按钮
+    bool brakeHeavyFault = 37;
+//    左门状态按钮
+    bool leftDoorStateBtn = 38;
+//    右门状态按钮
+  bool rightDoorStateBtn = 39;
+//  唤醒按钮
+  bool wakeUpBtn = 40;
+//  检修按钮
+  bool overhaulBtn = 41;
+//  欠压按钮
+  bool undervoltageBtn = 42;
+//  休眠按钮
+  bool  sleepBtn = 43;
+//  紧急手柄拉下
+  bool   emergentHandleDown = 44;
+//  车门锁闭状态
+  bool  doorLockState =45;
+//  逃生门状态
+  bool  lifeDoorState=46;
+//  车辆低压上电状态
+  bool trainLowPowerResetState=47;
+//  ATP上电按钮
+  bool atpPowerOnBtn=48;
+// AA自动开关门
+  bool doorModeAA=49;
+//AM自开人关
+  bool doorModeAM=50;
+  // MM人开人关
+  bool doorModeMM=51;
+  //    外部紧急制动反馈
+  bool outerEmergentBrakeReport = 52;
+  //    车门外指示灯
+  bool trainDoorOutLed = 53;
+
+  //本端ATP控车
+  bool localAtpControl = 54;
+  //ATO制动命令输出
+  bool atoBrakeCommand = 55;
+//    ATO牵引命令输出
+  bool atoTractionCommandOut = 56;
+  //ATO惰行命令输出
+  bool atoLazyCommandOut = 57;
+////    AR灯命令
+//  bool arLightCommand = 58;
+  //ATO保持制动
+  bool atoAlwaysBrake=59;
+  //ATO开左门
+  bool  atoOpenLeftDoor=60;
+  //ATO开右门
+  bool atoOpenRightDoor=61;
+  //ATO关左门
+  bool atoCloseLeftDoor=62;
+//    零速信号
+  bool noSpeedSigle = 63;
+//    列车启动指示灯
+  bool trainStartedLed = 64;
+//    常用制动
+  bool mostUseBrake = 65;
+//    过分相输出
+  bool splittingOut = 66;
+//  模式继电器
+  bool modeRelay = 67;
+//      牵引有效
+  bool tractionEffective=68;
+//  制动有效
+  bool brakeEffective=69;
+//      制动隔离
+  bool brakeQuarantine=70;
+//  停放制动缓解
+  bool stopNotAllBrake=71;
+//    ATO牵引指令1
+  bool atoTractionCommand1 = 72;
+//    ATO牵引指令2
+      bool atoTractionCommand2=73;
+//    ATO牵引指令3
+    bool atoTractionCommand3=74;
+    uint32 mockInfo = 75; //车载接口输出的模拟量信息
 }
 
 // 发给前端的列车状态
@@ -446,6 +544,9 @@ message BTMState {
   uint32 baliseCount = 2; //应答器计数（每过一个应答器加一，在同一个应答器内不变)（0~255）
   uint32 messageCounter = 3; //报文计数器 (每解出一个报文加一)（0~255）
   string telegram = 4;//报文（16进制字符串）
+  int64 distance =5;  //BTM天线中心到应答器的距离，mm
+  bool aboveBalise  = 6;  //BTM天线即将经过应答器
+  string baliseTelegramForPcSimResend = 7; //列车pc仿真暂存应答器回复数据
 }
 
 //动力学相关参数返回数据，因golang float类型数据序列化后丢失精度故使用string
@@ -743,12 +844,12 @@ message TrainControlState{
   message DriverKeySwitch{
     uint32 id = 1;
     bool val = 2;  //0=关，1=开
-    request.DriverType dt = 3;
+//    request.DriverType dt = 3;
 
   }
   message  DirectionKeySwitch{
     uint32 id = 1;
-    uint32 val = 2;  //0=关，1=开,2=中间
+    uint32 val = 2;  //0=后，1=前,2=中位
   }
   //牵引制动手柄
   message PushHandler{

protos/request.proto

@@ -189,7 +189,7 @@ message PsdParam {
 //列车控制
 message TrainControl{
   string simulationId = 1;         // 仿真id
-  uint32 trainId = 2;
+  string trainId = 2;
   uint32 deviceId = 3;//设备id
   TrainControlType controlType = 4;
   EmergentButton button = 5;// 紧急制动

protos/stationLayoutGraphics.proto

@@ -601,6 +601,7 @@ message CarWashing {
   uint32 linkSection = 3; //关联区段
   repeated uint32 centralizedStations = 4; // 集中站Id列表;
   uint32 duanNum = 5; //段数
+  uint32 width = 6; // 洗车机宽度
 }
 /** 信标 */
 message Beacon {