Commit 85f9f57a authored by captainwong's avatar captainwong

fix typo

parent c8c70103
......@@ -83,8 +83,8 @@
|1121|胁迫|DURESS|
|1151|煤气|GAS|
|1113|水警|WATER|
|1137|防拆|TEMPER|
|1383|防区防拆|ZONE_TEMPER|
|1137|防拆|TAMPER|
|1383|防区防拆|ZONE_TAMPER|
|1570|旁路|EVENT_BY_PASS|
|3570|解除旁路|EVENT_BY_PASS_RESUME|
......@@ -123,7 +123,7 @@
|3703|分防区电源恢复|SUB_POWER_RESUME|
|1704|串口透传|COM_PASSTHROUGH|
|2704|进入设置状态|ENTER_SET_MODE|
|3704|拒绝/停止索要|STOP RETRIEVE|
|3704|拒绝/停止设置|EXIT_SET_MODE|
|1705|查询|QUERY|
|1706|写入主机信息|WRITE_TO_MACHINE|
|1707|我是网络模块|I_AM_NET_MODULE|
......
......@@ -32,5 +32,5 @@
|EB BA 3F *PN* *P0* **AD** *P1 DATA P2* SUM|变长|索要防区探头遗失/失联回应|回应所有失联开的防区。<br/> *PN*:本条数据包含多少字节;*P0*:语音;<br/> *P1*:F0指示DATA以1个字节表示防区号,F1表示DATA以2个字节表示防区号;<br/> *DATA*:所有失联开的防区;<br/> *P2*:FF表示传输结束,其他表示还有更多数据|
|EB BA 3F 08 *P0* **AF** *P1 P2* SUM|9|三区段主机布撤防回应|*P0*:语音;*P1*:0主机,1区段1,2区段2,3区段3;*P2*:0布防成功,1撤防成功|
|EB BA 3F 08 *P0* **B1** *P1* SUM|8|三区段主机索要状态回应|*P0*:语音;<br/> *P1*:8位,7/6位主机状态,5/4位区段1状态,3/2位区段2状态,1/0位区段3状态<br/> 值为0布防,1撤防|
|EB BA 3F 07 P0 A8 SUM|7|拒绝设置|主机如果认为对方的命令非法,都可以回复此条命令|
|EB BA 3F 07 *P0* **A8** SUM|7|拒绝设置|主机如果认为对方的命令非法,都可以回复此条命令|
......@@ -24,8 +24,8 @@ ADEMCO_EVENT alarmEvents[] = {
EVENT_DURESS,
EVENT_GAS,
EVENT_WATER,
EVENT_TEMPER,
EVENT_ZONE_TEMPER,
EVENT_TAMPER,
EVENT_ZONE_TAMPER,
EVENT_BY_PASS,
EVENT_BY_PASS_RESUME,
......@@ -72,7 +72,7 @@ ADEMCO_EVENT privateEvents[] = {
EVENT_COM_PASSTHROUGH,
EVENT_ENTER_SET_MODE,
EVENT_STOP_RETRIEVE,
EVENT_EXIT_SET_MODE,
EVENT_QUERY_SUB_MACHINE,
EVENT_WRITE_TO_MACHINE,
......
......@@ -34,8 +34,8 @@ enum ADEMCO_EVENT : uint32_t {
EVENT_DURESS = 1121, // 胁迫
EVENT_GAS = 1151, // 煤气
EVENT_WATER = 1113, // 水警
EVENT_TEMPER = 1137, // 主机防拆
EVENT_ZONE_TEMPER = 1383, // 防区防拆
EVENT_TAMPER = 1137, // 主机防拆
EVENT_ZONE_TAMPER = 1383, // 防区防拆
EVENT_BY_PASS = 1570, // 旁路
EVENT_BY_PASS_RESUME = 3570, // 解除旁路
......@@ -132,8 +132,8 @@ static constexpr ADEMCO_EVENT AdemcoEvents[] = {
EVENT_DURESS,
EVENT_GAS,
EVENT_WATER,
EVENT_TEMPER,
EVENT_ZONE_TEMPER,
EVENT_TAMPER,
EVENT_ZONE_TAMPER,
EVENT_BY_PASS,
EVENT_BY_PASS_RESUME,
......@@ -206,8 +206,8 @@ inline std::string ademcoEventToStringEnglish(ADEMCO_EVENT ademco_event, bool wi
case EVENT_FIRE: return n_to_s(ademco_event) + "FIRE";
case EVENT_GAS: return n_to_s(ademco_event) + "GAS";
case EVENT_HALFARM: case EVENT_HALFARM_1456: return n_to_s(ademco_event) + "HALFARM";
case EVENT_TEMPER: return n_to_s(ademco_event) + "TEMPER";
case EVENT_ZONE_TEMPER: return n_to_s(ademco_event) + "ZONE_TEMPER";
case EVENT_TAMPER: return n_to_s(ademco_event) + "TAMPER";
case EVENT_ZONE_TAMPER: return n_to_s(ademco_event) + "ZONE_TAMPER";
case EVENT_BY_PASS: return n_to_s(ademco_event) + "EVENT_BY_PASS";
case EVENT_BY_PASS_RESUME: return n_to_s(ademco_event) + "EVENT_BY_PASS_RESUME";
......@@ -283,8 +283,8 @@ inline const std::wstring ademcoEventToStringChinese(ADEMCO_EVENT ademco_event,
case EVENT_FIRE: return n_to_s(ademco_event) + L"火警";
case EVENT_GAS: return n_to_s(ademco_event) + L"煤气";
case EVENT_HALFARM: case EVENT_HALFARM_1456: return n_to_s(ademco_event) + L"半布防";
case EVENT_TEMPER: return n_to_s(ademco_event) + L"防拆";
case EVENT_ZONE_TEMPER: return n_to_s(ademco_event) + L"防区防拆";
case EVENT_TAMPER: return n_to_s(ademco_event) + L"防拆";
case EVENT_ZONE_TAMPER: return n_to_s(ademco_event) + L"防区防拆";
case EVENT_WATER: return n_to_s(ademco_event) + L"水警";
case EVENT_BY_PASS: return n_to_s(ademco_event) + L"旁路";
case EVENT_BY_PASS_RESUME: return n_to_s(ademco_event) + L"解除旁路";
......@@ -409,8 +409,8 @@ inline EventLevel GetEventLevel(ADEMCO_EVENT ademco_event)
case EVENT_EMERGENCY:
case EVENT_FIRE:
case EVENT_GAS:
case EVENT_TEMPER:
case EVENT_ZONE_TEMPER:
case EVENT_TAMPER:
case EVENT_ZONE_TAMPER:
case EVENT_WATER:
return EVENT_LEVEL_ALARM;
default:
......
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