Commit 53a597eb authored by captainwong's avatar captainwong

build

parent c1744ae3
...@@ -489,7 +489,7 @@ int ademcoDataSegmentToCongwinFe100(uint8_t* fe100, const AdemcoDataSegment* dat ...@@ -489,7 +489,7 @@ int ademcoDataSegmentToCongwinFe100(uint8_t* fe100, const AdemcoDataSegment* dat
*p++ = 'B'; *p++ = 'B';
*p++ = '0'; *p++ = '0';
} else { } else {
sprintf(p, "%03d", dataSegment->ademcoEvent % 1000); // ȡ��3λ sprintf(p, "%03d", dataSegment->ademcoEvent % 1000);
p += 3; p += 3;
} }
...@@ -786,7 +786,8 @@ int ademcoMakeNakPacket2(AdemcoPacket* pkt, uint16_t seq, const char* acct, Adem ...@@ -786,7 +786,8 @@ int ademcoMakeNakPacket2(AdemcoPacket* pkt, uint16_t seq, const char* acct, Adem
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);
} }
int ademcoMakeHbPacket2(AdemcoPacket* pkt, uint16_t seq, const char* acct, AdemcoId ademcoId, AdemcoEvent ademcoEvent, AdemcoGG gg, AdemcoZone zone, AdemcoXDataSegment* xdata) int ademcoMakeHbPacket2(AdemcoPacket* pkt, uint16_t seq, const char* acct, AdemcoId ademcoId,
AdemcoEvent ademcoEvent, AdemcoGG gg, AdemcoZone zone, AdemcoXDataSegment* xdata)
{ {
pkt->seq = seq; pkt->seq = seq;
copyAcct2AdemcoPacket(pkt, acct); copyAcct2AdemcoPacket(pkt, acct);
......
...@@ -12,4 +12,4 @@ if [ x$1 != x ] ;then ...@@ -12,4 +12,4 @@ if [ x$1 != x ] ;then
fi fi
fi fi
g++ $opt ../server_demo/server_demo.cpp -I../../include -lpthread -o server_demo g++ $opt ../server_demo/server_demo.cpp ../../ademco.c -I../../ -lpthread -o server_demo
\ No newline at end of file \ No newline at end of file
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