From c23d536144a67142602ccd8d05425d7b1ef26768 Mon Sep 17 00:00:00 2001 From: tiger_zhou Date: Tue, 2 Apr 2024 17:32:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=97=E8=BD=A6=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=97=E8=BD=A6=E5=8F=82=E6=95=B0=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/request.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protos/request.proto b/protos/request.proto index 5d08efd..8411c36 100644 --- a/protos/request.proto +++ b/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;// 紧急制动 From 5dd8f8963e28e79012656f95999016ad503ae43a Mon Sep 17 00:00:00 2001 From: tiger_zhou Date: Tue, 2 Apr 2024 18:17:16 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=97=E8=BD=A6=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=88=97=E8=BD=A6?= =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E4=B8=89=E6=96=B9=E6=98=A0=E5=B0=84=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=8F=8Aws=E8=BF=94=E5=9B=9E=E5=88=97=E8=BD=A6?= =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/device_state.proto | 107 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 104 insertions(+), 3 deletions(-) diff --git a/protos/device_state.proto b/protos/device_state.proto index f544b63..5776f3d 100644 --- a/protos/device_state.proto +++ b/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 @@ -742,12 +843,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{ From ee7cf291112f13273080ee430588e9a9b9a72d04 Mon Sep 17 00:00:00 2001 From: joylink_fanyuhong <18706759286@163.com> Date: Wed, 3 Apr 2024 10:32:56 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B4=97=E8=BD=A6=E6=9C=BA=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/stationLayoutGraphics.proto | 1 + 1 file changed, 1 insertion(+) diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index 4baad82..a135cd4 100644 --- a/protos/stationLayoutGraphics.proto +++ b/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 {