Commit b890c80a authored by captainwong's avatar captainwong

zone props

parent a35c4b52
...@@ -185,6 +185,14 @@ ...@@ -185,6 +185,14 @@
### *恒博主机类型与支持的防区属性对照表* ### *恒博主机类型与支持的防区属性对照表*
* 防区属性是否支持防拆
||00 匪警全局|01 匪警紧急|02 火警防区|03 胁迫防区|04 燃气防区|05 淹水防区|06 分机|07 遥控器|08 匪警半局|09 屏蔽防区|0A 门铃防区|0F 旁路防区|
|----|----|----|----|----|----|----|----|----|----|----|----|----|
|防拆支持|√|√| |√| | | | |√| | |√|
* 主机类型与支持的防区属性对照表
|事件码类型|主机类型|00 匪警全局|01 匪警紧急|02 火警防区|03 胁迫防区|04 燃气防区|05 淹水防区|06 分机|07 遥控器|08 匪警半局|09 屏蔽防区|0A 门铃防区|0F 旁路防区| |事件码类型|主机类型|00 匪警全局|01 匪警紧急|02 火警防区|03 胁迫防区|04 燃气防区|05 淹水防区|06 分机|07 遥控器|08 匪警半局|09 屏蔽防区|0A 门铃防区|0F 旁路防区|
|---------|-------|----|----|----|----|----|----|----|----|----|----|----|----| |---------|-------|----|----|----|----|----|----|----|----|----|----|----|----|
|1707 我是网络模块|3 网络模块+工程主机|√|√|√|√|√|√|√|√|√|√|√|√| |1707 我是网络模块|3 网络模块+工程主机|√|√|√|√|√|√|√|√|√|√|√|√|
......
...@@ -298,6 +298,28 @@ void print_available_zone_props() ...@@ -298,6 +298,28 @@ void print_available_zone_props()
printf("%02X %s", (Char)zp, jlib::win32::utf16_to_mbcs(zonePropertyToStringChinese(zp)).data()); printf("%02X %s", (Char)zp, jlib::win32::utf16_to_mbcs(zonePropertyToStringChinese(zp)).data());
}; };
printf("* 防区属性是否支持防拆\n\n");
printf("|");
for (auto zp : all_props) {
printf("|"); print_prop(zp);
}
printf("|\n");
printf("|----");
for (size_t i = 0; i < all_props.size(); i++) {
printf("|----");
}
printf("|\n");
printf("|防拆支持");
for (auto zp : all_props) {
printf("|%s", print_bool(zonePropCanReportTamper(zp)));
}
printf("|\n\n");
printf("* 主机类型与支持的防区属性对照表\n\n");
printf("|事件码类型|主机类型"); printf("|事件码类型|主机类型");
for (auto zp : all_props) { for (auto zp : all_props) {
printf("|"); print_prop(zp); printf("|"); print_prop(zp);
...@@ -310,6 +332,7 @@ void print_available_zone_props() ...@@ -310,6 +332,7 @@ void print_available_zone_props()
} }
printf("|\n"); printf("|\n");
for (auto e : AdemcoEvents) { for (auto e : AdemcoEvents) {
if (isMachineTypeEvent(e)) { if (isMachineTypeEvent(e)) {
auto t = hb::machineTypeFromAdemcoEvent(e); auto t = hb::machineTypeFromAdemcoEvent(e);
......
...@@ -397,6 +397,20 @@ static ZoneProperty zonePropertyFromChar(Char zp) { ...@@ -397,6 +397,20 @@ static ZoneProperty zonePropertyFromChar(Char zp) {
return ZoneProperty::InvalidZoneProperty; return ZoneProperty::InvalidZoneProperty;
} }
//! 根据防区属性判断是否支持报告防拆报警
static bool zonePropCanReportTamper(ZoneProperty zp) {
switch (zp) {
case hb::common::Buglar:
case hb::common::Emergency:
case hb::common::Duress:
case hb::common::BuglarHalf:
case hb::common::Bypass:
return true;
default:
return false;
}
}
static std::vector<ZoneProperty> getAvailableZoneProperties() { static std::vector<ZoneProperty> getAvailableZoneProperties() {
return { Buglar, Emergency, Fire, Duress, Gas, Water, SubMachine, RemoteControl, BuglarHalf, Shield, DoorRing, Bypass }; return { Buglar, Emergency, Fire, Duress, Gas, Water, SubMachine, RemoteControl, BuglarHalf, Shield, DoorRing, Bypass };
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment