From 7629f290ea612d4ce368c40d4cf793dffc4b21ec Mon Sep 17 00:00:00 2001
From: tiger_zhou <Shmily123@WJ>
Date: Fri, 30 Aug 2024 16:41:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=BD=A6=E6=A8=A1=E5=9E=8B=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=20=E7=B4=A7=E6=80=A5=E5=88=B6=E5=8A=A8=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 protos/device_state.proto          | 15 ++++++++++++++-
 protos/stationLayoutGraphics.proto |  4 ++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/protos/device_state.proto b/protos/device_state.proto
index ba5c1fb..2fd7a21 100644
--- a/protos/device_state.proto
+++ b/protos/device_state.proto
@@ -203,6 +203,7 @@ message TrainState{
   float TrainMaxSpeed = 32; //列车最大时速
   float TrainMaxAcc   = 33; //列车最大加速度
   float TrainMaxBrake  = 34; //列车最大减速度
+  float TrainEmergencyBrake = 35;//列车紧急制动减速度
 }
 message TrainBtmCache{
   uint32 dsn = 1;
@@ -477,7 +478,19 @@ message TrainVobcState {
     //ato关右门
     bool atoCloseRightDoor = 83;
     bool lightAtoSend = 84;
-//  request.TrainControl.Direction historyDir = 76; //历史行驶方向，用于列车操控时，方向旋钮更改方向时使用，不在前端显示
+    //Ato运行级位
+    AtoStepLevel atoStepLevel = 85;
+
+    enum AtoStepLevel{
+      ATO_STEP_LEVEL_NONE=0;
+      ATO_STEP_LEVEL_1 = 1;
+      ATO_STEP_LEVEL_2 = 2;
+      ATO_STEP_LEVEL_3 = 3;
+      ATO_STEP_LEVEL_4 = 4;
+      ATO_STEP_LEVEL_5 = 5;
+      ATO_STEP_LEVEL_6 = 6;
+      ATO_STEP_LEVEL_7 = 7;
+    }
 }
 
 // 发给前端的列车状态
diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto
index d6fa455..5008183 100644
--- a/protos/stationLayoutGraphics.proto
+++ b/protos/stationLayoutGraphics.proto
@@ -724,8 +724,8 @@ message Train {
   int32 trainLoad = 10; //列车载荷(吨)
   float trainMaxSpeed = 11; //列车最大速度(km/h)
   float trainMaxAcc = 12; //列车最大加速度(m/s^2)
-  float trainMaxBrake = 13; //列车最大减速度(m/s^2)
-
+  float trainMaxBrake = 13; //列车常用最大减速度(m/s^2)
+  float TrainEmergencyBrake = 14; //列车紧急减速度(m/s^2)
 }
 
 // 其他线