1
0
Pārlūkot izejas kodu

Merge branch 'master' of chensongchao/ya-serv into master

liheting 6 gadi atpakaļ
vecāks
revīzija
0ef39b79a1
1 mainītis faili ar 4 papildinājumiem un 2 dzēšanām
  1. 4 2
      common.h

+ 4 - 2
common.h

@@ -103,6 +103,7 @@ enum EVENT_TYPE{ // 事件类型
     ET_AREA_OVER_COUNT_PERSON = 3,	// 区域人员超员
     ET_AREA_OVER_COUNT_VEHICLE = 4,	// 区域车辆超员
     ET_READER_ERROR = 6,
+
     ET_CARD_LOW_POWER_SERIOUS = 12, // 电量极低
     ET_CARD_OVER_TIME_PERSON = 13, // 人员井下超时
     ET_CARD_OVER_TIME_VEHICLE = 14, // 车辆井下超时
@@ -114,10 +115,11 @@ enum EVENT_TYPE{ // 事件类型
     ET_CARD_OVER_SPEED = 21, // 车辆超速
     ET_CARD_AREA_OVER_SPEED = 22, // 车辆区域超速
     ET_CARD_HELP = 24, // 人员呼救
-
+    ET_CARD_DRIVINGFACE_WARNING_AREA = 28, //掘进面靠近预警区域告警
     ET_CARD_MOTIONLESS=32,//静止不动告警
     ET_READER_POWER_BY_BATTERY=33,//分站电池:1为电池供电,0为交流电供电,当电池供电需要告警
-	ET_VEHICLE_REAR_END=36, //车辆防追尾告警
+	ET_VEHICLE_REAR_END=36,//车辆防追尾告警
+	ET_COALING_DRIVING_DRIVER = 37,//工作面(采煤面和掘进面)司机与车卡告警;
     ET_VEHICLE_NEAR_GEOFAULT=38,//靠近断层告警
 	ET_READER_LOCATION_REVERSAL=39,//掘进面天线反向告警
     CARD_EVENT_COUNT_MAX