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
ea2321a6
Commit
ea2321a6
authored
Apr 08, 2024
by
captainwong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
库内容没有相关更新,更新文档
parent
8bfd2547
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
31 additions
and
19 deletions
+31
-19
CHANGELOG.md
CHANGELOG.md
+12
-0
ademco_version.h
ademco_version.h
+2
-2
README.md
docs/README.md
+13
-13
gen_event_md.cpp
examples/gen_event_md/gen_event_md.cpp
+4
-4
No files found.
CHANGELOG.md
View file @
ea2321a6
# Ademco Change Log
## 2.2.1
## 2.2.0
## 2.1.7
## 2.1.6
-
fix typo of
`hb_machine_timer_to_greenwich`
,
`hb_machine_timer_from_greenwich`
...
...
ademco_version.h
View file @
ea2321a6
...
...
@@ -7,8 +7,8 @@
*/
#define ADEMCO_VERSION_MAJOR 2
#define ADEMCO_VERSION_MINOR
1
#define ADEMCO_VERSION_PATCH
6
#define ADEMCO_VERSION_MINOR
2
#define ADEMCO_VERSION_PATCH
1
#define ADEMCO_VERSION_IS_RELEASE 1
#define ADEMCO_VERSION_SUFFIX ""
...
...
docs/README.md
View file @
ea2321a6
...
...
@@ -156,19 +156,19 @@
### *恒博主机类型对照表*
*SMS指主机自身是否可以拨打电话、发送短信,不是指通过阿里语音打电话*
|事件码
类型
|主机类型|布防|撤防|半布防|设置|信号强度|防区|有线防区|SMS|内核|网络|型号|
|------
---
|-------|----|----|-----|----|-------|----|-------|---|----|---|----|
|1707 主机类型--网络模块|网络模块主机|√|√|√|√| |1~999|1~8| |jjf|qfm|
<ul><li>
G250
</li></ul>
|
|1717 主机类型--GPRS主机|GPRS主机|√|√| |√|√|1~99| |√|wzq|qfm|
<ul><li>
4040G
</li><li>
5050G
</li><li>
5050G-4G
</li></ul>
|
|1727 主机类型--液晶主机|液晶主机|√|√|√|√|√|1~249| |√|jjf|qfm|
<ul><li>
BJQ560
</li><li>
BJQ560B
</li></ul>
|
|1737 主机类型--网线主机|网线主机|√|√| |√| |1~99| | |wzq|qfm|
<ul><li>
4040R
</li><li>
5050R
</li></ul>
|
|1757 主机类型--三区段主机|三区段主机|√|√| |√|√|1~191|61~68|√|jjf|qfm|
<ul><li>
G1000
</li><li>
G1000-4G
</li></ul>
|
|1767 主机类型--物联卡主机|物联卡主机|√|√| |√|√|1~60| | |jjf|qfm|
<ul><li>
2050-4GW
</li></ul>
|
|1777 主机类型--真彩主机|真彩主机|√|√| |√|√|1~68|1~8|√|jjf|qfm|
<ul><li>
G1000
</li><li>
G1000-4G
</li></ul>
|
|1787 主机类型--物联卡主机|简化物联卡主机|√|√| |√|√|1~99| | |wzq|qfm|
<ul><li>
5050G-4GW
</li></ul>
|
|1797 主机类型--GRPS主机带电话功能|GPRS主机可电话|√|√| |√|√|1~60| |√|jjf|qfm|
<ul><li>
2050
</li></ul>
|
|1807 主机类型--NB报警接收主机|NB报警接收主机| | | |√|√|1~999| | |||
<ul></ul>
|
|1817 主机类型--WiFi主机(新版)|WiFi主机新版|√|√| |√|√|1~99| | |wzq|qfm|
<ul></ul>
|
|事件码|主机类型|布防|撤防|半布防|设置|信号强度|防区|有线防区|SMS|内核|网络|型号|
|------|-------|----|----|-----|----|-------|----|-------|---|----|---|----|
|1707 主机类型--网络模块|
3
网络模块主机|√|√|√|√| |1~999|1~8| |jjf|qfm|
<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>
|
|1727 主机类型--液晶主机|
5
液晶主机|√|√|√|√|√|1~249| |√|jjf|qfm|
<ul><li>
BJQ560
</li><li>
BJQ560B
</li></ul>
|
|1737 主机类型--网线主机|
6
网线主机|√|√| |√| |1~99| | |wzq|qfm|
<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>
|
|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>
|
|1787 主机类型--物联卡主机|
2
简化物联卡主机|√|√| |√|√|1~99| | |wzq|qfm|
<ul><li>
5050G-4GW
</li></ul>
|
|1797 主机类型--GRPS主机带电话功能|
10
GPRS主机可电话|√|√| |√|√|1~60| |√|jjf|qfm|
<ul><li>
2050
</li></ul>
|
|1807 主机类型--NB报警接收主机|
11
NB报警接收主机| | | |√|√|1~999| | |||
<ul></ul>
|
|1817 主机类型--WiFi主机(新版)|
12
WiFi主机新版|√|√| |√|√|1~99| | |wzq|qfm|
<ul></ul>
|
### *恒博主机型号示例图片*
...
...
examples/gen_event_md/gen_event_md.cpp
View file @
ea2321a6
...
...
@@ -171,8 +171,8 @@ void print_machineTypes()
printf
(
"*SMS指主机自身是否可以拨打电话、发送短信,不是指通过阿里语音打电话*
\n
"
);
printf
(
"|事件码
类型
|主机类型|布防|撤防|半布防|设置|信号强度|防区|有线防区|SMS|内核|网络|型号|
\n
"
"|------
---
|-------|----|----|-----|----|-------|----|-------|---|----|---|----|
\n
"
);
printf
(
"|事件码|主机类型|布防|撤防|半布防|设置|信号强度|防区|有线防区|SMS|内核|网络|型号|
\n
"
"|------|-------|----|----|-----|----|-------|----|-------|---|----|---|----|
\n
"
);
for
(
auto
e
:
allEvents
)
{
if
(
ademco_is_machine_type_event
(
e
))
{
...
...
@@ -180,7 +180,7 @@ void print_machineTypes()
if
(
!
hb_is_machine_on_sale
(
t
))
continue
;
printf
(
"|%04d %s"
,
(
int
)
e
,
ademco_event_to_string_chinese
(
e
));
printf
(
"|%
s"
,
hb_machine_type_to_string_chinese
(
t
));
printf
(
"|%
d %s"
,
(
int
)
t
,
hb_machine_type_to_string_chinese
(
t
));
printf
(
"|%s"
,
print_bool
(
hb_machine_can_arm
(
t
)));
printf
(
"|%s"
,
print_bool
(
hb_machine_can_disarm
(
t
)));
printf
(
"|%s"
,
print_bool
(
hb_machine_can_half_arm
(
t
)));
...
...
@@ -405,7 +405,7 @@ int main()
#define GEN_G250_CODES 2
#define GEN_CONTROL_SOURCES 3
const
int
what
=
GEN_
CONTROL_SOURCE
S
;
const
int
what
=
GEN_
EVENT
S
;
if
(
what
==
GEN_EVENTS
)
{
printf
(
"### 主机状态
\n\n
"
);
...
...
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