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
a9f29aea
Commit
a9f29aea
authored
Feb 20, 2023
by
captainwong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
signal strength codec
parent
759aba27
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
3 deletions
+14
-3
ademco.c
ademco.c
+9
-1
ademco.h
ademco.h
+2
-1
README.md
docs/README.md
+1
-1
hb_com.h
hb_com.h
+2
-0
No files found.
ademco.c
View file @
a9f29aea
...
...
@@ -39,6 +39,14 @@ void ademcoPrint(const ademco_char_t* p, size_t len)
printf
(
"
\n
"
);
}
uint8_t
ademcoEncodeSignalStrength
(
int
strength
)
{
return
((
strength
/
10
)
<<
4
)
|
(
strength
%
10
);
}
int
ademcoDecodeSignalStrength
(
uint8_t
code
)
{
return
((
code
>>
4
)
&
0x0F
)
*
10
+
(
code
&
0x0F
);
}
int
ademcoIsMachineStatusEvent
(
AdemcoEvent
ademcoEvent
)
{
return
ademcoEvent
==
EVENT_ARM
||
ademcoEvent
==
EVENT_HALFARM
...
...
@@ -962,7 +970,7 @@ AdemcoParseResult ademcoPacketParse(const ademco_char_t* buff, size_t len, Ademc
valid_len
=
strtoul
(
temp
,
NULL
,
16
);
p
+=
4
+
valid_len
;
}
else
{
valid_len
=
pxdata
[
1
]
*
256
+
pxdata
[
2
];
valid_len
=
(
pxdata
[
1
]
<<
8
)
|
pxdata
[
2
];
p
+=
2
+
valid_len
;
}
...
...
ademco.h
View file @
a9f29aea
...
...
@@ -358,7 +358,8 @@ typedef struct AdemcoPacket {
//! print as HEX
ADEMCO_EXPORT_SYMBOL
void
ademcoPrint
(
const
ademco_char_t
*
buff
,
size_t
len
);
ADEMCO_EXPORT_SYMBOL
uint8_t
ademcoEncodeSignalStrength
(
int
strength
);
ADEMCO_EXPORT_SYMBOL
int
ademcoDecodeSignalStrength
(
uint8_t
code
);
//////////////////////// AdemcoEvent functions ////////////////////////
...
...
docs/README.md
View file @
a9f29aea
...
...
@@ -276,7 +276,7 @@
主机每隔一段时间向接警中心发送主机信号强度,数值由
`xdata`
传输。
有效数据1字节
,以
`BCD`
格式编码
有效数据1字节
.
例:
...
...
hb_com.h
View file @
a9f29aea
...
...
@@ -403,7 +403,9 @@ ADEMCO_EXPORT_SYMBOL int hbCheckSum(const uint8_t* data, size_t len);
ADEMCO_EXPORT_SYMBOL
HbComRequestType
hbComParseRequest
(
const
uint8_t
*
buff
,
size_t
len
,
HbComData
*
cd
);
ADEMCO_EXPORT_SYMBOL
HbComRequestType
hbComParseXDataRequest
(
const
AdemcoXDataSegment
*
xdata
,
HbComData
*
cd
);
// parse COM response and return response type. If cd is non-NULL, valid data will be copied to cd
ADEMCO_EXPORT_SYMBOL
HbComResponseType
hbComParseResponse
(
const
uint8_t
*
buff
,
size_t
len
,
HbComData
*
cd
);
// parse COM response and return response type. If cd is non-NULL, valid data will be copied to cd
ADEMCO_EXPORT_SYMBOL
HbComResponseType
hbComParseXDataResponse
(
const
AdemcoXDataSegment
*
xdata
,
HbComData
*
cd
);
ADEMCO_EXPORT_SYMBOL
void
hbComMakeReqA0_getMachineStatus
(
HbComData
*
data
);
...
...
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