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
48ab4356
Commit
48ab4356
authored
Nov 19, 2023
by
captainwong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
replace sprintf with snprintf; require buf len to make fe100 packet
parent
6d70a831
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
+8
-5
ademco.c
ademco.c
+7
-4
ademco.h
ademco.h
+1
-1
No files found.
ademco.c
View file @
48ab4356
...
...
@@ -492,12 +492,15 @@ AdemcoParseResult ademcoParseDataSegment(const ademco_char_t* packet, size_t pac
return
RESULT_ERROR
;
}
size_t
ademcoDataSegmentToCongwinFe100
(
ademco_char_t
*
fe100
,
const
AdemcoDataSegment
*
dataSegment
)
{
size_t
ademcoDataSegmentToCongwinFe100
(
ademco_char_t
*
fe100
,
size_t
fe100_len
,
const
AdemcoDataSegment
*
dataSegment
)
{
if
(
dataSegment
->
raw_len
==
ADEMCO_PACKET_DATA_SEGMENT_EMPTY_LEN
)
{
if
(
fe100_len
<
2
)
return
0
;
fe100
[
0
]
=
'\n'
;
fe100
[
1
]
=
'\r'
;
return
2
;
}
else
if
(
dataSegment
->
raw_len
>=
ADEMCO_PACKET_DATA_SEGMENT_FULL_LEN
)
{
if
(
fe100_len
<
CONGWIN_FE100_PACKET_LEN
)
return
0
;
char
*
p
=
fe100
;
*
p
++
=
'\n'
;
*
p
++
=
' '
;
...
...
@@ -506,7 +509,7 @@ size_t ademcoDataSegmentToCongwinFe100(ademco_char_t* fe100, const AdemcoDataSeg
*
p
++
=
'0'
;
*
p
++
=
' '
;
s
printf
(
p
,
"%08d"
,
dataSegment
->
ademcoId
);
s
nprintf
(
p
,
fe100_len
-
(
p
-
fe100
),
"%08d"
,
dataSegment
->
ademcoId
%
100000000
);
p
+=
8
;
*
p
++
=
' '
;
// 18
...
...
@@ -530,7 +533,7 @@ size_t ademcoDataSegmentToCongwinFe100(ademco_char_t* fe100, const AdemcoDataSeg
*
p
++
=
'B'
;
*
p
++
=
'0'
;
}
else
{
s
printf
(
p
,
"%03d"
,
dataSegment
->
ademcoEvent
%
1000
);
s
nprintf
(
p
,
fe100_len
-
(
p
-
fe100
)
,
"%03d"
,
dataSegment
->
ademcoEvent
%
1000
);
p
+=
3
;
}
...
...
@@ -544,7 +547,7 @@ size_t ademcoDataSegmentToCongwinFe100(ademco_char_t* fe100, const AdemcoDataSeg
else
*
p
++
=
'C'
;
// zone event
s
printf
(
p
,
"%03d"
,
dataSegment
->
zone
);
s
nprintf
(
p
,
fe100_len
-
(
p
-
fe100
),
"%03d"
,
dataSegment
->
zone
%
1000
);
p
+=
3
;
*
p
++
=
' '
;
...
...
ademco.h
View file @
48ab4356
...
...
@@ -405,7 +405,7 @@ ADEMCO_EXPORT_SYMBOL AdemcoParseResult ademcoParseDataSegment(const ademco_char_
AdemcoDataSegment
*
dataSegment
);
// return 0 for empty packet, CONGWIN_FE100_PACKET_LEN for success
ADEMCO_EXPORT_SYMBOL
size_t
ademcoDataSegmentToCongwinFe100
(
ademco_char_t
*
fe100
,
ADEMCO_EXPORT_SYMBOL
size_t
ademcoDataSegmentToCongwinFe100
(
ademco_char_t
*
fe100
,
size_t
fe100_len
,
const
AdemcoDataSegment
*
dataSegment
);
//////////////////////// AdemcoXDataSegment functions ////////////////////////
...
...
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