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
1a8faf1d
Commit
1a8faf1d
authored
Oct 16, 2020
by
captainwong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
empty xdata
parent
52a39193
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
0 deletions
+3
-0
ademco_packet.h
include/ademco_packet.h
+3
-0
No files found.
include/ademco_packet.h
View file @
1a8faf1d
...
@@ -424,6 +424,7 @@ static XDataPtr makeXData(const std::vector<char>& payload,
...
@@ -424,6 +424,7 @@ static XDataPtr makeXData(const std::vector<char>& payload,
XData
::
LengthFormat
lengthFormat
=
XData
::
LengthFormat
::
TWO_HEX
,
XData
::
LengthFormat
lengthFormat
=
XData
::
LengthFormat
::
TWO_HEX
,
XData
::
DataFormat
dataFormat
=
XData
::
DataFormat
::
AS_IS
)
XData
::
DataFormat
dataFormat
=
XData
::
DataFormat
::
AS_IS
)
{
{
if
(
payload
.
empty
())
{
return
nullptr
;
}
auto
xdata
=
std
::
make_shared
<
XData
>
();
auto
xdata
=
std
::
make_shared
<
XData
>
();
xdata
->
lengthFormat_
=
lengthFormat
;
xdata
->
lengthFormat_
=
lengthFormat
;
if
(
dataFormat
==
XData
::
DataFormat
::
TO_ASCII
)
{
if
(
dataFormat
==
XData
::
DataFormat
::
TO_ASCII
)
{
...
@@ -463,6 +464,7 @@ static XDataPtr makeXData(const std::vector<char>& payload,
...
@@ -463,6 +464,7 @@ static XDataPtr makeXData(const std::vector<char>& payload,
static
XDataPtr
makeXData
(
const
char
*
pack
,
size_t
len
,
static
XDataPtr
makeXData
(
const
char
*
pack
,
size_t
len
,
XData
::
LengthFormat
lengthFormat
=
XData
::
LengthFormat
::
TWO_HEX
,
XData
::
LengthFormat
lengthFormat
=
XData
::
LengthFormat
::
TWO_HEX
,
XData
::
DataFormat
dataFormat
=
XData
::
DataFormat
::
AS_IS
)
{
XData
::
DataFormat
dataFormat
=
XData
::
DataFormat
::
AS_IS
)
{
if
(
len
==
0
)
{
return
nullptr
;
}
std
::
vector
<
char
>
data
(
pack
,
pack
+
len
);
std
::
vector
<
char
>
data
(
pack
,
pack
+
len
);
return
makeXData
(
data
,
lengthFormat
,
dataFormat
);
return
makeXData
(
data
,
lengthFormat
,
dataFormat
);
}
}
...
@@ -470,6 +472,7 @@ static XDataPtr makeXData(const char* pack, size_t len,
...
@@ -470,6 +472,7 @@ static XDataPtr makeXData(const char* pack, size_t len,
static
XDataPtr
makeXData
(
const
unsigned
char
*
pack
,
size_t
len
,
static
XDataPtr
makeXData
(
const
unsigned
char
*
pack
,
size_t
len
,
XData
::
LengthFormat
lengthFormat
=
XData
::
LengthFormat
::
TWO_HEX
,
XData
::
LengthFormat
lengthFormat
=
XData
::
LengthFormat
::
TWO_HEX
,
XData
::
DataFormat
dataFormat
=
XData
::
DataFormat
::
AS_IS
)
{
XData
::
DataFormat
dataFormat
=
XData
::
DataFormat
::
AS_IS
)
{
if
(
len
==
0
)
{
return
nullptr
;
}
std
::
vector
<
char
>
data
((
const
char
*
)
pack
,
(
const
char
*
)
pack
+
len
);
std
::
vector
<
char
>
data
((
const
char
*
)
pack
,
(
const
char
*
)
pack
+
len
);
return
makeXData
(
data
,
lengthFormat
,
dataFormat
);
return
makeXData
(
data
,
lengthFormat
,
dataFormat
);
}
}
...
...
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