Merge branch 'master' of http://120.46.212.6:3000/joylink/rts-sim-testing-message
This commit is contained in:
commit
514b899f04
@ -2,6 +2,7 @@ syntax = "proto3";
|
||||
import "stationLayoutGraphics.proto";
|
||||
import "common_data.proto";
|
||||
import "request.proto";
|
||||
|
||||
package state;
|
||||
option java_package = "club.joylink.bjrtss.ats.verify.protos";
|
||||
option java_outer_classname = "DeviceStateProto";
|
||||
@ -189,7 +190,7 @@ message TrainState{
|
||||
int64 tailOffset = 21;
|
||||
// 列车尾端所在设备端口
|
||||
string tailDevicePort = 22;
|
||||
// BTM状态
|
||||
// BTM状态 --即将过时 2024-08-12
|
||||
BTMState btmState = 23;
|
||||
TrainControlState tcc = 24;
|
||||
TrainConnState connState = 25; //列车连接第三方状态
|
||||
@ -197,7 +198,18 @@ message TrainState{
|
||||
VobcBtmState vobcBtm = 27;//vobc btm 状态
|
||||
string oldLink = 28;
|
||||
int64 oldLinkOffset = 29;
|
||||
TrainBtmCache btmBaliseCache = 30; //列车应答器缓存
|
||||
}
|
||||
message TrainBtmCache{
|
||||
uint32 dsn = 1;
|
||||
uint32 baliseCount = 2; //应答器计数(每过一个应答器加一,在同一个应答器内不变)(0~255)
|
||||
uint32 messageCounter = 3; //报文计数器 (每解出一个报文加一)(0~255)
|
||||
string resendBaliseId = 4;
|
||||
|
||||
repeated BTMState baliseList = 5;
|
||||
}
|
||||
|
||||
|
||||
message VobcBtmState{
|
||||
|
||||
//缓存应答器报文
|
||||
@ -456,6 +468,8 @@ message TrainVobcState {
|
||||
bool lightDir2 = 80;
|
||||
//驾驶室激活
|
||||
bool lightDriverActive = 81;
|
||||
//列车连接半实物是否初始化
|
||||
bool trainConnInitComplate = 82;
|
||||
// request.TrainControl.Direction historyDir = 76; //历史行驶方向,用于列车操控时,方向旋钮更改方向时使用,不在前端显示
|
||||
}
|
||||
|
||||
@ -609,21 +623,18 @@ 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)
|
||||
uint32 messageCounter = 3; //报文计数器 (每解出一个报文加一)(0~255)
|
||||
string telegram = 4;//应答器用户报文(16进制字符串)
|
||||
|
||||
int64 distance =5; //BTM天线中心到应答器的距离,mm
|
||||
bool aboveBalise = 6; //BTM天线即将经过应答器
|
||||
string baliseTelegramForPcSimResend = 7; //列车pc仿真暂存应答器回复数据
|
||||
string telegram128 = 8 ;//应答器报文128(16进制字符串)
|
||||
string baliseId = 9;
|
||||
bool isSend = 10;//记录是否发送过
|
||||
message BTMState {
|
||||
string telegram = 1;//应答器用户报文(16进制字符串)
|
||||
bool aboveBalise = 2; //BTM天线即将经过应答器
|
||||
string baliseTelegramForPcSimResend = 3; //列车pc仿真暂存应答器回复数据
|
||||
string telegram128 = 4 ;//应答器报文128(16进制字符串)
|
||||
string baliseId = 5;
|
||||
bool isSend = 6;//记录是否发送过
|
||||
bool unpack =7; //解包是否成功
|
||||
int32 baliseType = 8; //应答器类型 与model的类型一致
|
||||
bool hasData =9; //是否有应答器报文
|
||||
uint32 resendCount = 10;//重发次数
|
||||
}
|
||||
|
||||
//动力学相关参数返回数据,因golang float类型数据序列化后丢失精度故使用string
|
||||
|
Loading…
Reference in New Issue
Block a user