From 4aee72b6d3f4d133cfe613c42ca26d6d98301e51 Mon Sep 17 00:00:00 2001 From: Zhangwen <13970730+mkc46119@user.noreply.gitee.com> Date: Mon, 4 Aug 2025 16:15:29 +0800 Subject: [PATCH] =?UTF-8?q?feature:=201.=E6=94=B9=E5=8F=98=E5=BC=80?= =?UTF-8?q?=E6=9C=BA=E6=96=B9=E5=BC=8F=EF=BC=9A=E7=94=B1=E9=95=BF=E6=8C=89?= =?UTF-8?q?=E5=BC=80=E6=9C=BA=E5=8F=98=E4=B8=BA=E7=9F=AD=E6=8C=89=E5=BC=80?= =?UTF-8?q?=E6=9C=BA=EF=BC=8C=E7=8A=B6=E6=80=81=E5=88=87=E6=8D=A2=E6=94=BE?= =?UTF-8?q?=E5=9C=A8INT0=E5=A4=96=E9=83=A8=E4=B8=AD=E6=96=AD=E9=87=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/app/task_appstatus.c | 6 +++++- source/app/task_keystatus.c | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) 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) {