From 69262c1a48014fbd2d974fc556ee9d20df513dc4 Mon Sep 17 00:00:00 2001 From: payton Date: Fri, 28 Jul 2023 17:51:06 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=8C=87=E7=A4=BA=E7=81=AF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../source/sf_app/code/source/devMng/sf_ledmng.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/code/application/source/sf_app/code/source/devMng/sf_ledmng.c b/code/application/source/sf_app/code/source/devMng/sf_ledmng.c index 8251aa06d..71039c1ef 100644 --- a/code/application/source/sf_app/code/source/devMng/sf_ledmng.c +++ b/code/application/source/sf_app/code/source/devMng/sf_ledmng.c @@ -21,7 +21,7 @@ #include "sf_message_queue.h" #include "sf_hal_ttyusb.h" #include "sf_common.h" - +#include "sf_device.h" #ifdef __cplusplus #if __cplusplus extern "C" { @@ -400,7 +400,7 @@ void* sf_led_thread(void *arg) { if(isUsbIn) { - if((SF_LED_BUSY == i)/* || (i == SF_LED_STATUS_G)*/) + if((SF_LED_BUSY == i) || (SF_LED_STATUS_G == i)) { sf_led_on(LedInfo[i].ledId); } @@ -569,8 +569,9 @@ void sf_led_init(void) { static UINT8 dofirst = 1; UINT8 startup = sf_poweron_type_get(); + SINT32 isUpdate = sf_in_update(); //printf("[%s:%d] s\n", __FUNCTION__, __LINE__); - if((!dofirst) || ((SF_MCU_STARTUP_ONKEY != startup) && (SF_MCU_STARTUP_NORMAL != startup) && (SF_MCU_STARTUP_USB != startup))) + if((!dofirst) || ((!isUpdate) && (SF_MCU_STARTUP_OFF != startup) &&(SF_MCU_STARTUP_ONKEY != startup) && (SF_MCU_STARTUP_NORMAL != startup) && (SF_MCU_STARTUP_USB != startup))) return; dofirst = 0; @@ -851,6 +852,7 @@ void sf_sys_status_led_set(LedSysState_t ledSysStateId) sf_led_set(SF_LED_BUSY, SF_LED_STATE_ON); sf_led_set(SF_LED_STATUS_G, SF_LED_STATE_ON); isUsbIn = TRUE; + printf("[%s:%d] isUsbIn:%d\n", __FUNCTION__, __LINE__,isUsbIn); break; #endif //#if HW_S510