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
2c807940
Commit
2c807940
authored
Sep 15, 2020
by
captainwong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
8216e485
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
21 deletions
+23
-21
README.md
docs/README.md
+11
-11
gen_event_md.cpp
examples/gen_event_md/gen_event_md.cpp
+6
-4
hb_detail.h
include/hb_detail.h
+6
-6
No files found.
docs/README.md
View file @
2c807940
...
...
@@ -151,17 +151,17 @@
### *恒博主机类型对照表*
*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><li>
HB-4040G
</li><li>
HB-5050G
</li><li>
HB-5050G-4G
</li></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|61~68|Yes|jjf|qfm|
<ul><li>
HB-G1000
</li><li>
HB-G1000-4G
</li></ul>
|
|1767 我是物联卡主机|9 物联卡主机|
1~60||
|jjf|qfm|
<ul><li>
HB-2050-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~99||
|wzq|qfm|
<ul><li>
HB-5050G-4GW
</li></ul>
|
|1797 我是GPRS主机能打电话|10 GPRS主机能打电话|
1~60|
|Yes|jjf|qfm|
<ul><li>
HB-2050
</li></ul>
|
|事件码类型|主机类型|
半布防|信号强度|防区|有线防区|SMS|内核|网络|
型号|
|---------|-------|----
--|-------|----|-------|---|---|---|
----|
|1707 我是网络模块|3 网络模块+工程主机|
Yes|No|1~999|1~8|No
|jjf|wzq|
<ul><li>
HB-G250
</li></ul>
|
|1717 我是GPRS主机|4 GPRS主机|
No|Yes|1~99|None
|Yes|wzq|qfm|
<ul><li>
HB-4040G
</li><li>
HB-5050G
</li><li>
HB-5050G-4G
</li></ul>
|
|1727 我是液晶主机|5 液晶主机|
Yes|Yes|1~249|None
|Yes|jjf|qfm|
<ul><li>
HB-BJQ560
</li><li>
HB-BJQ560B
</li></ul>
|
|1737 我是网线主机|6 网线主机|
No|No|1~99|None|No
|wzq|wzq|
<ul><li>
HB-4040R
</li><li>
HB-5050R
</li></ul>
|
|1757 我是三区段主机|8 三区段主机|
No|Yes|
1~191|61~68|Yes|jjf|qfm|
<ul><li>
HB-G1000
</li><li>
HB-G1000-4G
</li></ul>
|
|1767 我是物联卡主机|9 物联卡主机|
No|Yes|1~60|None|No
|jjf|qfm|
<ul><li>
HB-2050-4GW
</li></ul>
|
|1777 我是真彩主机|7 真彩主机|
No|Yes|
1~68|1~8|Yes|jjf|qfm|
<ul><li>
HB-G1000
</li><li>
HB-G1000-4G
</li></ul>
|
|1787 我是简化版物联卡主机|2 简化的物联卡主机|
No|Yes|1~99|None|No
|wzq|qfm|
<ul><li>
HB-5050G-4GW
</li></ul>
|
|1797 我是GPRS主机能打电话|10 GPRS主机能打电话|
No|Yes|1~60|None
|Yes|jjf|qfm|
<ul><li>
HB-2050
</li></ul>
|
### *恒博主机型号示例图片*
...
...
examples/gen_event_md/gen_event_md.cpp
View file @
2c807940
...
...
@@ -226,8 +226,8 @@ void print_machineTypes()
printf
(
"*SMS指主机自身是否可以拨打电话、发送短信,不是指通过阿里语音打电话*
\n
"
);
printf
(
"|事件码类型|主机类型|
防区|有线防区|SMS|内核|网络|在售
型号|
\n
"
"|---------|-------|----
|-------|---|----|----|---
----|
\n
"
);
printf
(
"|事件码类型|主机类型|
半布防|信号强度|防区|有线防区|SMS|内核|网络|
型号|
\n
"
"|---------|-------|----
--|-------|----|-------|---|---|---|
----|
\n
"
);
for
(
auto
e
:
AdemcoEvents
)
{
if
(
isMachineTypeEvent
(
e
))
{
...
...
@@ -236,13 +236,15 @@ void print_machineTypes()
printf
(
"|%04d %s"
,
(
int
)
e
,
jlib
::
win32
::
utf16_to_mbcs
(
ademcoEventToStringChinese
(
e
,
false
)).
data
());
printf
(
"|%s"
,
jlib
::
win32
::
utf16_to_mbcs
(
machineTypeToWString
(
t
)).
data
());
printf
(
"|%s"
,
machineCanHalfArm
(
t
)
?
"Yes"
:
"No"
);
printf
(
"|%s"
,
machineCanReportSignalStrength
(
t
)
?
"Yes"
:
"No"
);
printf
(
"|1~%d"
,
zoneMax
(
t
));
if
(
machineHasWiredZone
(
t
))
{
printf
(
"|%d~%d"
,
wiredZoneMin
(
t
),
wiredZoneMax
(
t
));
}
else
{
printf
(
"|"
);
printf
(
"|
None
"
);
}
printf
(
"|%s"
,
machineCanReportBySMS
(
t
)
?
"Yes"
:
""
);
printf
(
"|%s"
,
machineCanReportBySMS
(
t
)
?
"Yes"
:
"
No
"
);
printf
(
"|%s"
,
get_core_author
(
t
));
printf
(
"|%s"
,
get_net_author
(
t
));
_print_machine_img
(
t
);
...
...
include/hb_detail.h
View file @
2c807940
...
...
@@ -102,23 +102,23 @@ enum MachineType : Char {
WiFi
=
0
,
//! 网络摄像机 (未启用)
Camera
=
1
,
//!
物联卡主机 [HB-5050G HB-5050-4G
]
//!
简化的物联卡主机 [ HB-5050G-4GW
]
Gprs_IoT
=
2
,
//! 网络模块主机 [ HB-G250 ]
NetMod
=
3
,
//! 改进型卧式主机 [ HB-4040G HB-5050G HB-5050-4G ]
Gprs
=
4
,
//! 液晶主机 [ HB-BJQ-560B ]
//! 液晶主机 [ HB-BJQ
560 HB-BJQ
-560B ]
Lcd
=
5
,
//! 网线主机 [ HB-4040R HB-5050R ]
Wired
=
6
,
//! 真彩主机 [ HTZ-G1000
-2G
HTZ-G1000-4G ]
//! 真彩主机 [ HTZ-G1000 HTZ-G1000-4G ]
TrueColor
=
7
,
//! 三区段主机 [ HTZ-G1000
-2G
HTZ-G1000-4G ]
//! 三区段主机 [ HTZ-G1000 HTZ-G1000-4G ]
ThreeSection
=
8
,
//! 物联卡主机 [ HB-
5
050-4GW ]
//! 物联卡主机 [ HB-
2
050-4GW ]
IoT
=
9
,
//! GPRS主机可以打电话 [ HB-2050
-2G ] 防区 [1-60
]
//! GPRS主机可以打电话 [ HB-2050
]
Gprs_Phone
=
10
,
MachineTypeCount
,
...
...
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