From 7b637f0f519e0c6f5fa6817546f70000ac22fd10 Mon Sep 17 00:00:00 2001
From: joylink_zhangsai <1021828630@qq.com>
Date: Wed, 24 Jan 2024 09:59:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=8F=E8=94=BD=E9=97=A8=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=9A=9C=E7=A2=8D=E7=89=A9=E7=9A=84=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E3=80=81=E8=A1=A5=E5=85=A8=E7=8A=B6=E6=80=81=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/protos/device_state.proto b/protos/device_state.proto
index aad6228..9c3ec27 100644
--- a/protos/device_state.proto
+++ b/protos/device_state.proto
@@ -409,31 +409,31 @@ message TrainMapState{
 message TrainDynamicConfigMqtt{
 
   //基本阻力参数A 原本数据：float
-  string davisParamA=1;
+  string davisParamA = 1;
   //  基本阻力参数B 原本数据：float
-  string davisParamB=2;
+  string davisParamB = 2;
   //  基本阻力参数C 原本数据：float
-  string davisParamC=3;
+  string davisParamC = 3;
   //曲线阻力参数R1 原本数据：float
-  string curveResistanceParamR1=4;
+  string curveResistanceParamR1 = 4;
   //  曲线阻力参数R2 原本数据：float
-  string curveResistanceParamR2=5;
+  string curveResistanceParamR2 = 5;
   //  曲线阻力参数R3 原本数据：float
-  string curveResistanceParamR3=6;
+  string curveResistanceParamR3 = 6;
   //  曲线阻力参数R4 原本数据：float
-  string curveResistanceParamR4=7;
+  string curveResistanceParamR4 = 7;
   //旋转质量参数 原本数据：float
-  string revolvingMassParam=8;
+  string revolvingMassParam = 8;
   //是否跳跃
-  bool jump=9;
+  bool jump = 9;
   //打滑（%） 原本数据：float
-  string slip=10;
+  string slip = 10;
   //前溜/后溜（m/s）（正数前溜，负数后溜）
   int32 slide = 11;
   //过标/欠标（mm）（正数过标，负数欠标）
-  int32 stopSign=12;
+  int32 stopSign = 12;
   //空转 %
-  string idling =13 ;
+  string idling = 13 ;
 }
 //列车一端的状态
 message TrainEndsStateMqtt{
@@ -483,6 +483,8 @@ message PsdState {
   uint32 id = 1; //屏蔽门的id
   repeated AsdState asdStates = 2; //滑动门状态
   bool mgj = 3; //屏蔽门整体的关闭（继电器）状态
+  request.PsdParam param = 4; //屏蔽门设置的参数
+  bool obstacle = 5;  //是否有障碍物
 }
 
 //滑动门状态