diff --git a/protos/common_data.proto b/protos/common_data.proto index 8e22466..b6a0355 100644 --- a/protos/common_data.proto +++ b/protos/common_data.proto @@ -28,13 +28,23 @@ message TrainDynamicConfig{ float revolvingMassParam=8; //是否跳跃 bool jump=9; - //打滑(%) - float slip=10; - //前溜/后溜(m/s)(正数前溜,负数后溜) - int32 slide = 11; + //打滑加速度(m/s) 默认0 + float slipA=10; +// 打滑冲击率(m/s) 默认0 + float slipR=11; + // 打滑持续时间ms 默认0 + int32 slipD=12; + + // 空转加速度(m/s2),默认值:0 + float idlingA = 14; + // 空转冲击率(m/s3),默认值:0 + float idlingR = 15; +// 空转持续时间(ms),默认值:0 + int32 idlingD = 16; //过标/欠标(mm)(正数过标,负数欠标) - int32 stopSign=12; - float idling =13 ;//空转 + int32 stopSign=17; + //前溜/后溜(m/s)默认0 + float slide = 18; } //列车一端的状态 diff --git a/protos/device_state.proto b/protos/device_state.proto index c642cfc..bb82413 100644 --- a/protos/device_state.proto +++ b/protos/device_state.proto @@ -429,14 +429,22 @@ message TrainDynamicConfigMqtt{ string revolvingMassParam = 8; //是否跳跃 bool jump = 9; - //打滑(%) 原本数据:float - string slip = 10; - //前溜/后溜(m/s)(正数前溜,负数后溜) - int32 slide = 11; + //打滑加速度(m/s) 默认0 原本属性 float + string slipA=10; + // 打滑冲击率(m/s) 默认0 + string slipR=11; + // 打滑持续时间ms 默认0 + int32 slipD=12; + // 空转加速度(m/s2),默认值:0 原本属性 float + string idlingA = 14; + // 空转冲击率(m/s3),默认值:0 + string idlingR = 15; + // 空转持续时间(ms),默认值:0 + int32 idlingD = 16; //过标/欠标(mm)(正数过标,负数欠标) - int32 stopSign = 12; - //空转 % - string idling = 13 ; + int32 stopSign = 17; +// 前溜/后溜(m/s)(正数前溜,负数后溜),默认值:0 原本属性 float + string slide = 18 ; } //列车一端的状态 message TrainEndsStateMqtt{