diff --git a/BLE/DLD154Pro_Peripheral_28K/APP/dbn_ble_srv.c b/BLE/DLD154Pro_Peripheral_28K/APP/dbn_ble_srv.c index 0ba2b37..473c0c8 100644 --- a/BLE/DLD154Pro_Peripheral_28K/APP/dbn_ble_srv.c +++ b/BLE/DLD154Pro_Peripheral_28K/APP/dbn_ble_srv.c @@ -430,7 +430,8 @@ static void unpack_pkg_set_cjq_param(uint8_t *pkg, uint8_t len) g_function_mode = (g_loop_cng_unit.direction_mode >> 4) & 0x0F; - g_hold_time = g_loop_cng_unit.exist_mode * 30 * 20; + g_hold_time = g_loop_cng_unit.exist_mode * 20 * 5; + g_freq_sens = (g_loop_cng_unit.sensitvity > 0) ? (g_loop_cng_unit.sensitvity - 1) : 0; i = 0; tmp[i++] = g_loop_cng_unit.sensitvity; diff --git a/BLE/DLD154Pro_Peripheral_28K/APP/include/cmcng.h b/BLE/DLD154Pro_Peripheral_28K/APP/include/cmcng.h index c8018f1..43424f3 100644 --- a/BLE/DLD154Pro_Peripheral_28K/APP/include/cmcng.h +++ b/BLE/DLD154Pro_Peripheral_28K/APP/include/cmcng.h @@ -17,12 +17,12 @@ */ #define PRODUCT_MODEL "DLD154Pro" -#define FIRMWARE_VER "4.01" -#define HARDWARE_VER "1.00" -#define FIRMWARE_VER_MAIN 4 -#define FIRMWARE_VER_SUB 1 -#define HARDWARE_VER_MAIN 1 -#define HARDWARE_VER_SUB 0 +#define FIRMWARE_VER "3.00" +#define HARDWARE_VER "3.01" +#define FIRMWARE_VER_MAIN 3 +#define FIRMWARE_VER_SUB 0 +#define HARDWARE_VER_MAIN 3 +#define HARDWARE_VER_SUB 1 /* 功能模式�? (direction_mode �?4�?, 协议保留; 新算法不再消�?) */ #define FUNCTION_A 0x01 // 二次判断 (已废�?) diff --git a/BLE/DLD154Pro_Peripheral_28K/APP/peripheral_main.c b/BLE/DLD154Pro_Peripheral_28K/APP/peripheral_main.c index d1bf174..6be52c4 100644 --- a/BLE/DLD154Pro_Peripheral_28K/APP/peripheral_main.c +++ b/BLE/DLD154Pro_Peripheral_28K/APP/peripheral_main.c @@ -298,6 +298,7 @@ void para_store_init(void) g_safe_max_cnt = g_loop_cng_unit.loopSafe_Timeout * 10 * (1000 / 50); g_freq_level = g_loop_cng_unit.loopFreq_Level - 1; g_function_mode = g_loop_cng_unit.direction_mode >> 4; + g_freq_sens = (g_loop_cng_unit.sensitvity > 0) ? (g_loop_cng_unit.sensitvity - 1) : 0; #ifdef DEBUG g_freq_level = 0; @@ -439,8 +440,6 @@ void INIT_VD(void) loop1_SensLevel = 2; Flt_Reg = ALFA_CAP1; //79 - g_freq_sens = 2; // DLD154Pro: 灵敏度默认最高, 小程序可调 - loop1_ORG_CNT = 0; loop1_ORG_SUM = 0;