From c81c2fb31179ec7383ac70bc522fcbeb14eabfe6 Mon Sep 17 00:00:00 2001 From: walker Date: Tue, 31 Oct 2023 11:21:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=81=93=E5=B2=94=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=BC=BA=E5=88=B6=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/request.proto | 3 +++ 1 file changed, 3 insertions(+) diff --git a/protos/request.proto b/protos/request.proto index 7bd2a1f..2e0b897 100644 --- a/protos/request.proto +++ b/protos/request.proto @@ -16,6 +16,9 @@ message Turnout { CancelSB = 6; // 取消失表故障 SetJC = 7; // 设置挤岔故障 CancelJC = 8; // 取消挤岔故障 + ForceDw = 9; // 强制定位 + ForceFw = 10; // 强制反位 + CancelForce = 11; // 取消强制 } } From b6e6290cb1d8cc6e0590cb29dea442c9e189a4c1 Mon Sep 17 00:00:00 2001 From: walker Date: Tue, 31 Oct 2023 15:13:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=81=93=E5=B2=94=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/device_state.proto | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/protos/device_state.proto b/protos/device_state.proto index 9a50eaf..9a40370 100644 --- a/protos/device_state.proto +++ b/protos/device_state.proto @@ -49,6 +49,28 @@ message SwitchState{ bool dw = 4; //道岔处于反位（实际） bool fw = 5; + // 是否强制(屏蔽联锁驱动) + bool force = 6; + // 是否有失表故障 + bool sb = 7; + // 是否有定位失表故障 + bool dwsb = 8; + // 是否有反位失表故障 + bool fwsb = 9; + // 是否有挤岔故障 + bool jc = 10; + // 定操驱动 + bool qdc = 11; + // 反操驱动 + bool qfc = 12; + // 允许操驱动 + bool qyc = 13; + // 是否定操 + bool dc = 14; + // 是否反操 + bool fc = 15; + // 是否允许操作 + bool yc = 16; } //信号机状态 message SignalState{