diff --git a/protos/device_state.proto b/protos/device_state.proto
index 4e36a52..e5ca9cc 100644
--- a/protos/device_state.proto
+++ b/protos/device_state.proto
@@ -1,6 +1,7 @@
 syntax = "proto3";
 import "stationLayoutGraphics.proto";
 import "common_data.proto";
+import "request.proto";
 package state;
 option java_package = "club.joylink.bjrtss.ats.verify.protos";
 option java_outer_classname = "DeviceStateProto";
@@ -51,30 +52,22 @@ message  SwitchState{
   bool dw = 4;
   //道岔处于反位（实际）
   bool fw = 5;
-  // 是否强制(屏蔽联锁驱动)
-  bool force = 6;
-  // 是否有失表故障
-  bool sb = 7;
-  // 是否有定位失表故障
-  bool dwsb = 8;
-  // 是否有反位失表故障
-  bool fwsb = 9;
-  // 是否有挤岔故障
-  bool jc = 10;
+  // 道岔设置参数
+  request.PointsParam param = 6;
   // 定操驱动
-  bool qdc = 11;
+  bool qdc = 7;
   // 反操驱动
-  bool qfc = 12;
+  bool qfc = 8;
   // 允许操驱动
-  bool qyc = 13;
-  // 是否定操
-  bool dc = 14;
-  // 是否反操
-  bool fc = 15;
-  // 是否允许操作
-  bool yc = 16;
+  bool qyc = 9;
+  // 定操采集
+  bool dc = 10;
+  // 反操采集
+  bool fc = 11;
+  // 允许操作采集
+  bool yc = 12;
   // 是否占用
-  bool occupied = 17;
+  bool occupied = 13;
 }
 //信号机状态
 message SignalState{
@@ -82,6 +75,10 @@ message SignalState{
   uint32  id = 1;
   //信号机的灯列表
   Signal.Aspect aspect = 2;
+  // 信号机设置参数
+  request.SignalParam param = 3;
+  // 信号机继电器状态
+  map<string, bool> relayStateMap = 4;
 }
 //信号机显示定义
 message Signal {