diff --git a/source/app/task_appstatus.c b/source/app/task_appstatus.c index 0bd915a..768c4fb 100644 --- a/source/app/task_appstatus.c +++ b/source/app/task_appstatus.c @@ -41,7 +41,7 @@ void Enter_PowerDown(void) // MCU被唤醒后,绿灯亮起 // L2_GREEN_LED_ON(); // 状态切换,直接开机 - R.app_status = POW_ON_WAIT; + // R.app_status = POW_ON_WAIT; // if(L2_ReadKey3() == Key_Down) // { // Lc_delay_ms(1000); @@ -220,4 +220,8 @@ void INT0_Isr() interrupt 0 P3IE = 0xFF; P4IE = 0xFF; P5IE = 0xFF; + if (R.app_status == POW_OFF) + { + R.app_status = POW_ON_WAIT; + } } \ No newline at end of file diff --git a/source/app/task_keystatus.c b/source/app/task_keystatus.c index 898675c..5f9a0b3 100644 --- a/source/app/task_keystatus.c +++ b/source/app/task_keystatus.c @@ -57,7 +57,7 @@ void L3_task_keystatus_handler(S_TASK_KEYSTATUS *s) { if (R.app_status == POW_OFF) { - R.app_status = POW_ON_WAIT; + // R.app_status = POW_ON_WAIT; //不使用长按开机,在中断中处理 s->Key3_Down_Begin_Time = 0; s->Key3_handled = 1; } @@ -66,7 +66,7 @@ void L3_task_keystatus_handler(S_TASK_KEYSTATUS *s) R.app_status = POW_OFF; s->Key3_Down_Begin_Time = 0; s->Key3_handled = 1; - } + } } else if (diff >= LongKey_WIFICONF_MSeconds/JIFFIES && s->Key3_handled == 0) {