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
d761bbb7
Commit
d761bbb7
authored
Jun 26, 2021
by
captainwong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nb主机无状态
parent
575b2477
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
47 additions
and
29 deletions
+47
-29
README.md
docs/README.md
+12
-12
gen_event_md.cpp
examples/gen_event_md/gen_event_md.cpp
+5
-2
hb_detail.h
include/hb_detail.h
+30
-15
No files found.
docs/README.md
View file @
d761bbb7
...
@@ -153,18 +153,18 @@
...
@@ -153,18 +153,18 @@
### *恒博主机类型对照表*
### *恒博主机类型对照表*
*SMS指主机自身是否可以拨打电话、发送短信,不是指通过阿里语音打电话*
*SMS指主机自身是否可以拨打电话、发送短信,不是指通过阿里语音打电话*
|事件码类型|主机类型|
半布防
|信号强度|防区|有线防区|SMS|内核|网络|型号|
|事件码类型|主机类型|
布防|撤防|半布防|设置
|信号强度|防区|有线防区|SMS|内核|网络|型号|
|---------|-------|----
--|-------|----|-------|---|
---|---|----|
|---------|-------|----
|----|-----|----|-------|----|-------|---|-
---|---|----|
|1707 我是网络模块|3 网络模块+工程主机|√| |1~999|1~8| |jjf|wzq|
<ul><li>
G250
</li></ul>
|
|1707 我是网络模块|3 网络模块+工程主机|√|
√|√|√|
|1~999|1~8| |jjf|wzq|
<ul><li>
G250
</li></ul>
|
|1717 我是GPRS主机|4 GPRS主机|
|√|1~99| |√|wzq|qfm|
<ul><li>
4040G
</li><li>
5050G
</li><li>
5050G-4G
</li></ul>
|
|1717 我是GPRS主机|4 GPRS主机|
√|√| |√
|√|1~99| |√|wzq|qfm|
<ul><li>
4040G
</li><li>
5050G
</li><li>
5050G-4G
</li></ul>
|
|1727 我是液晶主机|5 液晶主机|√|√|1~249| |√|jjf|qfm|
<ul><li>
BJQ560
</li><li>
BJQ560B
</li></ul>
|
|1727 我是液晶主机|5 液晶主机|√|√|
√|√|√|
1~249| |√|jjf|qfm|
<ul><li>
BJQ560
</li><li>
BJQ560B
</li></ul>
|
|1737 我是网线主机|6 网线主机|
| |1~99| | |wzq|wzq|
<ul><li>
4040R
</li><li>
5050R
</li></ul>
|
|1737 我是网线主机|6 网线主机|
√|√| |√
| |1~99| | |wzq|wzq|
<ul><li>
4040R
</li><li>
5050R
</li></ul>
|
|1757 我是三区段主机|8 三区段主机|
|√|1~191|61~68|√|jjf|qfm|
<ul><li>
G1000
</li><li>
G1000-4G
</li></ul>
|
|1757 我是三区段主机|8 三区段主机|
√|√| |√
|√|1~191|61~68|√|jjf|qfm|
<ul><li>
G1000
</li><li>
G1000-4G
</li></ul>
|
|1767 我是物联卡主机|9 物联卡主机|
|√|1~60| | |jjf|qfm|
<ul><li>
2050-4GW
</li></ul>
|
|1767 我是物联卡主机|9 物联卡主机|
√|√| |√
|√|1~60| | |jjf|qfm|
<ul><li>
2050-4GW
</li></ul>
|
|1777 我是真彩主机|7 真彩主机|
|√|1~68|1~8|√|jjf|qfm|
<ul><li>
G1000
</li><li>
G1000-4G
</li></ul>
|
|1777 我是真彩主机|7 真彩主机|
√|√| |√
|√|1~68|1~8|√|jjf|qfm|
<ul><li>
G1000
</li><li>
G1000-4G
</li></ul>
|
|1787 我是简化版物联卡主机|2 简化的物联卡主机|
|√|1~99| | |wzq|qfm|
<ul><li>
5050G-4GW
</li></ul>
|
|1787 我是简化版物联卡主机|2 简化的物联卡主机|
√|√| |√
|√|1~99| | |wzq|qfm|
<ul><li>
5050G-4GW
</li></ul>
|
|1797 我是GPRS主机能打电话|10 GPRS主机能打电话|
|√|1~60| |√|jjf|qfm|
<ul><li>
2050
</li></ul>
|
|1797 我是GPRS主机能打电话|10 GPRS主机能打电话|
√|√| |√
|√|1~60| |√|jjf|qfm|
<ul><li>
2050
</li></ul>
|
|1807 我是NB报警接收主机|11 N
b报警接收主机
| |√|1~999| | ||qfm|
<ul></ul>
|
|1807 我是NB报警接收主机|11 N
B报警接收主机| | |
| |√|1~999| | ||qfm|
<ul></ul>
|
### *恒博主机型号示例图片*
### *恒博主机型号示例图片*
...
...
examples/gen_event_md/gen_event_md.cpp
View file @
d761bbb7
...
@@ -238,8 +238,8 @@ void print_machineTypes()
...
@@ -238,8 +238,8 @@ void print_machineTypes()
printf
(
"*SMS指主机自身是否可以拨打电话、发送短信,不是指通过阿里语音打电话*
\n
"
);
printf
(
"*SMS指主机自身是否可以拨打电话、发送短信,不是指通过阿里语音打电话*
\n
"
);
printf
(
"|事件码类型|主机类型|
半布防
|信号强度|防区|有线防区|SMS|内核|网络|型号|
\n
"
printf
(
"|事件码类型|主机类型|
布防|撤防|半布防|设置
|信号强度|防区|有线防区|SMS|内核|网络|型号|
\n
"
"|---------|-------|----
--|-------|----|-------|---|
---|---|----|
\n
"
);
"|---------|-------|----
|----|-----|----|-------|----|-------|---|-
---|---|----|
\n
"
);
for
(
auto
e
:
AdemcoEvents
)
{
for
(
auto
e
:
AdemcoEvents
)
{
if
(
isMachineTypeEvent
(
e
))
{
if
(
isMachineTypeEvent
(
e
))
{
...
@@ -248,7 +248,10 @@ void print_machineTypes()
...
@@ -248,7 +248,10 @@ void print_machineTypes()
printf
(
"|%04d %s"
,
(
int
)
e
,
jlib
::
win32
::
utf16_to_mbcs
(
ademcoEventToStringChinese
(
e
,
false
)).
data
());
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"
,
jlib
::
win32
::
utf16_to_mbcs
(
machineTypeToWString
(
t
)).
data
());
printf
(
"|%s"
,
print_bool
(
machineCanArm
(
t
)));
printf
(
"|%s"
,
print_bool
(
machineCanDisarm
(
t
)));
printf
(
"|%s"
,
print_bool
(
machineCanHalfArm
(
t
)));
printf
(
"|%s"
,
print_bool
(
machineCanHalfArm
(
t
)));
printf
(
"|%s"
,
print_bool
(
machineCanEnterSettings
(
t
)));
printf
(
"|%s"
,
print_bool
(
machineCanReportSignalStrength
(
t
)));
printf
(
"|%s"
,
print_bool
(
machineCanReportSignalStrength
(
t
)));
printf
(
"|1~%d"
,
zoneMax
(
t
));
printf
(
"|1~%d"
,
zoneMax
(
t
));
if
(
machineHasWiredZone
(
t
))
{
if
(
machineHasWiredZone
(
t
))
{
...
...
include/hb_detail.h
View file @
d761bbb7
...
@@ -194,6 +194,36 @@ static bool isValidZoneStrict(MachineType type, uint16_t zone) {
...
@@ -194,6 +194,36 @@ static bool isValidZoneStrict(MachineType type, uint16_t zone) {
return
ademco
::
ZoneMin
<=
zone
&&
zone
<=
zoneMax
(
type
);
return
ademco
::
ZoneMin
<=
zone
&&
zone
<=
zoneMax
(
type
);
}
}
//! 主机是否已投产使用
static
bool
machineIsSelling
(
MachineType
type
)
{
return
type
==
MachineType
::
NetMod
||
type
==
MachineType
::
Gprs
||
type
==
MachineType
::
Gprs_IoT
||
type
==
MachineType
::
IoT
||
type
==
MachineType
::
Lcd
||
type
==
MachineType
::
Wired
||
type
==
MachineType
::
TrueColor
||
type
==
MachineType
::
ThreeSection
||
type
==
MachineType
::
Gprs_Phone
||
type
==
MachineType
::
Nb
;
}
//! 主机是否具有布防功能
static
bool
machineCanArm
(
MachineType
type
)
{
return
machineIsSelling
(
type
)
&&
(
type
!=
MachineType
::
Nb
);
}
//! 主机是否具有撤防功能
static
bool
machineCanDisarm
(
MachineType
type
)
{
return
machineIsSelling
(
type
)
&&
(
type
!=
MachineType
::
Nb
);
}
//! 主机是否可以进入设置状态
static
bool
machineCanEnterSettings
(
MachineType
type
)
{
return
machineIsSelling
(
type
)
&&
(
type
!=
MachineType
::
Nb
);
}
//! 主机是否具有半布防功能
//! 主机是否具有半布防功能
static
bool
machineCanHalfArm
(
MachineType
type
)
{
static
bool
machineCanHalfArm
(
MachineType
type
)
{
return
type
==
MachineType
::
NetMod
return
type
==
MachineType
::
NetMod
...
@@ -225,21 +255,6 @@ static bool machineCanReportBySMS(MachineType type) {
...
@@ -225,21 +255,6 @@ static bool machineCanReportBySMS(MachineType type) {
;
;
}
}
//! 主机是否已投产使用
static
bool
machineIsSelling
(
MachineType
type
)
{
return
type
==
MachineType
::
NetMod
||
type
==
MachineType
::
Gprs
||
type
==
MachineType
::
Gprs_IoT
||
type
==
MachineType
::
IoT
||
type
==
MachineType
::
Lcd
||
type
==
MachineType
::
Wired
||
type
==
MachineType
::
TrueColor
||
type
==
MachineType
::
ThreeSection
||
type
==
MachineType
::
Gprs_Phone
||
type
==
MachineType
::
Nb
;
}
//! 主机是否支持有线防区
//! 主机是否支持有线防区
static
bool
machineHasWiredZone
(
MachineType
type
)
{
static
bool
machineHasWiredZone
(
MachineType
type
)
{
return
type
==
MachineType
::
NetMod
return
type
==
MachineType
::
NetMod
...
...
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