From fd4d5ee6384611ac8f9002c558e954bb65acdaed Mon Sep 17 00:00:00 2001 From: tiger_zhou Date: Mon, 5 Aug 2024 16:32:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=BD=A6=E6=8E=A7=E5=88=B6=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E7=89=88=E6=9C=AC=E8=AE=B0=E5=BD=951?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/device_state.proto | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/protos/device_state.proto b/protos/device_state.proto index b298101..d575994 100644 --- a/protos/device_state.proto +++ b/protos/device_state.proto @@ -187,9 +187,10 @@ message TrainState{ BTMState btmState = 23; TrainControlState tcc = 24; TrainConnState connState = 25; //列车连接第三方状态 - SensorSpeedPulseCount pluseCount = 26; - - VobcBtmState vobcBtm = 27;//vobc btm 状态 + SensorSpeedPulseCount pluseCount = 26; + VobcBtmState vobcBtm = 27;//vobc btm 状态 + string oldLink = 28; + int64 oldLinkOffset = 29; } message VobcBtmState{ @@ -227,6 +228,9 @@ message VobcBtmState{ message SensorSpeedPulseCount{ uint32 pulseCount1 = 1; uint32 pulseCount2 = 2; + repeated float pulseCount3 = 3; + repeated float pulseCount4 = 4; + } // 动力学列车状态 @@ -597,7 +601,9 @@ message TrainMapState{ BTMState btmState = 69; TrainConnState connState = 70; //列车连接第三方状态 } - +message BtmStateCache{ + repeated BTMState btmStateList = 1; +} message BTMState { uint32 dataSerialNumber = 1; //数据流水号,0~255变化,每次加一 uint32 baliseCount = 2; //应答器计数(每过一个应答器加一,在同一个应答器内不变)(0~255) @@ -608,6 +614,8 @@ message BTMState { bool aboveBalise = 6; //BTM天线即将经过应答器 string baliseTelegramForPcSimResend = 7; //列车pc仿真暂存应答器回复数据 string telegram128 = 8 ;//应答器报文128(16进制字符串) + string baliseId = 9; + bool isSend = 10;//记录是否发送过 } //动力学相关参数返回数据,因golang float类型数据序列化后丢失精度故使用string