修改列车BTM信息的报文为最后收到的报文;修改BTM探测逻辑执行不需要【车载应答器天线功率放大器】为开启状态;修改车尾位置计算bug

This commit is contained in:
thesai 2024-02-21 14:54:16 +08:00
parent ced6f855df
commit 8820c9f2ab

View File

@ -165,8 +165,10 @@ message TrainState{
uint32 tailDeviceId = 20; uint32 tailDeviceId = 20;
// //
int64 tailOffset = 21; int64 tailOffset = 21;
//
string tailDevicePort = 22;
// BTM状态 // BTM状态
BTMState btmState = 22; BTMState btmState = 23;
} }
// //
@ -452,11 +454,11 @@ message TrainDynamicConfigMqtt{
// //
bool jump = 9; bool jump = 9;
//(m/s) 0 float //(m/s) 0 float
string slipA=10; string slipA = 10;
// (m/s) 0 // (m/s) 0
string slipR=11; string slipR = 11;
// ms 0 // ms 0
int32 slipD=12; int32 slipD = 12;
// m/s20 float // m/s20 float
string idlingA = 14; string idlingA = 14;
// m/s30 // m/s30
@ -465,7 +467,7 @@ message TrainDynamicConfigMqtt{
int32 idlingD = 16; int32 idlingD = 16;
///mm ///mm
int32 stopSign = 17; int32 stopSign = 17;
// /m/s0 float // /m/s0 float
string slide = 18 ; string slide = 18 ;
} }
// //
@ -502,7 +504,7 @@ message ButtonState {
uint32 id = 1; uint32 id = 1;
bool down = 2; bool down = 2;
bool active = 3; // bool active = 3; //
// bool bypass = 4; // // bool bypass = 4; //
} }
// //
@ -541,7 +543,7 @@ message AsdState {
message KeyState { message KeyState {
uint32 id = 1; uint32 id = 1;
int32 gear = 2; int32 gear = 2;
// bool bypass = 3; // // bool bypass = 3; //
} }
// //