From 05a29ea5a8e268307878f0cc9d176a3e5e0b47d9 Mon Sep 17 00:00:00 2001 From: fan Date: Mon, 29 Jan 2024 14:17:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=BD=A6=E5=8A=A8=E5=8A=9B=E5=AD=A6?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bj-rtss-message | 2 +- src/api/Simulation.ts | 8 +- src/api/TrainModelApi.ts | 8 +- .../draw-app/dialogs/SetTrainParam.vue | 68 ++++++- src/components/line-app/infos/TrainInfo.vue | 16 +- src/configs/UrlManage.ts | 2 +- src/drawApp/graphics/TrainInteraction.ts | 44 +++- src/graphics/train/Train.ts | 16 +- src/pages/TrainModelManage.vue | 88 ++++++-- src/protos/common_data.ts | 188 ++++++++++++----- src/protos/device_state.ts | 190 +++++++++++++----- 11 files changed, 488 insertions(+), 142 deletions(-) diff --git a/bj-rtss-message b/bj-rtss-message index 099d395..0d5ac24 160000 --- a/bj-rtss-message +++ b/bj-rtss-message @@ -1 +1 @@ -Subproject commit 099d39589833465c09f01d83cd31d3f063b43089 +Subproject commit 0d5ac2472f2fd6648582bd66b72d2a01cce72dd3 diff --git a/src/api/Simulation.ts b/src/api/Simulation.ts index cd75ccb..dbbeff0 100644 --- a/src/api/Simulation.ts +++ b/src/api/Simulation.ts @@ -352,9 +352,13 @@ export interface TrainConfig { jump: boolean; revolvingMassParam: number; slide: number; - slip: number; + slipA: number; + slipR: number; + slipD: number; stopSign: number; - idling: number; + idlingA: number; + idlingR: number; + idlingD: number; }, trainEndsA: { radarCheckSpeedDiff: number; diff --git a/src/api/TrainModelApi.ts b/src/api/TrainModelApi.ts index 56c2024..9c17c0b 100644 --- a/src/api/TrainModelApi.ts +++ b/src/api/TrainModelApi.ts @@ -38,9 +38,13 @@ export interface TrainConfigData { jump: boolean; revolvingMassParam: number; slide: number; - slip: number; + slipA: number; + slipR: number; + slipD: number; stopSign: number; - idling: number; + idlingA: number; + idlingR: number; + idlingD: number; } export interface TrainCreateParams { diff --git a/src/components/draw-app/dialogs/SetTrainParam.vue b/src/components/draw-app/dialogs/SetTrainParam.vue index 446a72c..b5b783b 100644 --- a/src/components/draw-app/dialogs/SetTrainParam.vue +++ b/src/components/draw-app/dialogs/SetTrainParam.vue @@ -304,10 +304,30 @@
+
+
+ +
+
+
@@ -325,10 +345,30 @@
+
+
+ +
+
+
@@ -406,9 +446,13 @@ const model = reactive({ jump: false, revolvingMassParam: 0, slide: 0, - slip: 0, + slipA: 0, + slipR: 0, + slipD: 0, stopSign: 0, - idling: 0, + idlingA: 0, + idlingR: 0, + idlingD: 0, }, length: 0, wheelDiameter: 0, @@ -458,9 +502,13 @@ function initModel() { jump: trainState.jump, revolvingMassParam: trainState.revolvingMassParam, slide: trainState.slide, - slip: trainState.slip, + slipA: trainState.slipA, + slipR: trainState.slipR, + slipD: trainState.slipD, stopSign: trainState.stopSign, - idling: trainState.idling, + idlingA: trainState.idlingA, + idlingR: trainState.idlingR, + idlingD: trainState.idlingD, }; model.length = trainState.trainLength; model.wheelDiameter = trainState.wheelDiameter; diff --git a/src/components/line-app/infos/TrainInfo.vue b/src/components/line-app/infos/TrainInfo.vue index 7b40edf..e65e2f6 100644 --- a/src/components/line-app/infos/TrainInfo.vue +++ b/src/components/line-app/infos/TrainInfo.vue @@ -206,10 +206,14 @@ const list2: KeyType[] = [ { label: '曲线阻力参数R4', key: 'curveResistanceParamR4' }, { label: '旋转质量参数', key: 'revolvingMassParam' }, { label: '是否跳跃', key: 'jump', formatFn: upFormat }, - { label: '打滑', key: 'slip', formatFn: percentFormat }, + { label: '打滑加速度', key: 'slipA', formatFn: accelerationFormat }, + { label: '打滑冲击率', key: 'slipA', formatFn: chongjilvFormat }, + { label: '打滑持续时间', key: 'slipA', formatFn: haomiaoFormat }, { label: '前溜/后溜', key: 'slide', formatFn: msFormat }, { label: '过标/欠标', key: 'stopSign', formatFn: mmFormat }, - { label: '空转', key: 'idling', formatFn: percentFormat }, + { label: '空转加速度', key: 'idlingA', formatFn: accelerationFormat }, + { label: '空转冲击率', key: 'idlingR', formatFn: chongjilvFormat }, + { label: '空转持续时间', key: 'idlingD', formatFn: haomiaoFormat }, ]; const list3: KeyType[] = [ // 半实物信息 @@ -357,7 +361,13 @@ function speedFormat(v: number) { } function accelerationFormat(v: number) { const n = floatDecimal(v); - return `${n} m/s`; + return `${n} m/s²`; +} +function chongjilvFormat(v: number) { + return `${v} m/s³`; +} +function haomiaoFormat(v: number) { + return `${v} ms`; } function trainLengthFormat(v: number) { return `${v / 1000} m`; diff --git a/src/configs/UrlManage.ts b/src/configs/UrlManage.ts index 67f331b..176d469 100644 --- a/src/configs/UrlManage.ts +++ b/src/configs/UrlManage.ts @@ -8,7 +8,7 @@ function getHost(): string { // return '192.168.3.47:9091'; // return '192.168.3.37:9091'; // return '192.168.3.15:9091'; // 张骞 - // return '192.168.3.93:9091'; + return '192.168.3.93:9091'; // return '192.168.3.37:9091'; //卫志宏 return '192.168.3.233:9091'; } diff --git a/src/drawApp/graphics/TrainInteraction.ts b/src/drawApp/graphics/TrainInteraction.ts index fd37d92..a196d82 100644 --- a/src/drawApp/graphics/TrainInteraction.ts +++ b/src/drawApp/graphics/TrainInteraction.ts @@ -450,23 +450,47 @@ export class TrainState extends GraphicStateBase implements ITrainState { set jump(v: boolean) { this.states.trainDynamicConfig.jump = v; } - get slip(): number { - return +this.states.trainDynamicConfig.slip; + get slipA(): number { + return +this.states.trainDynamicConfig.slipA; } - set slip(v: number) { - this.states.trainDynamicConfig.slip = v + ''; + set slipA(v: number) { + this.states.trainDynamicConfig.slipA = v + ''; + } + get slipR(): number { + return +this.states.trainDynamicConfig.slipR; + } + set slipR(v: number) { + this.states.trainDynamicConfig.slipR = v + ''; + } + get slipD(): number { + return this.states.trainDynamicConfig.slipD; + } + set slipD(v: number) { + this.states.trainDynamicConfig.slipD = v; } get slide(): number { - return this.states.trainDynamicConfig.slide; + return +this.states.trainDynamicConfig.slide; } set slide(v: number) { - this.states.trainDynamicConfig.slide = v; + this.states.trainDynamicConfig.slide = v + ''; } - get idling(): number { - return +this.states.trainDynamicConfig.idling; + get idlingA(): number { + return +this.states.trainDynamicConfig.idlingA; } - set idling(v: number) { - this.states.trainDynamicConfig.idling = v + ''; + set idlingA(v: number) { + this.states.trainDynamicConfig.idlingA = v + ''; + } + get idlingR(): number { + return +this.states.trainDynamicConfig.idlingR; + } + set idlingR(v: number) { + this.states.trainDynamicConfig.idlingR = v + ''; + } + get idlingD(): number { + return this.states.trainDynamicConfig.idlingD; + } + set idlingD(v: number) { + this.states.trainDynamicConfig.idlingD = v; } get stopSign(): number { return this.states.trainDynamicConfig.stopSign; diff --git a/src/graphics/train/Train.ts b/src/graphics/train/Train.ts index 8a3a513..1011210 100644 --- a/src/graphics/train/Train.ts +++ b/src/graphics/train/Train.ts @@ -165,14 +165,22 @@ export interface ITrainState extends GraphicState { set revolvingMassParam(v: number); get jump(): boolean; set jump(v: boolean); - get slip(): number; - set slip(v: number); + get slipA(): number; + set slipA(v: number); + get slipR(): number; + set slipR(v: number); + get slipD(): number; + set slipD(v: number); get slide(): number; set slide(v: number); get stopSign(): number; set stopSign(v: number); - get idling(): number; - set idling(v: number); + get idlingA(): number; + set idlingA(v: number); + get idlingR(): number; + set idlingR(v: number); + get idlingD(): number; + set idlingD(v: number); get aSpeedSensorEnableA(): boolean; set aSpeedSensorEnableA(v: boolean); get aSpeedSensorEnableB(): boolean; diff --git a/src/pages/TrainModelManage.vue b/src/pages/TrainModelManage.vue index 567b9ad..5c3de55 100644 --- a/src/pages/TrainModelManage.vue +++ b/src/pages/TrainModelManage.vue @@ -256,6 +256,8 @@ @@ -263,8 +265,30 @@
+
+
+ +
+
+
@@ -272,6 +296,8 @@ @@ -279,8 +305,30 @@
+
+
+ +
+
+
@@ -496,9 +544,13 @@ function onReset() { editInfo.trainConfigData.jump = false; editInfo.trainConfigData.revolvingMassParam = 0.01; editInfo.trainConfigData.slide = 0; - editInfo.trainConfigData.slip = 0; + editInfo.trainConfigData.slipA = 0; + editInfo.trainConfigData.slipR = 0; + editInfo.trainConfigData.slipD = 0; editInfo.trainConfigData.stopSign = 0; - editInfo.trainConfigData.idling = 0; + editInfo.trainConfigData.idlingA = 0; + editInfo.trainConfigData.idlingR = 0; + editInfo.trainConfigData.idlingD = 0; createForm.value?.resetValidation(); } @@ -547,9 +599,13 @@ interface EditCreateItem extends TrainCreateParams { jump: boolean; revolvingMassParam: number; slide: number; - slip: number; + slipA: number; + slipR: number; + slipD: number; stopSign: number; - idling: number; + idlingA: number; + idlingR: number; + idlingD: number; }; } @@ -574,9 +630,13 @@ const editInfo = reactive({ jump: false, revolvingMassParam: 0.01, slide: 0, - slip: 0, + slipA: 0, + slipR: 0, + slipD: 0, stopSign: 0, - idling: 0, + idlingA: 0, + idlingR: 0, + idlingD: 0, }, }); function editData(row: TrainItem) { @@ -607,9 +667,13 @@ function editData(row: TrainItem) { editInfo.trainConfigData.revolvingMassParam = res.trainConfigData.revolvingMassParam; editInfo.trainConfigData.slide = res.trainConfigData.slide; - editInfo.trainConfigData.slip = res.trainConfigData.slip; + editInfo.trainConfigData.slipA = res.trainConfigData.slipA; + editInfo.trainConfigData.slipR = res.trainConfigData.slipR; + editInfo.trainConfigData.slipD = res.trainConfigData.slipD; editInfo.trainConfigData.stopSign = res.trainConfigData.stopSign; - editInfo.trainConfigData.idling = res.trainConfigData.idling; + editInfo.trainConfigData.idlingA = res.trainConfigData.idlingA; + editInfo.trainConfigData.idlingR = res.trainConfigData.idlingR; + editInfo.trainConfigData.idlingD = res.trainConfigData.idlingD; } createFormShow.value = true; }) diff --git a/src/protos/common_data.ts b/src/protos/common_data.ts index 430157e..11e8f8e 100644 --- a/src/protos/common_data.ts +++ b/src/protos/common_data.ts @@ -17,10 +17,14 @@ export namespace common { curveResistanceParamR4?: number; revolvingMassParam?: number; jump?: boolean; - slip?: number; - slide?: number; + slipA?: number; + slipR?: number; + slipD?: number; + idlingA?: number; + idlingR?: number; + idlingD?: number; stopSign?: number; - idling?: number; + slide?: number; }) { super(); pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls); @@ -52,17 +56,29 @@ export namespace common { if ("jump" in data && data.jump != undefined) { this.jump = data.jump; } - if ("slip" in data && data.slip != undefined) { - this.slip = data.slip; + if ("slipA" in data && data.slipA != undefined) { + this.slipA = data.slipA; } - if ("slide" in data && data.slide != undefined) { - this.slide = data.slide; + if ("slipR" in data && data.slipR != undefined) { + this.slipR = data.slipR; + } + if ("slipD" in data && data.slipD != undefined) { + this.slipD = data.slipD; + } + if ("idlingA" in data && data.idlingA != undefined) { + this.idlingA = data.idlingA; + } + if ("idlingR" in data && data.idlingR != undefined) { + this.idlingR = data.idlingR; + } + if ("idlingD" in data && data.idlingD != undefined) { + this.idlingD = data.idlingD; } if ("stopSign" in data && data.stopSign != undefined) { this.stopSign = data.stopSign; } - if ("idling" in data && data.idling != undefined) { - this.idling = data.idling; + if ("slide" in data && data.slide != undefined) { + this.slide = data.slide; } } } @@ -120,29 +136,53 @@ export namespace common { set jump(value: boolean) { pb_1.Message.setField(this, 9, value); } - get slip() { + get slipA() { return pb_1.Message.getFieldWithDefault(this, 10, 0) as number; } - set slip(value: number) { + set slipA(value: number) { pb_1.Message.setField(this, 10, value); } - get slide() { + get slipR() { return pb_1.Message.getFieldWithDefault(this, 11, 0) as number; } - set slide(value: number) { + set slipR(value: number) { pb_1.Message.setField(this, 11, value); } - get stopSign() { + get slipD() { return pb_1.Message.getFieldWithDefault(this, 12, 0) as number; } - set stopSign(value: number) { + set slipD(value: number) { pb_1.Message.setField(this, 12, value); } - get idling() { - return pb_1.Message.getFieldWithDefault(this, 13, 0) as number; + get idlingA() { + return pb_1.Message.getFieldWithDefault(this, 14, 0) as number; } - set idling(value: number) { - pb_1.Message.setField(this, 13, value); + set idlingA(value: number) { + pb_1.Message.setField(this, 14, value); + } + get idlingR() { + return pb_1.Message.getFieldWithDefault(this, 15, 0) as number; + } + set idlingR(value: number) { + pb_1.Message.setField(this, 15, value); + } + get idlingD() { + return pb_1.Message.getFieldWithDefault(this, 16, 0) as number; + } + set idlingD(value: number) { + pb_1.Message.setField(this, 16, value); + } + get stopSign() { + return pb_1.Message.getFieldWithDefault(this, 17, 0) as number; + } + set stopSign(value: number) { + pb_1.Message.setField(this, 17, value); + } + get slide() { + return pb_1.Message.getFieldWithDefault(this, 18, 0) as number; + } + set slide(value: number) { + pb_1.Message.setField(this, 18, value); } static fromObject(data: { davisParamA?: number; @@ -154,10 +194,14 @@ export namespace common { curveResistanceParamR4?: number; revolvingMassParam?: number; jump?: boolean; - slip?: number; - slide?: number; + slipA?: number; + slipR?: number; + slipD?: number; + idlingA?: number; + idlingR?: number; + idlingD?: number; stopSign?: number; - idling?: number; + slide?: number; }): TrainDynamicConfig { const message = new TrainDynamicConfig({}); if (data.davisParamA != null) { @@ -187,17 +231,29 @@ export namespace common { if (data.jump != null) { message.jump = data.jump; } - if (data.slip != null) { - message.slip = data.slip; + if (data.slipA != null) { + message.slipA = data.slipA; } - if (data.slide != null) { - message.slide = data.slide; + if (data.slipR != null) { + message.slipR = data.slipR; + } + if (data.slipD != null) { + message.slipD = data.slipD; + } + if (data.idlingA != null) { + message.idlingA = data.idlingA; + } + if (data.idlingR != null) { + message.idlingR = data.idlingR; + } + if (data.idlingD != null) { + message.idlingD = data.idlingD; } if (data.stopSign != null) { message.stopSign = data.stopSign; } - if (data.idling != null) { - message.idling = data.idling; + if (data.slide != null) { + message.slide = data.slide; } return message; } @@ -212,10 +268,14 @@ export namespace common { curveResistanceParamR4?: number; revolvingMassParam?: number; jump?: boolean; - slip?: number; - slide?: number; + slipA?: number; + slipR?: number; + slipD?: number; + idlingA?: number; + idlingR?: number; + idlingD?: number; stopSign?: number; - idling?: number; + slide?: number; } = {}; if (this.davisParamA != null) { data.davisParamA = this.davisParamA; @@ -244,17 +304,29 @@ export namespace common { if (this.jump != null) { data.jump = this.jump; } - if (this.slip != null) { - data.slip = this.slip; + if (this.slipA != null) { + data.slipA = this.slipA; } - if (this.slide != null) { - data.slide = this.slide; + if (this.slipR != null) { + data.slipR = this.slipR; + } + if (this.slipD != null) { + data.slipD = this.slipD; + } + if (this.idlingA != null) { + data.idlingA = this.idlingA; + } + if (this.idlingR != null) { + data.idlingR = this.idlingR; + } + if (this.idlingD != null) { + data.idlingD = this.idlingD; } if (this.stopSign != null) { data.stopSign = this.stopSign; } - if (this.idling != null) { - data.idling = this.idling; + if (this.slide != null) { + data.slide = this.slide; } return data; } @@ -280,14 +352,22 @@ export namespace common { writer.writeFloat(8, this.revolvingMassParam); if (this.jump != false) writer.writeBool(9, this.jump); - if (this.slip != 0) - writer.writeFloat(10, this.slip); - if (this.slide != 0) - writer.writeInt32(11, this.slide); + if (this.slipA != 0) + writer.writeFloat(10, this.slipA); + if (this.slipR != 0) + writer.writeFloat(11, this.slipR); + if (this.slipD != 0) + writer.writeInt32(12, this.slipD); + if (this.idlingA != 0) + writer.writeFloat(14, this.idlingA); + if (this.idlingR != 0) + writer.writeFloat(15, this.idlingR); + if (this.idlingD != 0) + writer.writeInt32(16, this.idlingD); if (this.stopSign != 0) - writer.writeInt32(12, this.stopSign); - if (this.idling != 0) - writer.writeFloat(13, this.idling); + writer.writeInt32(17, this.stopSign); + if (this.slide != 0) + writer.writeFloat(18, this.slide); if (!w) return writer.getResultBuffer(); } @@ -325,16 +405,28 @@ export namespace common { message.jump = reader.readBool(); break; case 10: - message.slip = reader.readFloat(); + message.slipA = reader.readFloat(); break; case 11: - message.slide = reader.readInt32(); + message.slipR = reader.readFloat(); break; case 12: + message.slipD = reader.readInt32(); + break; + case 14: + message.idlingA = reader.readFloat(); + break; + case 15: + message.idlingR = reader.readFloat(); + break; + case 16: + message.idlingD = reader.readInt32(); + break; + case 17: message.stopSign = reader.readInt32(); break; - case 13: - message.idling = reader.readFloat(); + case 18: + message.slide = reader.readFloat(); break; default: reader.skipField(); } diff --git a/src/protos/device_state.ts b/src/protos/device_state.ts index 10a8ab8..955593a 100644 --- a/src/protos/device_state.ts +++ b/src/protos/device_state.ts @@ -4286,10 +4286,14 @@ export namespace state { curveResistanceParamR4?: string; revolvingMassParam?: string; jump?: boolean; - slip?: string; - slide?: number; + slipA?: string; + slipR?: string; + slipD?: number; + idlingA?: string; + idlingR?: string; + idlingD?: number; stopSign?: number; - idling?: string; + slide?: string; }) { super(); pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls); @@ -4321,17 +4325,29 @@ export namespace state { if ("jump" in data && data.jump != undefined) { this.jump = data.jump; } - if ("slip" in data && data.slip != undefined) { - this.slip = data.slip; + if ("slipA" in data && data.slipA != undefined) { + this.slipA = data.slipA; } - if ("slide" in data && data.slide != undefined) { - this.slide = data.slide; + if ("slipR" in data && data.slipR != undefined) { + this.slipR = data.slipR; + } + if ("slipD" in data && data.slipD != undefined) { + this.slipD = data.slipD; + } + if ("idlingA" in data && data.idlingA != undefined) { + this.idlingA = data.idlingA; + } + if ("idlingR" in data && data.idlingR != undefined) { + this.idlingR = data.idlingR; + } + if ("idlingD" in data && data.idlingD != undefined) { + this.idlingD = data.idlingD; } if ("stopSign" in data && data.stopSign != undefined) { this.stopSign = data.stopSign; } - if ("idling" in data && data.idling != undefined) { - this.idling = data.idling; + if ("slide" in data && data.slide != undefined) { + this.slide = data.slide; } } } @@ -4389,29 +4405,53 @@ export namespace state { set jump(value: boolean) { pb_1.Message.setField(this, 9, value); } - get slip() { + get slipA() { return pb_1.Message.getFieldWithDefault(this, 10, "") as string; } - set slip(value: string) { + set slipA(value: string) { pb_1.Message.setField(this, 10, value); } - get slide() { - return pb_1.Message.getFieldWithDefault(this, 11, 0) as number; + get slipR() { + return pb_1.Message.getFieldWithDefault(this, 11, "") as string; } - set slide(value: number) { + set slipR(value: string) { pb_1.Message.setField(this, 11, value); } - get stopSign() { + get slipD() { return pb_1.Message.getFieldWithDefault(this, 12, 0) as number; } - set stopSign(value: number) { + set slipD(value: number) { pb_1.Message.setField(this, 12, value); } - get idling() { - return pb_1.Message.getFieldWithDefault(this, 13, "") as string; + get idlingA() { + return pb_1.Message.getFieldWithDefault(this, 14, "") as string; } - set idling(value: string) { - pb_1.Message.setField(this, 13, value); + set idlingA(value: string) { + pb_1.Message.setField(this, 14, value); + } + get idlingR() { + return pb_1.Message.getFieldWithDefault(this, 15, "") as string; + } + set idlingR(value: string) { + pb_1.Message.setField(this, 15, value); + } + get idlingD() { + return pb_1.Message.getFieldWithDefault(this, 16, 0) as number; + } + set idlingD(value: number) { + pb_1.Message.setField(this, 16, value); + } + get stopSign() { + return pb_1.Message.getFieldWithDefault(this, 17, 0) as number; + } + set stopSign(value: number) { + pb_1.Message.setField(this, 17, value); + } + get slide() { + return pb_1.Message.getFieldWithDefault(this, 18, "") as string; + } + set slide(value: string) { + pb_1.Message.setField(this, 18, value); } static fromObject(data: { davisParamA?: string; @@ -4423,10 +4463,14 @@ export namespace state { curveResistanceParamR4?: string; revolvingMassParam?: string; jump?: boolean; - slip?: string; - slide?: number; + slipA?: string; + slipR?: string; + slipD?: number; + idlingA?: string; + idlingR?: string; + idlingD?: number; stopSign?: number; - idling?: string; + slide?: string; }): TrainDynamicConfigMqtt { const message = new TrainDynamicConfigMqtt({}); if (data.davisParamA != null) { @@ -4456,17 +4500,29 @@ export namespace state { if (data.jump != null) { message.jump = data.jump; } - if (data.slip != null) { - message.slip = data.slip; + if (data.slipA != null) { + message.slipA = data.slipA; } - if (data.slide != null) { - message.slide = data.slide; + if (data.slipR != null) { + message.slipR = data.slipR; + } + if (data.slipD != null) { + message.slipD = data.slipD; + } + if (data.idlingA != null) { + message.idlingA = data.idlingA; + } + if (data.idlingR != null) { + message.idlingR = data.idlingR; + } + if (data.idlingD != null) { + message.idlingD = data.idlingD; } if (data.stopSign != null) { message.stopSign = data.stopSign; } - if (data.idling != null) { - message.idling = data.idling; + if (data.slide != null) { + message.slide = data.slide; } return message; } @@ -4481,10 +4537,14 @@ export namespace state { curveResistanceParamR4?: string; revolvingMassParam?: string; jump?: boolean; - slip?: string; - slide?: number; + slipA?: string; + slipR?: string; + slipD?: number; + idlingA?: string; + idlingR?: string; + idlingD?: number; stopSign?: number; - idling?: string; + slide?: string; } = {}; if (this.davisParamA != null) { data.davisParamA = this.davisParamA; @@ -4513,17 +4573,29 @@ export namespace state { if (this.jump != null) { data.jump = this.jump; } - if (this.slip != null) { - data.slip = this.slip; + if (this.slipA != null) { + data.slipA = this.slipA; } - if (this.slide != null) { - data.slide = this.slide; + if (this.slipR != null) { + data.slipR = this.slipR; + } + if (this.slipD != null) { + data.slipD = this.slipD; + } + if (this.idlingA != null) { + data.idlingA = this.idlingA; + } + if (this.idlingR != null) { + data.idlingR = this.idlingR; + } + if (this.idlingD != null) { + data.idlingD = this.idlingD; } if (this.stopSign != null) { data.stopSign = this.stopSign; } - if (this.idling != null) { - data.idling = this.idling; + if (this.slide != null) { + data.slide = this.slide; } return data; } @@ -4549,14 +4621,22 @@ export namespace state { writer.writeString(8, this.revolvingMassParam); if (this.jump != false) writer.writeBool(9, this.jump); - if (this.slip.length) - writer.writeString(10, this.slip); - if (this.slide != 0) - writer.writeInt32(11, this.slide); + if (this.slipA.length) + writer.writeString(10, this.slipA); + if (this.slipR.length) + writer.writeString(11, this.slipR); + if (this.slipD != 0) + writer.writeInt32(12, this.slipD); + if (this.idlingA.length) + writer.writeString(14, this.idlingA); + if (this.idlingR.length) + writer.writeString(15, this.idlingR); + if (this.idlingD != 0) + writer.writeInt32(16, this.idlingD); if (this.stopSign != 0) - writer.writeInt32(12, this.stopSign); - if (this.idling.length) - writer.writeString(13, this.idling); + writer.writeInt32(17, this.stopSign); + if (this.slide.length) + writer.writeString(18, this.slide); if (!w) return writer.getResultBuffer(); } @@ -4594,16 +4674,28 @@ export namespace state { message.jump = reader.readBool(); break; case 10: - message.slip = reader.readString(); + message.slipA = reader.readString(); break; case 11: - message.slide = reader.readInt32(); + message.slipR = reader.readString(); break; case 12: + message.slipD = reader.readInt32(); + break; + case 14: + message.idlingA = reader.readString(); + break; + case 15: + message.idlingR = reader.readString(); + break; + case 16: + message.idlingD = reader.readInt32(); + break; + case 17: message.stopSign = reader.readInt32(); break; - case 13: - message.idling = reader.readString(); + case 18: + message.slide = reader.readString(); break; default: reader.skipField(); }