From fe2d65a91d08c62c55608aa28f799bfaaf18808e Mon Sep 17 00:00:00 2001
From: weizhihong <weizhihong@joylink.club>
Date: Mon, 6 Nov 2023 17:51:54 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=AB=99=E5=8F=B0=E7=BB=A7=E7=94=B5?=
 =?UTF-8?q?=E5=99=A8=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 protos/device_state.proto | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/protos/device_state.proto b/protos/device_state.proto
index 6e060af..92e6c22 100644
--- a/protos/device_state.proto
+++ b/protos/device_state.proto
@@ -109,7 +109,7 @@ message PlatformState{
 	// EMP继电器状态
 	bool empj = 2;
 	// SPKS继电器状态
-	repeated SpksState spksState = 3;
+	repeated ReplyState spksState = 3;
 	// 门控箱继电器状态
 	repeated MkxJState mkxJState = 4;
 }
@@ -265,6 +265,8 @@ message ReplyState {
 	string  id = 1;
 	// 继电器吸合状态
 	bool xh = 2;
+	// 继电器编号
+	string code = 3; 
 }
 
 // 按钮状态
@@ -307,18 +309,10 @@ message KeyState {
 	int32 gear = 2;
 }
 
-// 站场图SPKS状态
-message SpksState {
-	string code = 2; // 继电器名称
-	bool xh = 3;     // 继电器状态
-}
-
 // 战场图门控箱继电器状态
 message MkxJState {
 	string code = 1;
-	bool pcbj = 2;
-	bool pobj = 3;
-	bool pabj = 4;
+	repeated ReplyState replyState = 2;
 }
 
 ////////////////////////////////////////////////////////////////////////////