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
28f7410b
Commit
28f7410b
authored
Jun 24, 2022
by
captainwong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix warnings
parent
602c0274
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
ademco.c
c/ademco.c
+8
-8
No files found.
c/ademco.c
View file @
28f7410b
...
@@ -326,7 +326,7 @@ uint16_t ademcoCRC16(const uint8_t* buff, int len, uint16_t crc)
...
@@ -326,7 +326,7 @@ uint16_t ademcoCRC16(const uint8_t* buff, int len, uint16_t crc)
int
ademcoAppendDataSegment
(
uint8_t
*
buff
,
AdemcoId
ademcoId
,
AdemcoEvent
ademcoEvent
,
AdemcoGG
gg
,
AdemcoZone
zone
)
int
ademcoAppendDataSegment
(
uint8_t
*
buff
,
AdemcoId
ademcoId
,
AdemcoEvent
ademcoEvent
,
AdemcoGG
gg
,
AdemcoZone
zone
)
{
{
uint8_t
*
p
=
buff
;
char
*
p
=
(
char
*
)
buff
;
if
(
ademcoEvent
==
EVENT_INVALID_EVENT
)
{
if
(
ademcoEvent
==
EVENT_INVALID_EVENT
)
{
*
p
++
=
'['
;
*
p
++
=
'['
;
*
p
++
=
']'
;
*
p
++
=
']'
;
...
@@ -363,7 +363,7 @@ int ademcoAppendDataSegment(uint8_t* buff, AdemcoId ademcoId, AdemcoEvent ademco
...
@@ -363,7 +363,7 @@ int ademcoAppendDataSegment(uint8_t* buff, AdemcoId ademcoId, AdemcoEvent ademco
*
p
++
=
']'
;
*
p
++
=
']'
;
assert
(
p
-
buff
==
ADEMCO_PACKET_DATA_SEGMENT_FULL_LEN
);
assert
(
p
-
(
char
*
)
buff
==
ADEMCO_PACKET_DATA_SEGMENT_FULL_LEN
);
*
p
++
=
'\0'
;
// for debug convenience
*
p
++
=
'\0'
;
// for debug convenience
...
@@ -521,7 +521,7 @@ int ademcoXDataGetValidContentLen(const AdemcoXDataSegment* xdata)
...
@@ -521,7 +521,7 @@ int ademcoXDataGetValidContentLen(const AdemcoXDataSegment* xdata)
int
ademcoMakeXData
(
AdemcoXDataSegment
*
xdata
,
AdemcoXDataLengthFormat
xlf
,
AdemcoXDataTransform
xtr
,
const
uint8_t
*
content
,
int
len
)
int
ademcoMakeXData
(
AdemcoXDataSegment
*
xdata
,
AdemcoXDataLengthFormat
xlf
,
AdemcoXDataTransform
xtr
,
const
uint8_t
*
content
,
int
len
)
{
{
uint8_t
transformed
[
ADEMCO_PACKET_XDATA_MAX_LEN
];
uint8_t
transformed
[
ADEMCO_PACKET_XDATA_MAX_LEN
];
in
t
translen
=
len
;
uint16_
t
translen
=
len
;
if
(
xtr
==
AdemcoXDataTransform_as_is
)
{
if
(
xtr
==
AdemcoXDataTransform_as_is
)
{
memcpy
(
transformed
,
content
,
len
);
memcpy
(
transformed
,
content
,
len
);
}
else
{
}
else
{
...
@@ -547,7 +547,7 @@ int ademcoMakeXData(AdemcoXDataSegment* xdata, AdemcoXDataLengthFormat xlf, Adem
...
@@ -547,7 +547,7 @@ int ademcoMakeXData(AdemcoXDataSegment* xdata, AdemcoXDataLengthFormat xlf, Adem
uint8_t
*
p
=
xdata
->
raw
;
uint8_t
*
p
=
xdata
->
raw
;
*
p
++
=
'['
;
*
p
++
=
'['
;
char
temp
[
5
];
char
temp
[
5
];
s
printf
(
temp
,
"%04d"
,
translen
&
0xFFFF
);
s
nprintf
(
temp
,
sizeof
(
temp
)
,
"%04d"
,
translen
&
0xFFFF
);
memcpy
(
p
,
temp
,
4
);
memcpy
(
p
,
temp
,
4
);
p
+=
4
;
p
+=
4
;
memcpy
(
p
,
transformed
,
translen
);
memcpy
(
p
,
transformed
,
translen
);
...
@@ -592,7 +592,7 @@ const char* admecoPacketIdToString(AdemcoPacketId id)
...
@@ -592,7 +592,7 @@ const char* admecoPacketIdToString(AdemcoPacketId id)
if
(
0
<=
id
&&
id
<
AID_COUNT
)
{
if
(
0
<=
id
&&
id
<
AID_COUNT
)
{
return
ids
[
id
];
return
ids
[
id
];
}
else
{
}
else
{
return
""
;
return
"
Unkown AdemcoPacketId
"
;
}
}
}
}
...
@@ -632,7 +632,7 @@ int ademcoMakeEmptyDataPacket(uint8_t* dst_buff, int len, const char* id, uint16
...
@@ -632,7 +632,7 @@ int ademcoMakeEmptyDataPacket(uint8_t* dst_buff, int len, const char* id, uint16
}
}
*
p
++
=
'['
;
*
p
++
=
'['
;
*
p
++
=
']'
;
*
p
++
=
']'
;
getNowTimestamp
(
p
);
getNowTimestamp
(
(
char
*
)
p
);
p
+=
ADEMCO_PACKET_TIMESTAMP_LEN
;
p
+=
ADEMCO_PACKET_TIMESTAMP_LEN
;
*
p
++
=
ADEMCO_PACKET_SUFIX
;
*
p
++
=
ADEMCO_PACKET_SUFIX
;
...
@@ -696,7 +696,7 @@ int ademcoMakeHbPacket(uint8_t* dst_buff, int len, uint16_t seq, const char* acc
...
@@ -696,7 +696,7 @@ int ademcoMakeHbPacket(uint8_t* dst_buff, int len, uint16_t seq, const char* acc
snprintf
(
p
,
7
,
"%06X"
,
ademcoId
);
snprintf
(
p
,
7
,
"%06X"
,
ademcoId
);
p
+=
6
;
p
+=
6
;
}
}
p
+=
ademcoAppendDataSegment
(
p
,
ademcoId
,
ademcoEvent
,
gg
,
zone
);
p
+=
ademcoAppendDataSegment
(
(
uint8_t
*
)
p
,
ademcoId
,
ademcoEvent
,
gg
,
zone
);
if
(
xdata
&&
xdata
->
raw_len
>
0
)
{
if
(
xdata
&&
xdata
->
raw_len
>
0
)
{
memcpy
(
p
,
xdata
->
raw
,
xdata
->
raw_len
);
memcpy
(
p
,
xdata
->
raw
,
xdata
->
raw_len
);
p
+=
xdata
->
raw_len
;
p
+=
xdata
->
raw_len
;
...
@@ -711,7 +711,7 @@ int ademcoMakeHbPacket(uint8_t* dst_buff, int len, uint16_t seq, const char* acc
...
@@ -711,7 +711,7 @@ int ademcoMakeHbPacket(uint8_t* dst_buff, int len, uint16_t seq, const char* acc
int
ademco_len
=
packet_len
-
1
-
4
-
4
-
1
;
int
ademco_len
=
packet_len
-
1
-
4
-
4
-
1
;
snprintf
(
temp
,
5
,
"%04X"
,
ademco_len
);
snprintf
(
temp
,
5
,
"%04X"
,
ademco_len
);
memcpy
(
plen
,
temp
,
4
);
memcpy
(
plen
,
temp
,
4
);
uint16_t
crc
=
ademcoCRC16
(
pid
,
ademco_len
,
0
);
uint16_t
crc
=
ademcoCRC16
(
(
const
uint8_t
*
)
pid
,
ademco_len
,
0
);
snprintf
(
temp
,
5
,
"%04X"
,
crc
);
snprintf
(
temp
,
5
,
"%04X"
,
crc
);
memcpy
(
pcrc
,
temp
,
4
);
memcpy
(
pcrc
,
temp
,
4
);
...
...
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