From 8edda8b7497511eda94720f1eb686a6a7f8531c6 Mon Sep 17 00:00:00 2001
From: thesai <1021828630@qq.com>
Date: Mon, 29 Jan 2024 14:42:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=A7=E7=94=B5=E5=99=A8?=
 =?UTF-8?q?=E9=A9=B1=E9=87=87=E8=A1=A8=E7=8A=B6=E6=80=81=EF=BC=9B=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9Repo=E6=9E=84=E5=BB=BA=E6=97=B6=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=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 | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/protos/device_state.proto b/protos/device_state.proto
index c642cfc..b96421f 100644
--- a/protos/device_state.proto
+++ b/protos/device_state.proto
@@ -405,7 +405,7 @@ message TrainMapState{
   //列车B端
   TrainEndsStateMqtt trainEndsB = 64;
   //列车位移
-    int32 Displacement = 65;
+  int32 Displacement = 65;
 }
 //动力学相关参数返回数据，因golang float类型数据序列化后丢失精度故使用string
 //此类型需要与 common_data 中的 TrainDynamicConfig类型属性保持一致
@@ -525,6 +525,18 @@ message BaliseState {
   string variableUserTelegram = 6; //可变用户报文
 }
 
+// 车站联锁驱采状态
+message StationQc {
+  repeated State qdStates = 1; //驱动状态
+  repeated State cjStates = 2; //采集状态
+
+  message State {
+    int32 row = 1; //行
+    int32 col = 2; //列
+    bool on = 3; //接通
+  }
+}
+
 ////////////////////////////////////////////////////////////////////////////
 
 //仿真运行时状态变化量，当前时刻与上一时刻比较得到
@@ -567,6 +579,8 @@ message AllDevicesStatus{
   repeated PlatformState platformState = 11;
   // 应答器状态
   repeated BaliseState baliseState = 12;
+  // 车站联锁驱采状态
+  StationQc stationQc = 13;
 }
 
 //服务器端向前端推送的设备状态信息