信号机状态

protos/device_state.proto

@@ -55,7 +55,7 @@ message SignalState{
 	//信号机索引
 	string  id = 1;
 	//信号机的灯列表
-	repeated 	Signal.Light light = 2;
+	repeated 	Signal.Aspect aspect = 2;
 }
 //信号机显示定义
 message Signal {
@@ -63,27 +63,18 @@ message Signal {
 	enum Aspect {
 		//物理灭灯
 		OFF = 0;
-		//物理亮灯
-		ON = 1;
 		//绿灯亮
-		L = 2;
+		L = 1;
 		//红
-		H = 3;
+		H = 2;
 		//黄
-		U = 4;
+		U = 3;
 		//红黄
-		HU= 5;
+		HU= 4;
 		//白
-		B=6;
+		B=5;
 		//蓝
-		A=7;
-	}
-	//信号机中的灯
-	message Light{
-		//灯颜色(单色)
-		Aspect color = 1;
-		//true-显示信号，false-不显示信号
-		bool  display = 2;
+		A=6;
 	}
 }