列车11号线btm调整

This commit is contained in:
tiger_zhou 2024-09-05 09:21:48 +08:00
parent 7629f290ea
commit 3d7da35731

View File

@ -191,11 +191,11 @@ message TrainState{
//
string tailDevicePort = 22;
// BTM状态 -- 2024-08-12
BTMState btmState = 23;
// BTMState btmState = 23;
TrainControlState tcc = 24;
TrainConnState connState = 25; //
SensorSpeedPulseCount pluseCount = 26;
VobcBtmState vobcBtm = 27;//vobc btm
// VobcBtmState vobcBtm = 27;//vobc btm
string oldLink = 28;
int64 oldLinkOffset = 29;
TrainBtmCache btmBaliseCache = 30; //
@ -204,49 +204,19 @@ message TrainState{
float TrainMaxAcc = 33; //
float TrainMaxBrake = 34; //
float TrainEmergencyBrake = 35;//
string projectCode = 36;
}
//
message TrainBtmCache{
uint32 dsn = 1;
uint32 baliseCount = 2; //)0~255
uint32 messageCounter = 3; // ()0~255
string resendBaliseId = 4;
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{
uint32 pulseCount1 = 1;
@ -480,7 +450,13 @@ message TrainVobcState {
bool lightAtoSend = 84;
//Ato运行级位
AtoStepLevel atoStepLevel = 85;
VobcBtmInfo vobcBtmInfo = 86;
message VobcBtmInfo{
uint32 btmId = 1;
uint32 vobcId = 2;
uint32 vobcLifeId = 3;
}
enum AtoStepLevel{
ATO_STEP_LEVEL_NONE=0;
ATO_STEP_LEVEL_1 = 1;
@ -640,8 +616,8 @@ message TrainMapState{
//
string tailDevicePort = 68;
// BTM状态
BTMState btmState = 69;
TrainConnState connState = 70; //
// BTMState btmState = 69;
TrainConnState connState = 69; //
}
message BTMState {
@ -655,6 +631,7 @@ message BTMState {
int32 baliseType = 8; // model的类型一致
bool hasData =9; //
uint32 resendCount = 10;//
uint32 packageDataSN = 11;//11线
}
//golang float类型数据序列化后丢失精度故使用string