Commit 7e021b01 authored by captainwong's avatar captainwong

fix typo; rm ademcoMakeAdmNullPacket2; set id enum on make

parent 48ab4356
...@@ -680,7 +680,7 @@ AdemcoPacketId getAdemcoPacketId(const char* id, size_t len) { ...@@ -680,7 +680,7 @@ AdemcoPacketId getAdemcoPacketId(const char* id, size_t len) {
return AID_INVALID; return AID_INVALID;
} }
const char* admecoPacketIdToString(AdemcoPacketId id) { const char* ademcoPacketIdToString(AdemcoPacketId id) {
if (0 <= id && id < AID_COUNT) if (0 <= id && id < AID_COUNT)
return ids[id]; return ids[id];
else else
...@@ -942,20 +942,15 @@ size_t ademcoMakeNullPacket2(AdemcoPacket* pkt, uint16_t seq, const char* acct, ...@@ -942,20 +942,15 @@ size_t ademcoMakeNullPacket2(AdemcoPacket* pkt, uint16_t seq, const char* acct,
pkt->seq = seq; pkt->seq = seq;
copyAcct2AdemcoPacket(pkt, acct); copyAcct2AdemcoPacket(pkt, acct);
pkt->data.ademcoId = ademcoId; pkt->data.ademcoId = ademcoId;
pkt->id = AID_NULL;
return pkt->raw_len = ademcoMakeNullPacket(pkt->raw, sizeof(pkt->raw), seq, acct, ademcoId); return pkt->raw_len = ademcoMakeNullPacket(pkt->raw, sizeof(pkt->raw), seq, acct, ademcoId);
} }
size_t ademcoMakeAdmNullPacket2(AdemcoPacket* pkt, uint16_t seq, const char* acct, AdemcoId ademcoId) {
pkt->seq = seq;
copyAcct2AdemcoPacket(pkt, acct);
pkt->data.ademcoId = ademcoId;
return pkt->raw_len = ademcoMakeAdmNullPacket(pkt->raw, sizeof(pkt->raw), seq, acct, ademcoId);
}
size_t ademcoMakeAckPacket2(AdemcoPacket* pkt, uint16_t seq, const char* acct, AdemcoId ademcoId) { size_t ademcoMakeAckPacket2(AdemcoPacket* pkt, uint16_t seq, const char* acct, AdemcoId ademcoId) {
pkt->seq = seq; pkt->seq = seq;
copyAcct2AdemcoPacket(pkt, acct); copyAcct2AdemcoPacket(pkt, acct);
pkt->data.ademcoId = ademcoId; pkt->data.ademcoId = ademcoId;
pkt->id = AID_ACK;
return pkt->raw_len = ademcoMakeAckPacket(pkt->raw, sizeof(pkt->raw), seq, acct, ademcoId); return pkt->raw_len = ademcoMakeAckPacket(pkt->raw, sizeof(pkt->raw), seq, acct, ademcoId);
} }
...@@ -963,6 +958,7 @@ size_t ademcoMakeNakPacket2(AdemcoPacket* pkt, uint16_t seq, const char* acct, A ...@@ -963,6 +958,7 @@ size_t ademcoMakeNakPacket2(AdemcoPacket* pkt, uint16_t seq, const char* acct, A
pkt->seq = seq; pkt->seq = seq;
copyAcct2AdemcoPacket(pkt, acct); copyAcct2AdemcoPacket(pkt, acct);
pkt->data.ademcoId = ademcoId; pkt->data.ademcoId = ademcoId;
pkt->id = AID_NAK;
return pkt->raw_len = ademcoMakeNakPacket(pkt->raw, sizeof(pkt->raw), seq, acct, ademcoId); return pkt->raw_len = ademcoMakeNakPacket(pkt->raw, sizeof(pkt->raw), seq, acct, ademcoId);
} }
...@@ -977,6 +973,7 @@ size_t ademcoMakeHbPacket2(AdemcoPacket* pkt, uint16_t seq, const char* acct, Ad ...@@ -977,6 +973,7 @@ size_t ademcoMakeHbPacket2(AdemcoPacket* pkt, uint16_t seq, const char* acct, Ad
pkt->xdata.raw_len = xdata->raw_len; pkt->xdata.raw_len = xdata->raw_len;
} else } else
memset(&pkt->xdata, 0, sizeof(*xdata)); memset(&pkt->xdata, 0, sizeof(*xdata));
pkt->id = AID_HB;
return pkt->raw_len = ademcoMakeHbPacket(pkt->raw, sizeof(pkt->raw), return pkt->raw_len = ademcoMakeHbPacket(pkt->raw, sizeof(pkt->raw),
seq, acct, ademcoId, ademcoEvent, gg, zone, xdata); seq, acct, ademcoId, ademcoEvent, gg, zone, xdata);
} }
...@@ -992,6 +989,7 @@ size_t ademcoMakeAdmPacket2(AdemcoPacket* pkt, uint16_t seq, const char* acct, A ...@@ -992,6 +989,7 @@ size_t ademcoMakeAdmPacket2(AdemcoPacket* pkt, uint16_t seq, const char* acct, A
pkt->xdata.raw_len = xdata->raw_len; pkt->xdata.raw_len = xdata->raw_len;
} else } else
memset(&pkt->xdata, 0, sizeof(*xdata)); memset(&pkt->xdata, 0, sizeof(*xdata));
pkt->id = AID_ADM_CID;
return pkt->raw_len = ademcoMakeAdmPacket(pkt->raw, sizeof(pkt->raw), return pkt->raw_len = ademcoMakeAdmPacket(pkt->raw, sizeof(pkt->raw),
seq, acct, ademcoId, ademcoEvent, gg, zone, xdata); seq, acct, ademcoId, ademcoEvent, gg, zone, xdata);
} }
......
...@@ -432,7 +432,7 @@ ADEMCO_EXPORT_SYMBOL int ademcoMakeXData(AdemcoXDataSegment* xdata, AdemcoXDataL ...@@ -432,7 +432,7 @@ ADEMCO_EXPORT_SYMBOL int ademcoMakeXData(AdemcoXDataSegment* xdata, AdemcoXDataL
ADEMCO_EXPORT_SYMBOL int isAdemcoPacketId(const char* standard, const char* id, size_t len); ADEMCO_EXPORT_SYMBOL int isAdemcoPacketId(const char* standard, const char* id, size_t len);
ADEMCO_EXPORT_SYMBOL AdemcoPacketId getAdemcoPacketId(const char* id, size_t len); ADEMCO_EXPORT_SYMBOL AdemcoPacketId getAdemcoPacketId(const char* id, size_t len);
ADEMCO_EXPORT_SYMBOL const char* admecoPacketIdToString(AdemcoPacketId id); ADEMCO_EXPORT_SYMBOL const char* ademcoPacketIdToString(AdemcoPacketId id);
/* /*
* ademcoMake*Packet functions * ademcoMake*Packet functions
...@@ -472,9 +472,6 @@ ADEMCO_EXPORT_SYMBOL size_t ademcoMakeAdmPacket(ademco_char_t* buff, size_t len, ...@@ -472,9 +472,6 @@ ADEMCO_EXPORT_SYMBOL size_t ademcoMakeAdmPacket(ademco_char_t* buff, size_t len,
ADEMCO_EXPORT_SYMBOL size_t ademcoMakeNullPacket2(AdemcoPacket* pkt, ADEMCO_EXPORT_SYMBOL size_t ademcoMakeNullPacket2(AdemcoPacket* pkt,
uint16_t seq, const char* acct, AdemcoId ademcoId); uint16_t seq, const char* acct, AdemcoId ademcoId);
ADEMCO_EXPORT_SYMBOL size_t ademcoMakeAdmNullPacket2(AdemcoPacket* pkt,
uint16_t seq, const char* acct, AdemcoId ademcoId);
ADEMCO_EXPORT_SYMBOL size_t ademcoMakeAckPacket2(AdemcoPacket* pkt, ADEMCO_EXPORT_SYMBOL size_t ademcoMakeAckPacket2(AdemcoPacket* pkt,
uint16_t seq, const char* acct, AdemcoId ademcoId); uint16_t seq, const char* acct, AdemcoId ademcoId);
......
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