From 16cba22cd158d3639ef9abc77401f3e13f9b7285 Mon Sep 17 00:00:00 2001 From: zhaohe <1013909206@qq.com> Date: Fri, 12 Aug 2022 20:34:15 +0800 Subject: [PATCH] update --- APP/board.h | 3 --- APP/service/light_control_service.c | 2 +- APP/service/thisdevice.h | 10 ++++++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/APP/board.h b/APP/board.h index f812ed8..e1f2855 100644 --- a/APP/board.h +++ b/APP/board.h @@ -3,6 +3,3 @@ #define KEY_PERIOD 20 #define EXCEPTION_CHECK_PERIOD 50 - -#define AUTO_SHUTDOWN_ONE_LIGHT_EQ_TIME_S 20 //自动关机时,一个灯等效的时间 -#define INTERMITTENTMODE_PERIOD_S 100 //间歇工作模式的时间间隔 \ No newline at end of file diff --git a/APP/service/light_control_service.c b/APP/service/light_control_service.c index 0553a47..891d7ad 100644 --- a/APP/service/light_control_service.c +++ b/APP/service/light_control_service.c @@ -104,7 +104,7 @@ void lcs_schedule_process() { return; } //自动失能active_input - if (thisDevice.active_input != knone_active && systicket_haspassedms(thisDevice.active_start_ticket) >= 1500) { + if (thisDevice.active_input != knone_active && systicket_haspassedms(thisDevice.active_start_ticket) >= kconst_flash_auto_close_time) { thisDevice.active_input = knone_active; } //控制定时指示灯 diff --git a/APP/service/thisdevice.h b/APP/service/thisdevice.h index 42dc7df..b336546 100644 --- a/APP/service/thisdevice.h +++ b/APP/service/thisdevice.h @@ -37,10 +37,12 @@ typedef struct { } ThisDevice_t; -#define kconst_flash_auto_close_time (3000) -// #define kconst_countdown_step_s (15 * 60) -#define kconst_countdown_step_s (10) +#define kconst_flash_auto_close_time (1500) //按键输入状态有效时间 +#define kconst_countdown_step_s (10) //倒计时每按一次按键,倒计时增加时间 +#define kconst_active_input_light_flick_interval_ms (150) //按键输入状态闪烁间隔时间 +#define INTERMITTENTMODE_PERIOD_S 15 //间歇工作模式的时间间隔 +#define KEY_PERIOD 20 +#define EXCEPTION_CHECK_PERIOD 50 -#define kconst_active_input_light_flick_interval_ms (150) extern ThisDevice_t thisDevice; \ No newline at end of file