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
3a71cf08
Commit
3a71cf08
authored
Apr 03, 2023
by
captainwong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update doc for wifi machine
parent
f5cb7bcf
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
34 additions
and
18 deletions
+34
-18
ademco.c
ademco.c
+4
-1
ademco.h
ademco.h
+3
-1
README.md
docs/README.md
+14
-12
gen_event_md.cpp
examples/gen_event_md/gen_event_md.cpp
+4
-4
hb_com.c
hb_com.c
+7
-0
hb_com.h
hb_com.h
+2
-0
No files found.
ademco.c
View file @
3a71cf08
...
...
@@ -78,7 +78,8 @@ int ademcoIsMachineTypeEvent(AdemcoEvent ademcoEvent) {
||
ademcoEvent
==
EVENT_I_AM_TRUE_COLOR
||
ademcoEvent
==
EVENT_I_AM_GPRS_IOT
||
ademcoEvent
==
EVENT_I_AM_GPRS_PHONE
||
ademcoEvent
==
EVENT_I_AM_NB_MACHINE
;
||
ademcoEvent
==
EVENT_I_AM_NB_MACHINE
||
ademcoEvent
==
EVENT_I_AM_WIFI2_MACHINE
;
}
int
ademcoIsEventNeedControlSource
(
AdemcoEvent
ademcoEvent
)
{
...
...
@@ -220,6 +221,7 @@ const char* ademcoEventToString(AdemcoEvent ademcoEvent) {
case
EVENT_I_AM_GPRS_IOT
:
return
"I_AM_GPRS_IOT"
;
case
EVENT_I_AM_GPRS_PHONE
:
return
"I_AM_GPRS_PHONE"
;
case
EVENT_I_AM_NB_MACHINE
:
return
"I_AM_NB_MACHINE"
;
case
EVENT_I_AM_WIFI2_MACHINE
:
return
"I_AM_WIFI2_MACHINE"
;
case
EVENT_SIM_IS_IOT_CARD
:
return
"SIM card is IOT"
;
case
EVENT_SIM_IS_IOT_PLATFORM_CARD
:
return
"SIM card is Platform IOT"
;
case
EVENT_SIM_IS_NOT_IOT_CARD
:
return
"SIM card is not IOT"
;
...
...
@@ -299,6 +301,7 @@ const char* ademcoEventToStringChinese(AdemcoEvent ademcoEvent) {
case
EVENT_I_AM_GPRS_IOT
:
return
"我是简化版物联卡主机"
;
case
EVENT_I_AM_GPRS_PHONE
:
return
"我是GPRS主机能打电话"
;
case
EVENT_I_AM_NB_MACHINE
:
return
"我是NB报警接收主机"
;
case
EVENT_I_AM_WIFI2_MACHINE
:
return
"我是WiFi主机新版"
;
case
EVENT_SIM_IS_IOT_CARD
:
return
"SIM卡为物联卡"
;
case
EVENT_SIM_IS_IOT_PLATFORM_CARD
:
return
"SIM卡为平台物联卡"
;
case
EVENT_SIM_IS_NOT_IOT_CARD
:
return
"SIM卡为非物联卡"
;
...
...
ademco.h
View file @
3a71cf08
...
...
@@ -158,13 +158,14 @@ typedef enum AdemcoEvent {
EVENT_I_AM_GPRS
=
1717
,
// 主机类型--GPRS主机
EVENT_I_AM_LCD_MACHINE
=
1727
,
// 主机类型--液晶主机
EVENT_I_AM_WIRE_MACHINE
=
1737
,
// 主机类型--网线主机
EVENT_I_AM_WIFI_MACHINE
=
1747
,
// 主机类型--WiFi主机
EVENT_I_AM_WIFI_MACHINE
=
1747
,
// 主机类型--WiFi主机
(停用)
EVENT_I_AM_3_SECTION_MACHINE
=
1757
,
// 主机类型--三区段主机
EVENT_I_AM_IOT_MACHINE
=
1767
,
// 主机类型--物联卡主机
EVENT_I_AM_TRUE_COLOR
=
1777
,
// 主机类型--真彩主机
EVENT_I_AM_GPRS_IOT
=
1787
,
// 主机类型--物联卡主机
EVENT_I_AM_GPRS_PHONE
=
1797
,
// 主机类型--GRPS主机带电话功能
EVENT_I_AM_NB_MACHINE
=
1807
,
// 主机类型--NB报警接收主机
EVENT_I_AM_WIFI2_MACHINE
=
1817
,
// 主机类型--WiFi主机(新版)
EVENT_PHONE_USER_SOS
=
1709
,
// 手机用户SOS
EVENT_PHONE_USER_CANCLE_ALARM
=
1711
,
// 手机用户消警
...
...
@@ -253,6 +254,7 @@ static const AdemcoEvent AdemcoEvents[] = {
EVENT_I_AM_GPRS_IOT
,
EVENT_I_AM_GPRS_PHONE
,
EVENT_I_AM_NB_MACHINE
,
EVENT_I_AM_WIFI2_MACHINE
,
EVENT_SIM_IS_IOT_CARD
,
EVENT_SIM_IS_IOT_PLATFORM_CARD
,
...
...
docs/README.md
View file @
3a71cf08
...
...
@@ -139,6 +139,7 @@
|1787|我是简化版物联卡主机|I_AM_GPRS_IOT|
|1797|我是GPRS主机能打电话|I_AM_GPRS_PHONE|
|1807|我是NB报警接收主机|I_AM_NB_MACHINE|
|1817|我是WiFi主机新版|I_AM_WIFI2_MACHINE|
|1709|手机用户SOS|SOS|
|1711|手机用户消警|PHONE_USER_CANCLE_ALARM|
|1712|主机进入设置状态|ENTER_SETTING_MODE|
...
...
@@ -158,16 +159,17 @@
*SMS指主机自身是否可以拨打电话、发送短信,不是指通过阿里语音打电话*
|事件码类型|主机类型|布防|撤防|半布防|设置|信号强度|防区|有线防区|SMS|内核|网络|型号|
|---------|-------|----|----|-----|----|-------|----|-------|---|----|---|----|
|1707 我是网络模块|3 网络模块+工程主机|√|√|√|√| |1~999|1~8| |jjf|
wzq
|
<ul><li>
G250
</li></ul>
|
|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|
wzq
|
<ul><li>
4040R
</li><li>
5050R
</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 我是GPRS主机能打电话|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>
|
### *恒博主机型号示例图片*
...
...
@@ -201,17 +203,17 @@
|事件码|类型|型号|00|01|02|03|04|05|06|07|08|09|0A|0F|
|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|
|1707|3|
<ul><li>
G250
</li></ul>
|√|√|√|√|√|√|√|√|√|√|√|
|
|1717|4|
<ul><li>
4040G
</li><li>
5050G
</li><li>
5050G-4G
</li></ul>
|√|√|√|√|√|√|
|√| | | |
|
|1707|3|
<ul><li>
G250
</li></ul>
|√|√|√|√|√|√|√|√|√|√|√|
√
|
|1717|4|
<ul><li>
4040G
</li><li>
5050G
</li><li>
5050G-4G
</li></ul>
|√|√|√|√|√|√|
√|√|√|√|√|√
|
|1727|5|
<ul><li>
BJQ560
</li><li>
BJQ560B
</li></ul>
|√|√|√|√|√|√|√|√|√|√|√|√|
|1737|6|
<ul><li>
4040R
</li><li>
5050R
</li></ul>
|√|√|√|√|√|√|
|√| | | |
|
|1757|8|
<ul><li>
G1000
</li><li>
G1000-4G
</li></ul>
|√|√|√|√|√|√|
|√|
|√|√|√|
|1767|9|
<ul><li>
2050-4GW
</li></ul>
|√|√|√|√|√|√|
|√|
|√|√|√|
|1777|7|
<ul><li>
G1000
</li><li>
G1000-4G
</li></ul>
|√|√|√|√|√|√|
|√|
|√|√|√|
|1787|2|
<ul><li>
5050G-4GW
</li></ul>
|√|√|√|√|√|√|
|√| | | |
|
|1797|10|
<ul><li>
2050
</li></ul>
|√|√|√|√|√|√|
|√| | | |
|
|1807|11|
<ul></ul>
|√|√|√|√|√|√|
| | | |√|
|
|1737|6|
<ul><li>
4040R
</li><li>
5050R
</li></ul>
|√|√|√|√|√|√|
√|√|√|√|√|√
|
|1757|8|
<ul><li>
G1000
</li><li>
G1000-4G
</li></ul>
|√|√|√|√|√|√|
√|√|√
|√|√|√|
|1767|9|
<ul><li>
2050-4GW
</li></ul>
|√|√|√|√|√|√|
√|√|√
|√|√|√|
|1777|7|
<ul><li>
G1000
</li><li>
G1000-4G
</li></ul>
|√|√|√|√|√|√|
√|√|√
|√|√|√|
|1787|2|
<ul><li>
5050G-4GW
</li></ul>
|√|√|√|√|√|√|
√|√|√|√|√|√
|
|1797|10|
<ul><li>
2050
</li></ul>
|√|√|√|√|√|√|
√|√|√|√|√|√
|
|1807|11|
<ul></ul>
|√|√|√|√|√|√|
√|√|√|√|√|√
|
|1817|12|
<ul></ul>
|√|√|√|√|√|√|√|√|√|√|√|√|
## 四、恒博扩展
...
...
examples/gen_event_md/gen_event_md.cpp
View file @
3a71cf08
...
...
@@ -109,6 +109,7 @@ AdemcoEvent privateEvents[] = {
EVENT_I_AM_GPRS_IOT
,
EVENT_I_AM_GPRS_PHONE
,
EVENT_I_AM_NB_MACHINE
,
EVENT_I_AM_WIFI2_MACHINE
,
EVENT_PHONE_USER_SOS
,
EVENT_PHONE_USER_CANCLE_ALARM
,
...
...
@@ -149,6 +150,7 @@ const char* get_core_author(HbMachineType t)
case
HMT_GPRS_IOT
:
case
HMT_GPRS
:
case
HMT_WIRED
:
case
HMT_WIFI2
:
return
"wzq"
;
case
HMT_NETMOD
:
...
...
@@ -169,8 +171,6 @@ const char* get_net_author(HbMachineType t)
case
HMT_WIFI
:
case
HMT_WIRED
:
case
HMT_NETMOD
:
return
"wzq"
;
case
HMT_GPRS_IOT
:
case
HMT_GPRS
:
case
HMT_LCD
:
...
...
@@ -178,7 +178,7 @@ const char* get_net_author(HbMachineType t)
case
HMT_3_SECTION
:
case
HMT_IOT
:
case
HMT_GPRS_PHONE
:
//case hb::common::Nb
:
case
HMT_WIFI2
:
return
"qfm"
;
}
...
...
@@ -440,7 +440,7 @@ void print_g250_alarm_codes()
int
main
()
{
if
(
0
)
{
if
(
1
)
{
printf
(
"### 主机状态
\n\n
"
);
printEvents
(
statusEvents
,
_countof
(
statusEvents
));
...
...
hb_com.c
View file @
3a71cf08
...
...
@@ -9,6 +9,7 @@ int hbGetAvailableZoneProperties(HbMachineType type, HbZoneProperty props[12]) {
break
;
case
HMT_GPRS_IOT
:
case
HMT_GPRS
:
case
HMT_WIFI2
:
{
HbZoneProperty
hzps
[]
=
{
HZP_BUGLAR
,
HZP_EMERGENCY
,
HZP_FIRE
,
HZP_DURESS
,
HZP_GAS
,
HZP_WATER
,
HZP_REMOTE_CONTROL
,
};
memcpy
(
props
,
hzps
,
sizeof
(
hzps
));
...
...
@@ -77,6 +78,7 @@ uint16_t hbZoneMax(HbMachineType type) {
case
HMT_GPRS_IOT
:
case
HMT_GPRS
:
case
HMT_WIRED
:
case
HMT_WIFI2
:
return
99
;
case
HMT_NETMOD
:
...
...
@@ -123,6 +125,7 @@ int hbMachineIsSelling(HbMachineType type) {
||
type
==
HMT_3_SECTION
||
type
==
HMT_GPRS_PHONE
||
type
==
HMT_NB
||
type
==
HMT_WIFI2
;
}
...
...
@@ -293,6 +296,7 @@ AdemcoEvent hbMachineTypeToAdemcoEvent(HbMachineType type) {
case
HMT_IOT
:
return
EVENT_I_AM_IOT_MACHINE
;
case
HMT_GPRS_PHONE
:
return
EVENT_I_AM_GPRS_PHONE
;
case
HMT_NB
:
return
EVENT_I_AM_NB_MACHINE
;
case
HMT_WIFI2
:
return
EVENT_I_AM_WIFI2_MACHINE
;
default
:
return
EVENT_INVALID_EVENT
;
}
}
...
...
@@ -310,6 +314,7 @@ HbMachineType hbMachineTypeFromAdemcoEvent(AdemcoEvent ademcoEvent) {
case
EVENT_I_AM_GPRS_IOT
:
return
HMT_GPRS_IOT
;
case
EVENT_I_AM_GPRS_PHONE
:
return
HMT_GPRS_PHONE
;
case
EVENT_I_AM_NB_MACHINE
:
return
HMT_NB
;
case
EVENT_I_AM_WIFI2_MACHINE
:
return
HMT_WIFI2
;
default
:
return
HMT_INVALID
;
}
}
...
...
@@ -362,6 +367,7 @@ const char* hbMachineTypeToString(HbMachineType type) {
case
HMT_IOT
:
return
"9 IoT"
;
case
HMT_GPRS_PHONE
:
return
"10 Gprs_Phone"
;
case
HMT_NB
:
return
"11 Nb"
;
case
HMT_WIFI2
:
return
"12 WiFi2"
;
default
:
return
"Unknown HbMachineType"
;
}
}
...
...
@@ -380,6 +386,7 @@ const char* hbMachineTypeToStringChinese(HbMachineType type) {
case
HMT_IOT
:
return
"9 物联卡主机"
;
case
HMT_GPRS_PHONE
:
return
"10 GPRS主机能打电话"
;
case
HMT_NB
:
return
"11 NB报警接收主机"
;
case
HMT_WIFI2
:
return
"12 WiFi主机新版"
;
default
:
return
"未知主机"
;
}
}
...
...
hb_com.h
View file @
3a71cf08
...
...
@@ -60,6 +60,8 @@ typedef enum HbMachineType {
HMT_GPRS_PHONE
,
//! 11 NB报警接收主机
HMT_NB
,
//! 12 WiFi主机新版
HMT_WIFI2
,
HMT_COUNT
,
HMT_INVALID
=
-
1
,
...
...
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