Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message

protos/stationLayoutGraphics.proto

@@ -42,6 +42,8 @@ message RtssGraphicStorage {
   repeated StationRelateDevice stationRelateDeviceList = 34; // 关联设备列表
   repeated SectionCodePoint sectionCodePointList = 35; // 物理区段码位表
   ScreenDoorConfig screenDoorConfig = 36;//屏蔽门的配置--子屏蔽门的数量和编组列表
+  repeated Beacon beacons = 37;
+  GenerateAxleCountingConfig generateAxleCountingConfig = 38;//一键生成计轴的配置
 }
 
 message Canvas {
@@ -184,6 +186,11 @@ message AxleCounting {
   repeated string centralizedStations = 8; // 集中站列表
 }
 
+message GenerateAxleCountingConfig {
+  repeated string bbConnect = 1; //需要在道岔bb连接处生成计轴的道岔id(填一个就行)
+  repeated string noGenerateGroup = 2;//指定的道岔组不生成计轴
+}
+
 // message Train {
 //   CommonInfo common = 1;
 //   string code = 2;
@@ -451,6 +458,18 @@ message CurvatureKiloMarker {
   repeated KilometerSystem kilometerSystem = 4; //公里标数据
 }
 
+/** 信标 */
+message Beacon {
+  enum BeaconType {
+    Static = 0;
+    Dynamic = 1;
+  }
+  CommonInfo common = 1;
+  string code = 2;
+  BeaconType type = 3;
+  bool flip = 4;
+}
+
 message Slope {
   CommonInfo common = 1;
   repeated Point points = 2;