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
60868ed3
Commit
60868ed3
authored
Jul 30, 2020
by
captainwong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
257b586d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
8 deletions
+4
-8
ademco_packet.h
include/ademco_packet.h
+4
-8
No files found.
include/ademco_packet.h
View file @
60868ed3
...
@@ -50,7 +50,7 @@ struct AdemcoData
...
@@ -50,7 +50,7 @@ struct AdemcoData
return
str
;
return
str
;
}
}
void
assignAdecoId
(
size_t
ademco_id
)
{
void
assignAde
m
coId
(
size_t
ademco_id
)
{
char
aid
[
7
]
=
{
0
};
char
aid
[
7
]
=
{
0
};
snprintf
(
aid
,
sizeof
(
aid
),
"%06X"
,
static_cast
<
int
>
(
ademco_id
%
1000000
));
snprintf
(
aid
,
sizeof
(
aid
),
"%06X"
,
static_cast
<
int
>
(
ademco_id
%
1000000
));
std
::
copy
(
aid
,
aid
+
6
,
std
::
back_inserter
(
data_
));
std
::
copy
(
aid
,
aid
+
6
,
std
::
back_inserter
(
data_
));
...
@@ -94,7 +94,7 @@ struct AdemcoData
...
@@ -94,7 +94,7 @@ struct AdemcoData
data_
.
reserve
(
21
);
// [#000000|1400 00 000]
data_
.
reserve
(
21
);
// [#000000|1400 00 000]
data_
.
push_back
(
'['
);
data_
.
push_back
(
'['
);
data_
.
push_back
(
'#'
);
data_
.
push_back
(
'#'
);
assignAdecoId
(
ademco_id
);
assignAde
m
coId
(
ademco_id
);
data_
.
push_back
(
'|'
);
data_
.
push_back
(
'|'
);
assignAdemcoEvent
(
ademco_event
);
assignAdemcoEvent
(
ademco_event
);
data_
.
push_back
(
' '
);
data_
.
push_back
(
' '
);
...
@@ -704,7 +704,7 @@ public:
...
@@ -704,7 +704,7 @@ public:
void
setAcct
(
size_t
acct
)
{
void
setAcct
(
size_t
acct
)
{
data_
.
resize
(
8
);
data_
[
0
]
=
'#'
;
data_
.
resize
(
8
);
data_
[
0
]
=
'#'
;
snprintf
(
&
data_
[
1
],
7
,
"%06
d
"
,
static_cast
<
int
>
(
acct
%
1000000
));
snprintf
(
&
data_
[
1
],
7
,
"%06
X
"
,
static_cast
<
int
>
(
acct
%
1000000
));
}
}
void
setAcct
(
const
std
::
string
&
acct
)
{
void
setAcct
(
const
std
::
string
&
acct
)
{
...
@@ -911,11 +911,7 @@ struct AdemcoPacket
...
@@ -911,11 +911,7 @@ struct AdemcoPacket
seq_
=
seq
;
seq_
=
seq
;
rrcvr_
.
setDefault
();
lpref_
.
setDefault
();
rrcvr_
.
setDefault
();
lpref_
.
setDefault
();
acct
?
acct_
.
setAcct
(
acct
)
:
acct_
.
setAcct
(
ademco_id
);
acct
?
acct_
.
setAcct
(
acct
)
:
acct_
.
setAcct
(
ademco_id
);
if
(
acct
&&
ademco_id
==
0
)
{
ademcoData_
.
make
(
ademco_id
,
gg
,
evnt
,
zone
);
ademcoData_
.
make
(
acct
,
gg
,
evnt
,
zone
);
}
else
{
ademcoData_
.
make
(
ademco_id
,
gg
,
evnt
,
zone
);
}
xdata_
=
xdata
;
xdata_
=
xdata
;
timestamp_
.
make
();
timestamp_
.
make
();
...
...
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