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
3d43f192
Commit
3d43f192
authored
Sep 14, 2020
by
captainwong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
58ac5f94
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
15 deletions
+18
-15
README.md
docs/README.md
+12
-11
gen_event_md.cpp
examples/gen_event_md/gen_event_md.cpp
+5
-3
ademco_event.h
include/ademco_event.h
+1
-1
No files found.
docs/README.md
View file @
3d43f192
...
...
@@ -148,17 +148,18 @@
### *恒博主机类型对照表*
|事件码类型|主机类型|防区|有线防区|电话报警|内核|网络|在售型号|
|---------|-------|----|-------|-------|----|----|-------|
|1707--我是网络模块|3 网络模块+工程主机|1~999|1~8||jjf|wzq|
<ul><li>
HB-G250
</li></ul>
|
|1717--我是GPRS主机|4 GPRS主机|1~99||Yes|wzq|qfm|
<ul></ul>
|
|1727--我是液晶主机|5 液晶主机|1~249||Yes|jjf|qfm|
<ul><li>
HB-BJQ560
</li><li>
HB-BJQ560B
</li></ul>
|
|1737--我是网线主机|6 网线主机|1~99|||wzq|wzq|
<ul><li>
HB-4040R
</li><li>
HB-5050R
</li></ul>
|
|1757--我是三区段主机|8 三区段主机|1~191|1~8|Yes|jjf|qfm|
<ul><li>
HB-G1000
</li><li>
HB-G1000-4G
</li></ul>
|
|1767--我是物联卡主机|9 物联卡主机|1~99|||jjf|qfm|
<ul><li>
HB-5050G-4GW
</li></ul>
|
|1777--我是真彩主机|7 真彩主机|1~68|1~8|Yes|jjf|qfm|
<ul><li>
HB-G1000
</li><li>
HB-G1000-4G
</li></ul>
|
|1787--我是简化版物联卡主机|2 简化的物联卡主机|1~68|||wzq|qfm|
<ul><li>
HB-5050G
</li><li>
HB-5050G-4G
</li></ul>
|
|1797--我是能打电话的GPRS主机|10 GPRS主机能打电话|1~60||Yes|jjf|qfm|
<ul><li>
HB-2050
</li></ul>
|
*SMS指主机自身是否可以拨打电话、发送短信,不是指通过阿里语音打电话*
|事件码类型|主机类型|防区|有线防区|SMS|内核|网络|在售型号|
|---------|-------|----|-------|---|----|----|-------|
|1707 我是网络模块|3 网络模块+工程主机|1~999|1~8||jjf|wzq|
<ul><li>
HB-G250
</li></ul>
|
|1717 我是GPRS主机|4 GPRS主机|1~99||Yes|wzq|qfm|
<ul></ul>
|
|1727 我是液晶主机|5 液晶主机|1~249||Yes|jjf|qfm|
<ul><li>
HB-BJQ560
</li><li>
HB-BJQ560B
</li></ul>
|
|1737 我是网线主机|6 网线主机|1~99|||wzq|wzq|
<ul><li>
HB-4040R
</li><li>
HB-5050R
</li></ul>
|
|1757 我是三区段主机|8 三区段主机|1~191|1~8|Yes|jjf|qfm|
<ul><li>
HB-G1000
</li><li>
HB-G1000-4G
</li></ul>
|
|1767 我是物联卡主机|9 物联卡主机|1~99|||jjf|qfm|
<ul><li>
HB-5050G-4GW
</li></ul>
|
|1777 我是真彩主机|7 真彩主机|1~68|1~8|Yes|jjf|qfm|
<ul><li>
HB-G1000
</li><li>
HB-G1000-4G
</li></ul>
|
|1787 我是简化版物联卡主机|2 简化的物联卡主机|1~68|||wzq|qfm|
<ul><li>
HB-5050G
</li><li>
HB-5050G-4G
</li></ul>
|
|1797 我是GPRS主机能打电话|10 GPRS主机能打电话|1~60||Yes|jjf|qfm|
<ul><li>
HB-2050
</li></ul>
|
### *恒博主机型号示例图片*
...
...
examples/gen_event_md/gen_event_md.cpp
View file @
3d43f192
...
...
@@ -223,15 +223,17 @@ void print_machineTypes()
{
printf
(
"### *恒博主机类型对照表*
\n\n
"
);
printf
(
"|事件码类型|主机类型|防区|有线防区|电话报警|内核|网络|在售型号|
\n
"
"|---------|-------|----|-------|-------|----|----|-------|
\n
"
);
printf
(
"*SMS指主机自身是否可以拨打电话、发送短信,不是指通过阿里语音打电话*
\n
"
);
printf
(
"|事件码类型|主机类型|防区|有线防区|SMS|内核|网络|在售型号|
\n
"
"|---------|-------|----|-------|---|----|----|-------|
\n
"
);
for
(
auto
e
:
AdemcoEvents
)
{
if
(
isMachineTypeEvent
(
e
))
{
auto
t
=
hb
::
machineTypeFromAdemcoEvent
(
e
);
if
(
!
machineIsSelling
(
t
))
continue
;
printf
(
"|%
s"
,
jlib
::
win32
::
utf16_to_mbcs
(
ademcoEventToStringChinese
(
e
)).
data
());
printf
(
"|%
04d %s"
,
(
int
)
e
,
jlib
::
win32
::
utf16_to_mbcs
(
ademcoEventToStringChinese
(
e
,
fals
e
)).
data
());
printf
(
"|%s"
,
jlib
::
win32
::
utf16_to_mbcs
(
machineTypeToWString
(
t
)).
data
());
printf
(
"|1~%d"
,
zoneMax
(
t
));
if
(
machineHasWiredZone
(
t
))
{
...
...
include/ademco_event.h
View file @
3d43f192
...
...
@@ -352,7 +352,7 @@ inline const std::wstring ademcoEventToStringChinese(ADEMCO_EVENT ademco_event,
case
EVENT_I_AM_IOT_MACHINE
:
return
n_to_s
(
ademco_event
)
+
L"我是物联卡主机"
;
case
EVENT_I_AM_TRUE_COLOR
:
return
n_to_s
(
ademco_event
)
+
L"我是真彩主机"
;
case
EVENT_I_AM_GPRS_IOT
:
return
n_to_s
(
ademco_event
)
+
L"我是简化版物联卡主机"
;
case
EVENT_I_AM_GPRS_PHONE
:
return
n_to_s
(
ademco_event
)
+
L"我是
能打电话的GPRS主机
"
;
case
EVENT_I_AM_GPRS_PHONE
:
return
n_to_s
(
ademco_event
)
+
L"我是
GPRS主机能打电话
"
;
case
EVENT_SIM_IS_IOT_CARD
:
return
n_to_s
(
ademco_event
)
+
L"SIM卡为物联卡"
;
case
EVENT_SIM_IS_IOT_PLATFORM_CARD
:
return
n_to_s
(
ademco_event
)
+
L"SIM卡为平台物联卡"
;
case
EVENT_SIM_IS_NOT_IOT_CARD
:
return
n_to_s
(
ademco_event
)
+
L"SIM卡为非物联卡"
;
...
...
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