joylink/rts-sim-testing-message
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

列车11号线btm调整

Browse Source
This commit is contained in:
tiger_zhou 2024-09-05 09:21:48 +08:00
parent 7629f290ea
commit 3d7da35731
1 changed files with 14 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
protos/device_state.proto
View File

@ -191,11 +191,11 @@ message TrainState{
// 列车尾端所在设备端口 // 列车尾端所在设备端口
string tailDevicePort = 22; string tailDevicePort = 22;
// BTM状态 --即将过时 2024-08-12 // BTM状态 --即将过时 2024-08-12
BTMState btmState = 23; // BTMState btmState = 23;
TrainControlState tcc = 24; TrainControlState tcc = 24;
TrainConnState connState = 25; //列车连接第三方状态 TrainConnState connState = 25; //列车连接第三方状态
SensorSpeedPulseCount pluseCount = 26; SensorSpeedPulseCount pluseCount = 26;
VobcBtmState vobcBtm = 27;//vobc btm 状态 // VobcBtmState vobcBtm = 27;//vobc btm 状态
string oldLink = 28; string oldLink = 28;
int64 oldLinkOffset = 29; int64 oldLinkOffset = 29;
TrainBtmCache btmBaliseCache = 30; //列车应答器缓存 TrainBtmCache btmBaliseCache = 30; //列车应答器缓存
@ -204,49 +204,19 @@ message TrainState{
float TrainMaxAcc = 33; //列车最大加速度 float TrainMaxAcc = 33; //列车最大加速度
float TrainMaxBrake = 34; //列车最大减速度 float TrainMaxBrake = 34; //列车最大减速度
float TrainEmergencyBrake = 35;//列车紧急制动减速度 float TrainEmergencyBrake = 35;//列车紧急制动减速度
string projectCode = 36;
} }
//列车应答器缓存
message TrainBtmCache{ message TrainBtmCache{
uint32 dsn = 1; uint32 dsn = 1;
uint32 baliseCount = 2; //应答器计数（每过一个应答器加一，在同一个应答器内不变)（0~255） uint32 baliseCount = 2; //应答器计数（每过一个应答器加一，在同一个应答器内不变)（0~255）
uint32 messageCounter = 3; //报文计数器 (每解出一个报文加一)（0~255） uint32 messageCounter = 3; //报文计数器 (每解出一个报文加一)（0~255）
string resendBaliseId = 4; string resendBaliseId = 4;
repeated BTMState baliseList = 5; repeated BTMState baliseList = 5;
} }
message VobcBtmState{
//缓存应答器报文
repeated TelegramState telegramState = 1;
//key = 报文序列号
map<uint32,VobcBtmHistoryState> history = 2;
message TelegramState{
string baliseId = 1;
string telegram = 2;
//btm 和应答器的距离(mm)
// int64 arriveDistance = 3;
//btm 和应答器离开的距离(mm)
// int64 leaveDistance = 4;
int64 arriveTime = 5;
int64 leaveTime = 6;
}
message VobcBtmHistoryState{
//发送次数
uint32 sendCount = 1;
//报文序列号
uint32 packetSendId = 2;
uint32 vobcLifeNum = 3;
//给vobc发送的整体数据
string sendTelegram =4;
//应答器报文
string balisePacket = 5;
//是否是空包
bool isFreePacket = 6;
}
}
//速度传感器脉冲数 //速度传感器脉冲数
message SensorSpeedPulseCount{ message SensorSpeedPulseCount{
uint32 pulseCount1 = 1; uint32 pulseCount1 = 1;
@ -480,7 +450,13 @@ message TrainVobcState {
bool lightAtoSend = 84; bool lightAtoSend = 84;
//Ato运行级位 //Ato运行级位
AtoStepLevel atoStepLevel = 85; AtoStepLevel atoStepLevel = 85;
VobcBtmInfo vobcBtmInfo = 86;
message VobcBtmInfo{
uint32 btmId = 1;
uint32 vobcId = 2;
uint32 vobcLifeId = 3;
}
enum AtoStepLevel{ enum AtoStepLevel{
ATO_STEP_LEVEL_NONE=0; ATO_STEP_LEVEL_NONE=0;
ATO_STEP_LEVEL_1 = 1; ATO_STEP_LEVEL_1 = 1;
@ -640,8 +616,8 @@ message TrainMapState{
// 列车车尾所在设备端口 // 列车车尾所在设备端口
string tailDevicePort = 68; string tailDevicePort = 68;
// BTM状态 // BTM状态
BTMState btmState = 69; // BTMState btmState = 69;
TrainConnState connState = 70; //列车连接第三方状态 TrainConnState connState = 69; //列车连接第三方状态
} }
message BTMState { message BTMState {
@ -655,6 +631,7 @@ message BTMState {
int32 baliseType = 8; //应答器类型 与model的类型一致 int32 baliseType = 8; //应答器类型 与model的类型一致
bool hasData =9; //是否有应答器报文 bool hasData =9; //是否有应答器报文
uint32 resendCount = 10;//重发次数 uint32 resendCount = 10;//重发次数
uint32 packageDataSN = 11;//11号线需要验证报文序列号
} }
//动力学相关参数返回数据，因golang float类型数据序列化后丢失精度故使用string //动力学相关参数返回数据，因golang float类型数据序列化后丢失精度故使用string