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
6a9f4960
Commit
6a9f4960
authored
Sep 08, 2020
by
captainwong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add event 2756
parent
ced93524
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
4 deletions
+11
-4
README.md
docs/README.md
+1
-0
gen_event_md.cpp
examples/gen_event_md/gen_event_md.cpp
+1
-0
ademco_event.h
include/ademco_event.h
+9
-4
No files found.
docs/README.md
View file @
6a9f4960
...
...
@@ -140,6 +140,7 @@
|1710|主机恢复出厂设置|RESTORE_FACTORY_SETTINGS|
|1713|主机恢复出厂设置|RESTORE_FACTORY_SETTINGS|
|1756|SIM卡为物联卡|SIM card is IOT|
|2756|SIM卡为平台物联卡|SIM card is Platform IOT|
|3756|SIM卡为非物联卡|SIM card is not IOT|
|1798|索要主机类型|EVENT_WHAT_IS_YOUR_TYPE|
|1799|信号强度变化|SIGNAL_STRENGTH_CHANGED|
...
...
examples/gen_event_md/gen_event_md.cpp
View file @
6a9f4960
...
...
@@ -94,6 +94,7 @@ ADEMCO_EVENT privateEvents[] = {
EVENT_RESTORE_FACTORY_SETTINGS
,
EVENT_SIM_IS_IOT_CARD
,
EVENT_SIM_IS_IOT_PLATFORM_CARD
,
EVENT_SIM_IS_NOT_IOT_CARD
,
EVENT_WHAT_IS_YOUR_TYPE
,
...
...
include/ademco_event.h
View file @
6a9f4960
...
...
@@ -102,8 +102,10 @@ enum ADEMCO_EVENT : uint32_t {
EVENT_RESTORE_FACTORY_SETTINGS_710
=
1710
,
// 主机恢复出厂设置
EVENT_RESTORE_FACTORY_SETTINGS
=
1713
,
// 主机恢复出厂设置
EVENT_SIM_IS_IOT_CARD
=
1756
,
// 主机SIM卡为物联卡
EVENT_SIM_IS_NOT_IOT_CARD
=
3756
,
// 主机SIM卡为非物联卡
// 此处电话设置仅为主机自身支持的电话设置,与阿里语音无关
EVENT_SIM_IS_IOT_CARD
=
1756
,
// 主机SIM卡为物联卡,禁用主机侧电话设置
EVENT_SIM_IS_IOT_PLATFORM_CARD
=
2756
,
// 主机SIM卡为平台物联卡,禁用主机侧电话设置
EVENT_SIM_IS_NOT_IOT_CARD
=
3756
,
// 主机SIM卡为非物联卡,启用主机侧电话设置
EVENT_WHAT_IS_YOUR_TYPE
=
1798
,
// 索要主机类型
EVENT_SIGNAL_STRENGTH_CHANGED
=
1799
,
// 主机信号强度变化
...
...
@@ -184,6 +186,7 @@ static constexpr ADEMCO_EVENT AdemcoEvents[] = {
EVENT_I_AM_3_SECTION_MACHINE
,
EVENT_I_AM_IOT_MACHINE
,
EVENT_SIM_IS_IOT_CARD
,
EVENT_SIM_IS_IOT_PLATFORM_CARD
,
EVENT_SIM_IS_NOT_IOT_CARD
,
EVENT_PHONE_USER_SOS
,
...
...
@@ -258,7 +261,8 @@ inline std::string ademcoEventToStringEnglish(ADEMCO_EVENT ademco_event, bool wi
case
EVENT_I_AM_WIFI_MACHINE
:
return
n_to_s
(
ademco_event
)
+
"I_AM_WIFI_MACHINE"
;
case
EVENT_I_AM_3_SECTION_MACHINE
:
return
n_to_s
(
ademco_event
)
+
"I_AM_3_SECTION_MACHINE"
;
case
EVENT_I_AM_IOT_MACHINE
:
return
n_to_s
(
ademco_event
)
+
"I_AM_IOT_MACHINE"
;
case
EVENT_SIM_IS_IOT_CARD
:
return
n_to_s
(
ademco_event
)
+
"SIM card is IOT"
;
case
EVENT_SIM_IS_IOT_CARD
:
return
n_to_s
(
ademco_event
)
+
"SIM card is IOT"
;
case
EVENT_SIM_IS_IOT_PLATFORM_CARD
:
return
n_to_s
(
ademco_event
)
+
"SIM card is Platform IOT"
;
case
EVENT_SIM_IS_NOT_IOT_CARD
:
return
n_to_s
(
ademco_event
)
+
"SIM card is not IOT"
;
case
EVENT_ENTER_SETTING_MODE
:
return
n_to_s
(
ademco_event
)
+
"ENTER_SETTING_MODE"
;
case
EVENT_EXIT_SETTING_MODE
:
return
n_to_s
(
ademco_event
)
+
"EXIT_SETTING_MODE"
;
...
...
@@ -336,7 +340,8 @@ inline const std::wstring ademcoEventToStringChinese(ADEMCO_EVENT ademco_event,
case
EVENT_I_AM_WIFI_MACHINE
:
return
n_to_s
(
ademco_event
)
+
L"我是WiFi主机"
;
case
EVENT_I_AM_3_SECTION_MACHINE
:
return
n_to_s
(
ademco_event
)
+
L"我是三区段主机"
;
case
EVENT_I_AM_IOT_MACHINE
:
return
n_to_s
(
ademco_event
)
+
L"我是物联卡主机"
;
case
EVENT_SIM_IS_IOT_CARD
:
return
n_to_s
(
ademco_event
)
+
L"SIM卡为物联卡"
;
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卡为非物联卡"
;
case
EVENT_ENTER_SETTING_MODE
:
return
n_to_s
(
ademco_event
)
+
L"主机进入设置状态"
;
case
EVENT_EXIT_SETTING_MODE
:
return
n_to_s
(
ademco_event
)
+
L"主机退出设置状态"
;
...
...
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