From 15470e0e4aa2c5839be5c009d5a4239c9238b4ba Mon Sep 17 00:00:00 2001
From: tiger_zhou <Shmily123@WJ>
Date: Tue, 10 Sep 2024 18:05:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=BD=A6=E6=8A=98=E8=BF=9412=E5=8F=B7?=
 =?UTF-8?q?=E7=BA=BF=E6=BF=80=E6=B4=BB=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/protos/device_state.proto b/protos/device_state.proto
index 4d356d5..579072e 100644
--- a/protos/device_state.proto
+++ b/protos/device_state.proto
@@ -210,8 +210,8 @@ message TrainState{
   float TrainMaxBrake  = 37; //列车最大减速度
   float TrainEmergencyBrake = 38;//列车紧急制动减速度
   string projectCode = 39;
-  TrainBtmCache BtmBaliseCache = 40;
-  TrainPort trainPort = 41;
+//  TrainBtmCache BtmBaliseCache = 40;
+  TrainPort trainPort = 40;
   enum TrainPort{
     PORT_NONE = 0;
     PORT_A=1;
@@ -465,8 +465,8 @@ message TrainVobcState {
     //Ato运行级位
     AtoStepLevel atoStepLevel = 85;
     VobcBtmInfo vobcBtmInfo = 86;
-  int64 lineInitTimeStamp12 = 87; //12号线列出初始化时间戳
-  bool line12ConnErr = 88;//12号线连接错误，因为12号线atp故障（此时atp需要重启）时，还是会发送数据通过此次属性标记atp状态情况(多次观察atp故障时，atp输出数字量返回的数据最后一个直接是0)
+//  int64 lineInitTimeStamp12 = 87; //12号线列出初始化时间戳
+//  bool line12ConnErr = 88;//12号线连接错误，因为12号线atp故障（此时atp需要重启）时，还是会发送数据通过此次属性标记atp状态情况(多次观察atp故障时，atp输出数字量返回的数据最后一个直接是0)
 //  bool trainConnInitComplateTc1 = 87;
 //  bool trainConnInitComplateTc2 = 88;
 
@@ -959,8 +959,8 @@ message TrainControlState{
   bool TrainConnInitComplatePortB = 11;
   bool activeTrainA = 12;
   bool activeTrainB = 13;
-  bool Line12ConnErr = 14;
-  int64 lineInitTimeStamp12 = 15;
+//  bool Line12ConnErr = 14;
+//  int64 lineInitTimeStamp12 = 15;
   message ControlButton{
     uint32 id = 1;
     bool passed = 3;