From 46bff1474133e89efc75151b0a3853cf9fa869ea Mon Sep 17 00:00:00 2001 From: thesai <1021828630@qq.com> Date: Tue, 6 Feb 2024 18:00:37 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BD=A6=E5=B0=BE?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=8F=8A=E5=81=8F=E7=A7=BB=E9=87=8F=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E8=B5=8B=E5=80=BC=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/device_state.proto | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/protos/device_state.proto b/protos/device_state.proto index 6ce2530..12c73f5 100644 --- a/protos/device_state.proto +++ b/protos/device_state.proto @@ -161,8 +161,12 @@ message TrainState{ common.TrainEndsState trainEndsA = 18; //列车B端 common.TrainEndsState trainEndsB = 19; + // 列车尾端所在设备ID + uint32 tailDeviceId = 20; + // 列车尾端所在设备偏移量 + int64 tailOffset = 21; // BTM状态 - BTMState btmState = 20; + BTMState btmState = 22; } // 动力学列车状态 From bfb647b26fdc103a1389ad1f32d06977e24a74fe Mon Sep 17 00:00:00 2001 From: ZhaoErWei <1107209405@qq.com> Date: Wed, 7 Feb 2024 13:45:58 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E7=94=BB=E5=B8=83=E6=A0=BC=E5=AD=90?= =?UTF-8?q?=E8=83=8C=E6=99=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/stationLayoutGraphics.proto | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index 4aef552..a461f83 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -63,6 +63,15 @@ message Canvas { string backgroundColor = 3; // 视口变换 Transform viewportTransform = 4; + //画布格子背景 + Grid gridBackground = 5; +} + +//格子背景 +message Grid { + bool hasGrid = 1; + string lineColor = 2; // 线色 + int32 space = 3; //间隔 } message Point { From 4135d9e4117780dcf6fb941c487eac530a235c4f Mon Sep 17 00:00:00 2001 From: thesai <1021828630@qq.com> Date: Sun, 18 Feb 2024 10:06:57 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=BB=91=E5=8A=A8=E9=97=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0{=E6=9C=89=E9=9A=9C=E7=A2=8D=E7=89=A9}=E7=8A=B6?= =?UTF-8?q?=E6=80=81=EF=BC=9B=E5=B1=8F=E8=94=BD=E9=97=A8{=E6=9C=89?= =?UTF-8?q?=E9=9A=9C=E7=A2=8D=E7=89=A9}=E5=AD=97=E6=AE=B5=E5=90=8D?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/device_state.proto | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/protos/device_state.proto b/protos/device_state.proto index 12c73f5..4624305 100644 --- a/protos/device_state.proto +++ b/protos/device_state.proto @@ -521,7 +521,7 @@ message PsdState { repeated AsdState asdStates = 2; //滑动门状态 bool mgj = 3; //屏蔽门整体的关闭（继电器）状态 request.PsdParam param = 4; //屏蔽门设置的参数 - bool obstacle = 5; //是否有障碍物 + bool zaw = 5; //有障碍物 } //滑动门状态 @@ -530,6 +530,7 @@ message AsdState { bool kmdw = 2; //开门到位（实际位置） bool gmdw = 3; //关门到位（实际位置） bool mgj = 4; //门关继电器 + bool zaw = 5; //有障碍物 } From 6e8fecb59b22e10c00398820076edb1a84d825ba Mon Sep 17 00:00:00 2001 From: thesai <1021828630@qq.com> Date: Sun, 18 Feb 2024 14:49:09 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E6=BB=91=E5=8A=A8=E9=97=A8=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=A2=9E=E5=8A=A0{=E5=BC=BA=E5=88=B6}=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/device_state.proto | 1 + 1 file changed, 1 insertion(+) diff --git a/protos/device_state.proto b/protos/device_state.proto index 4624305..8477608 100644 --- a/protos/device_state.proto +++ b/protos/device_state.proto @@ -531,6 +531,7 @@ message AsdState { bool gmdw = 3; //关门到位（实际位置） bool mgj = 4; //门关继电器 bool zaw = 5; //有障碍物 + bool force = 6; //强制开/关门 } From cfcd889ef021888caee964f92f4dd78482ac052f Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Mon, 19 Feb 2024 18:14:16 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E6=B3=A8=E6=8E=89=E8=BD=A6=E7=AB=99?= =?UTF-8?q?=E5=85=B3=E8=81=94IBP=E5=9C=B0=E5=9B=BECode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/stationLayoutGraphics.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index a461f83..82869d9 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -207,7 +207,7 @@ message Station { // string kilometerCode = 5; //公里标 KilometerSystem kilometerSystem = 6; //公里标 // int32 index = 7; - string refIbpMapCode = 8; // 关联IBP地图Code + //string refIbpMapCode = 8; // 关联IBP地图Code string stationName = 9; //车站名 string stationNameAcronym = 10; // 车站名拼音简写 bool depots = 11; //是否车辆段 From 63774c3fa82b3831a06d7b2b68675677d6fd5e1e Mon Sep 17 00:00:00 2001 From: thesai <1021828630@qq.com> Date: Tue, 20 Feb 2024 09:20:50 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9PSL=E5=92=8CIBP=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=E6=A8=A1=E5=9E=8B=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/stationLayoutGraphics.proto | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index a461f83..f3af854 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -26,9 +26,9 @@ message RtssGraphicStorage { repeated AxleCountingSection axleCountingSections = 16; repeated LogicSection logicSections = 17; repeated StopPosition stopPositions = 18; - repeated SpksSwitch spksSwitchs = 19; - repeated EsbButton esbButtons = 20; // 紧急关闭按钮 - repeated GatedBox gateBoxs = 21; // 站台开门/关门/发车按钮整合控制箱 +// repeated SpksSwitch spksSwitchs = 19; +// repeated EsbButton esbButtons = 20; // 紧急关闭按钮 +// repeated GatedBox gateBoxs = 21; // 站台开门/关门/发车按钮整合控制箱 repeated Transponder transponders = 22; // 应答器 repeated Slope slopes = 23; // 坡度 // repeated CalculateLink CalculateLink = 24; // 计算link信息 @@ -207,7 +207,7 @@ message Station { // string kilometerCode = 5; //公里标 KilometerSystem kilometerSystem = 6; //公里标 // int32 index = 7; - string refIbpMapCode = 8; // 关联IBP地图Code +// string refIbpMapCode = 8; // 关联IBP地图Code string stationName = 9; //车站名 string stationNameAcronym = 10; // 车站名拼音简写 bool depots = 11; //是否车辆段 From ced6f855df7bce1f589fe18fc02b17e88547fc29 Mon Sep 17 00:00:00 2001 From: thesai <1021828630@qq.com> Date: Wed, 21 Feb 2024 09:14:13 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E5=88=97=E8=BD=A6=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BD=A6=E5=B0=BE=E8=AE=BE=E5=A4=87=E7=AB=AF?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/device_state.proto | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/protos/device_state.proto b/protos/device_state.proto index 8477608..a6d2b70 100644 --- a/protos/device_state.proto +++ b/protos/device_state.proto @@ -416,8 +416,10 @@ message TrainMapState{ uint32 tailDeviceId = 66; // 列车车尾所在设备偏移量 int64 tailOffset = 67; + // 列车车尾所在设备端口 + string tailDevicePort = 68; // BTM状态 - BTMState btmState = 68; + BTMState btmState = 69; } message BTMState { From 8820c9f2abfb1e1761e866761b74cb7aab93a8de Mon Sep 17 00:00:00 2001 From: thesai <1021828630@qq.com> Date: Wed, 21 Feb 2024 14:54:16 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=97=E8=BD=A6BTM?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E6=8A=A5=E6=96=87=E4=B8=BA=E6=9C=80?= =?UTF-8?q?=E5=90=8E=E6=94=B6=E5=88=B0=E7=9A=84=E6=8A=A5=E6=96=87=EF=BC=9B?= =?UTF-8?q?=E4=BF=AE=E6=94=B9BTM=E6=8E=A2=E6=B5=8B=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E4=B8=8D=E9=9C=80=E8=A6=81=E3=80=90=E8=BD=A6?= =?UTF-8?q?=E8=BD=BD=E5=BA=94=E7=AD=94=E5=99=A8=E5=A4=A9=E7=BA=BF=E5=8A=9F?= =?UTF-8?q?=E7=8E=87=E6=94=BE=E5=A4=A7=E5=99=A8=E3=80=91=E4=B8=BA=E5=BC=80?= =?UTF-8?q?=E5=90=AF=E7=8A=B6=E6=80=81=EF=BC=9B=E4=BF=AE=E6=94=B9=E8=BD=A6?= =?UTF-8?q?=E5=B0=BE=E4=BD=8D=E7=BD=AE=E8=AE=A1=E7=AE=97bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/device_state.proto | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/protos/device_state.proto b/protos/device_state.proto index a6d2b70..e9b2c5f 100644 --- a/protos/device_state.proto +++ b/protos/device_state.proto @@ -165,8 +165,10 @@ message TrainState{ uint32 tailDeviceId = 20; // 列车尾端所在设备偏移量 int64 tailOffset = 21; + // 列车尾端所在设备端口 + string tailDevicePort = 22; // BTM状态 - BTMState btmState = 22; + BTMState btmState = 23; } // 动力学列车状态 @@ -452,11 +454,11 @@ message TrainDynamicConfigMqtt{ //是否跳跃 bool jump = 9; //打滑加速度(m/s) 默认0 原本属性 float - string slipA=10; + string slipA = 10; // 打滑冲击率(m/s) 默认0 - string slipR=11; + string slipR = 11; // 打滑持续时间ms 默认0 - int32 slipD=12; + int32 slipD = 12; // 空转加速度（m/s2），默认值：0 原本属性 float string idlingA = 14; // 空转冲击率（m/s3），默认值：0 @@ -465,7 +467,7 @@ message TrainDynamicConfigMqtt{ int32 idlingD = 16; //过标/欠标（mm）（正数过标，负数欠标） int32 stopSign = 17; -// 前溜/后溜（m/s）（正数前溜，负数后溜），默认值：0 原本属性 float + // 前溜/后溜（m/s）（正数前溜，负数后溜），默认值：0 原本属性 float string slide = 18 ; } //列车一端的状态 @@ -502,7 +504,7 @@ message ButtonState { uint32 id = 1; bool down = 2; bool active = 3; // 带灯的按钮 -// bool bypass = 4; //摁钮，钥匙 是否旁路 + // bool bypass = 4; //摁钮，钥匙 是否旁路 } // 警铃状态 @@ -541,7 +543,7 @@ message AsdState { message KeyState { uint32 id = 1; int32 gear = 2; -// bool bypass = 3; //摁钮，钥匙 是否旁路 + // bool bypass = 3; //摁钮，钥匙 是否旁路 } // 战场图门控箱继电器状态 From e80785b8134f0c8188d568926e62ab8c9b11a9b1 Mon Sep 17 00:00:00 2001 From: thesai <1021828630@qq.com> Date: Fri, 23 Feb 2024 10:43:05 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=88=97=E8=BD=A6?= =?UTF-8?q?=E5=90=8E=E5=8F=AF=E5=86=8D=E6=AC=A1=E6=B7=BB=E5=8A=A0=E7=9B=B8?= =?UTF-8?q?=E5=90=8C=E7=BC=96=E5=8F=B7=E5=88=97=E8=BD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/device_state.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protos/device_state.proto b/protos/device_state.proto index e9b2c5f..81d4833 100644 --- a/protos/device_state.proto +++ b/protos/device_state.proto @@ -131,7 +131,7 @@ message TrainState{ float speed = 3; //列车长度,1=1mm int64 trainLength = 4; - //列车是否显示 + //列车是否显示（此状态仅在列车被删除时为false，若需更改用途需增加列车被删除状态） bool show = 5; // 列车车头所在设备ID uint32 headDeviceId = 6;