Commit fd3f2b36 authored by captainwong's avatar captainwong

Merge branch 'master' into bench_client

parents b8ff9c3e 5134e775
...@@ -1050,7 +1050,7 @@ struct AdemcoPacket ...@@ -1050,7 +1050,7 @@ struct AdemcoPacket
seq_ = seq; seq_ = seq;
rrcvr_.setDefault(); lpref_.setDefault(); rrcvr_.setDefault(); lpref_.setDefault();
acct ? acct_.setAcct(acct) : acct_.setAcct(ademco_id); acct ? acct_.setAcct(acct) : acct_.setAcct(ademco_id);
ademcoData_.make(ademco_id, gg, evnt, zone); (ademco_id == 0 && acct) ? ademcoData_.make(acct, gg, evnt, zone) : ademcoData_.make(ademco_id, gg, evnt, zone);
xdata_ = xdata; xdata_ = xdata;
timestamp_.make(); timestamp_.make();
......
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