Commit d4106329 authored by captainwong's avatar captainwong

update

parent d761bbb7
......@@ -136,6 +136,7 @@
|1777|我是真彩主机|I_AM_TRUE_COLOR|
|1787|我是简化版物联卡主机|I_AM_GPRS_IOT|
|1797|我是GPRS主机能打电话|I_AM_GPRS_PHONE|
|1807|我是NB报警接收主机|I_AM_NB_MACHINE|
|1709|手机用户SOS|SOS|
|1711|手机用户消警|PHONE_USER_CANCLE_ALARM|
|1712|主机进入设置状态|ENTER_SETTING_MODE|
......@@ -164,7 +165,7 @@
|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| | ||qfm|<ul></ul>|
|1807 我是NB报警接收主机|11 NB报警接收主机| | | | |√|1~999| | |||<ul></ul>|
### *恒博主机型号示例图片*
......
......@@ -100,6 +100,7 @@ ADEMCO_EVENT privateEvents[] = {
EVENT_I_AM_TRUE_COLOR,
EVENT_I_AM_GPRS_IOT,
EVENT_I_AM_GPRS_PHONE,
EVENT_I_AM_NB_MACHINE,
EVENT_PHONE_USER_SOS,
EVENT_PHONE_USER_CANCLE_ALARM,
......@@ -169,7 +170,7 @@ const char* get_net_author(MachineType t)
case hb::common::ThreeSection:
case hb::common::IoT:
case hb::common::Gprs_Phone:
case hb::common::Nb:
//case hb::common::Nb:
return "qfm";
}
......
......@@ -314,7 +314,7 @@ inline std::string ademcoEventToStringEnglish(ADEMCO_EVENT ademco_event, bool wi
case EVENT_I_AM_TRUE_COLOR: return n_to_s(ademco_event) + "I_AM_TRUE_COLOR";
case EVENT_I_AM_GPRS_IOT: return n_to_s(ademco_event) + "I_AM_GPRS_IOT";
case EVENT_I_AM_GPRS_PHONE: return n_to_s(ademco_event) + "I_AM_GPRS_PHONE";
case EVENT_I_AM_NB_MACHINE: return n_to_s(ademco_event) + "EVENT_I_AM_NB_MACHINE";
case EVENT_I_AM_NB_MACHINE: return n_to_s(ademco_event) + "I_AM_NB_MACHINE";
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";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment