Commit 1e6316aa authored by captainwong's avatar captainwong

fix Tamper & Lost

parent 425624e1
...@@ -87,7 +87,7 @@ enum class QueryStage { ...@@ -87,7 +87,7 @@ enum class QueryStage {
struct ZonePropertyAndLostConfig { struct ZonePropertyAndLostConfig {
ZoneProperty prop = ZoneProperty::InvalidZoneProperty; ZoneProperty prop = ZoneProperty::InvalidZoneProperty;
bool tamper_enabled = false; // 失联开关 bool lost_report_enabled = false; // 失联开关
}; };
struct Client { struct Client {
...@@ -204,7 +204,7 @@ void handle_com_passthrough(ThreadContext* context, Client& client, evbuffer* ou ...@@ -204,7 +204,7 @@ void handle_com_passthrough(ThreadContext* context, Client& client, evbuffer* ou
for (const auto& zp : zps) { for (const auto& zp : zps) {
ZonePropertyAndLostConfig zplc; ZonePropertyAndLostConfig zplc;
zplc.prop = zp.prop; zplc.prop = zp.prop;
zplc.tamper_enabled = false; zplc.lost_report_enabled = false;
client.zones[zp.zone] = zplc; client.zones[zp.zone] = zplc;
snprintf(buf, sizeof(buf), getZoneFormatString(machineTypeFromAdemcoEvent((ADEMCO_EVENT)client.type)), zp.zone); snprintf(buf, sizeof(buf), getZoneFormatString(machineTypeFromAdemcoEvent((ADEMCO_EVENT)client.type)), zp.zone);
printf("\t\tZone:"); printf("\t\tZone:");
...@@ -286,11 +286,11 @@ void handle_com_passthrough(ThreadContext* context, Client& client, evbuffer* ou ...@@ -286,11 +286,11 @@ void handle_com_passthrough(ThreadContext* context, Client& client, evbuffer* ou
std::vector<size_t> zones; std::vector<size_t> zones;
if (client.queryStage == QueryStage::QueryingLostConfig && resp.parse(zones, hasMore)) { if (client.queryStage == QueryStage::QueryingLostConfig && resp.parse(zones, hasMore)) {
for (const auto& zone : zones) { for (const auto& zone : zones) {
client.zones[zone].tamper_enabled = true; client.zones[zone].lost_report_enabled = true;
snprintf(buf, sizeof(buf), getZoneFormatString(machineTypeFromAdemcoEvent((ADEMCO_EVENT)client.type)), zone); snprintf(buf, sizeof(buf), getZoneFormatString(machineTypeFromAdemcoEvent((ADEMCO_EVENT)client.type)), zone);
printf("\t\tZone:"); printf("\t\tZone:");
printf("%s", buf); printf("%s", buf);
printf(" Tamper Enabled: true\n"); printf(" Lost Report Enabled: true\n");
} }
XDataPtr xdata; XDataPtr xdata;
if (hasMore) { // 继续索要剩余防区 if (hasMore) { // 继续索要剩余防区
...@@ -994,9 +994,9 @@ void Client::printInfo() const ...@@ -994,9 +994,9 @@ void Client::printInfo() const
snprintf(buf, sizeof(buf), getZoneFormatString(machineTypeFromAdemcoEvent((ADEMCO_EVENT)type)), zp.first); snprintf(buf, sizeof(buf), getZoneFormatString(machineTypeFromAdemcoEvent((ADEMCO_EVENT)type)), zp.first);
printf(" Zone:"); printf(" Zone:");
printf("%s", buf); printf("%s", buf);
printf(" Prop:0x%02X %s \tTamper Enabled:%s\n", printf(" Prop:0x%02X %s \tLost Report Enabled:%s\n",
zp.second.prop, zonePropertyToStringEn(zp.second.prop), zp.second.prop, zonePropertyToStringEn(zp.second.prop),
zp.second.tamper_enabled ? "true" : "false"); zp.second.lost_report_enabled ? "true" : "false");
} }
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
if (com::isValidMachineTimer(timer.timer[i])) { if (com::isValidMachineTimer(timer.timer[i])) {
......
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