Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
A
ademco_hb
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
captainwong
ademco_hb
Commits
7e021b01
Commit
7e021b01
authored
Nov 19, 2023
by
captainwong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix typo; rm ademcoMakeAdmNullPacket2; set id enum on make
parent
48ab4356
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
12 deletions
+7
-12
ademco.c
ademco.c
+6
-8
ademco.h
ademco.h
+1
-4
No files found.
ademco.c
View file @
7e021b01
...
...
@@ -680,7 +680,7 @@ AdemcoPacketId getAdemcoPacketId(const char* id, size_t len) {
return
AID_INVALID
;
}
const
char
*
ad
me
coPacketIdToString
(
AdemcoPacketId
id
)
{
const
char
*
ad
em
coPacketIdToString
(
AdemcoPacketId
id
)
{
if
(
0
<=
id
&&
id
<
AID_COUNT
)
return
ids
[
id
];
else
...
...
@@ -942,20 +942,15 @@ size_t ademcoMakeNullPacket2(AdemcoPacket* pkt, uint16_t seq, const char* acct,
pkt
->
seq
=
seq
;
copyAcct2AdemcoPacket
(
pkt
,
acct
);
pkt
->
data
.
ademcoId
=
ademcoId
;
pkt
->
id
=
AID_NULL
;
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
)
{
pkt
->
seq
=
seq
;
copyAcct2AdemcoPacket
(
pkt
,
acct
);
pkt
->
data
.
ademcoId
=
ademcoId
;
pkt
->
id
=
AID_ACK
;
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
pkt
->
seq
=
seq
;
copyAcct2AdemcoPacket
(
pkt
,
acct
);
pkt
->
data
.
ademcoId
=
ademcoId
;
pkt
->
id
=
AID_NAK
;
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
pkt
->
xdata
.
raw_len
=
xdata
->
raw_len
;
}
else
memset
(
&
pkt
->
xdata
,
0
,
sizeof
(
*
xdata
));
pkt
->
id
=
AID_HB
;
return
pkt
->
raw_len
=
ademcoMakeHbPacket
(
pkt
->
raw
,
sizeof
(
pkt
->
raw
),
seq
,
acct
,
ademcoId
,
ademcoEvent
,
gg
,
zone
,
xdata
);
}
...
...
@@ -992,6 +989,7 @@ size_t ademcoMakeAdmPacket2(AdemcoPacket* pkt, uint16_t seq, const char* acct, A
pkt
->
xdata
.
raw_len
=
xdata
->
raw_len
;
}
else
memset
(
&
pkt
->
xdata
,
0
,
sizeof
(
*
xdata
));
pkt
->
id
=
AID_ADM_CID
;
return
pkt
->
raw_len
=
ademcoMakeAdmPacket
(
pkt
->
raw
,
sizeof
(
pkt
->
raw
),
seq
,
acct
,
ademcoId
,
ademcoEvent
,
gg
,
zone
,
xdata
);
}
...
...
ademco.h
View file @
7e021b01
...
...
@@ -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
AdemcoPacketId
getAdemcoPacketId
(
const
char
*
id
,
size_t
len
);
ADEMCO_EXPORT_SYMBOL
const
char
*
ad
me
coPacketIdToString
(
AdemcoPacketId
id
);
ADEMCO_EXPORT_SYMBOL
const
char
*
ad
em
coPacketIdToString
(
AdemcoPacketId
id
);
/*
* ademcoMake*Packet functions
...
...
@@ -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
,
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
,
uint16_t
seq
,
const
char
*
acct
,
AdemcoId
ademcoId
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment