Commit 65bd44e9 authored by captainwong's avatar captainwong

2.5.1

parent 220fc9b6
# Ademco Change Log
## 2.5.1 2024-4-19 23:39:51
- `ARM_STAY` related functions
## 2.5.0 2024-4-19 18:07:08
- `ARM` to `ARM_AWAY`
......
......@@ -8,7 +8,7 @@
#define ADEMCO_VERSION_MAJOR 2
#define ADEMCO_VERSION_MINOR 5
#define ADEMCO_VERSION_PATCH 0
#define ADEMCO_VERSION_PATCH 1
#define ADEMCO_VERSION_IS_RELEASE 1
#define ADEMCO_VERSION_SUFFIX ""
......
......@@ -294,7 +294,7 @@
|事件码| 含义|
|-----|--------|
|400| 布撤防|
|456| 布防|
|456| 留守布防|
|120| 紧急报警|
|121| 胁迫|
|711| 手机用户消警|
......
......@@ -172,7 +172,7 @@ void print_machineTypes()
printf("*SMS指主机自身是否可以拨打电话、发送短信,不是指通过阿里语音打电话*\n");
printf("|事件码|主机类型|布防|撤防|半布防|设置|信号强度|防区|有线防区|SMS|内核|网络|型号|\n"
printf("|事件码|主机类型|离家布防|撤防|留守布防|设置|信号强度|防区|有线防区|SMS|内核|网络|型号|\n"
"|------|-------|----|----|-----|----|-------|----|-------|---|----|---|----|\n");
for (auto e : allEvents) {
......@@ -182,9 +182,9 @@ void print_machineTypes()
printf("|%04d %s", (int)e, ademco_event_to_string_chinese(e));
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_arm_away(t)));
printf("|%s", print_bool(hb_machine_can_disarm(t)));
printf("|%s", print_bool(hb_machine_can_half_arm(t)));
printf("|%s", print_bool(hb_machine_can_arm_stay(t)));
printf("|%s", print_bool(hb_machine_can_config(t)));
printf("|%s", print_bool(hb_machine_can_report_signal_strength(t)));
printf("|1~%d", hb_get_max_zone_by_type(t));
......
......@@ -175,7 +175,7 @@ int hb_is_machine_on_sale(hb_machine_type_t type) {
type == HMT_WIFI2;
}
int hb_machine_can_arm(hb_machine_type_t type) {
int hb_machine_can_arm_away(hb_machine_type_t type) {
return hb_is_machine_on_sale(type) && (type != HMT_NB);
}
......@@ -187,7 +187,7 @@ int hb_machine_can_config(hb_machine_type_t type) {
return hb_is_machine_on_sale(type);
}
int hb_machine_can_half_arm(hb_machine_type_t type) {
int hb_machine_can_arm_stay(hb_machine_type_t type) {
return type == HMT_NETMOD || type == HMT_LCD;
}
......
......@@ -167,9 +167,9 @@ int hb_is_valid_zone_by_type_strict(hb_machine_type_t type, ademco_zone_t zone);
ADEMCO_EXPORT_SYMBOL
int hb_is_machine_on_sale(hb_machine_type_t type);
// 主机是否具有布防功能
// 主机是否具有离家布防功能
ADEMCO_EXPORT_SYMBOL
int hb_machine_can_arm(hb_machine_type_t type);
int hb_machine_can_arm_away(hb_machine_type_t type);
// 主机是否具有撤防功能
ADEMCO_EXPORT_SYMBOL
......@@ -179,9 +179,9 @@ int hb_machine_can_disarm(hb_machine_type_t type);
ADEMCO_EXPORT_SYMBOL
int hb_machine_can_config(hb_machine_type_t type);
// 主机是否具有布防功能
// 主机是否具有留守布防功能
ADEMCO_EXPORT_SYMBOL
int hb_machine_can_half_arm(hb_machine_type_t type);
int hb_machine_can_arm_stay(hb_machine_type_t type);
// 主机是否可以报告信号强度
ADEMCO_EXPORT_SYMBOL
......
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