From 89c032a209716f06e67fd089b23dd65920b1b6b6 Mon Sep 17 00:00:00 2001 From: payton Date: Wed, 9 Aug 2023 11:51:55 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=A0=BC=E5=BC=8F=E5=8C=96led=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=EF=BC=9B2.=E6=B3=A8=E7=BD=91led=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UIApp/Background/UIBackgroundObj.c | 12 +++++++--- .../sf_app/code/source/devMng/sf_ledmng.c | 23 ++++++++++++------- 2 files changed, 24 insertions(+), 11 deletions(-) mode change 100644 => 100755 code/application/source/sf_app/code/source/devMng/sf_ledmng.c diff --git a/code/application/source/cardv/SrcCode/UIApp/Background/UIBackgroundObj.c b/code/application/source/cardv/SrcCode/UIApp/Background/UIBackgroundObj.c index 43229cefa..6742b6a50 100755 --- a/code/application/source/cardv/SrcCode/UIApp/Background/UIBackgroundObj.c +++ b/code/application/source/cardv/SrcCode/UIApp/Background/UIBackgroundObj.c @@ -883,20 +883,26 @@ UINT32 BackgroundFormatCard(void) #if HUNTING_CAMERA_MCU == ENABLE //vos_util_delay_ms(1000); sf_sys_status_led_set(SF_LED_SYS_STATE_SD_FORMAT_SUCCESS); - vos_util_delay_ms(3000); + if(sf_get_pir_statu_flag()){ + vos_util_delay_ms(3000); + } #endif } else { #if HUNTING_CAMERA_MCU == ENABLE sf_sys_status_led_set(SF_LED_SYS_STATE_SD_FORMAT_FAIL); - vos_util_delay_ms(3000); + if(sf_get_pir_statu_flag()){ + vos_util_delay_ms(3000); + } #endif } MovieExe_ResetFileSN(); #if HUNTING_CAMERA_MCU == ENABLE sf_sys_status_led_set(SF_LED_SYS_STATE_SD_FORMAT_EXIT); - vos_util_delay_ms(1000); + if(sf_get_pir_statu_flag()){ + vos_util_delay_ms(1000); + } sf_set_card_statu(ret); #endif DBG_FUNC_END("\r\n"); 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 old mode 100644 new mode 100755 index 71039c1ef..1240279ba --- a/code/application/source/sf_app/code/source/devMng/sf_ledmng.c +++ b/code/application/source/sf_app/code/source/devMng/sf_ledmng.c @@ -684,10 +684,13 @@ void sf_sys_status_led_set(LedSysState_t ledSysStateId) break; case SF_LED_SYS_STATE_SD_FORMAT_START: - FormatSdFlag = 1; - sf_led_set(SF_LED_BUSY, SF_LED_STATE_OFF); - sf_set_runningLed(0); - isGoToPir = FALSE; + if(sf_get_pir_statu_flag()){ + FormatSdFlag = 1; + sf_led_set(SF_LED_BUSY, SF_LED_STATE_OFF); + sf_set_runningLed(0); + isGoToPir = FALSE; + } + //sf_led_set(SF_LED_BUSY, SF_LED_STATE_ON); //sf_led_set(SF_LED_ALL, SF_LED_STATE_OFF); sf_led_set(SF_LED_SD_G, SF_LED_STATE_FLASHING); @@ -695,13 +698,17 @@ void sf_sys_status_led_set(LedSysState_t ledSysStateId) break; case SF_LED_SYS_STATE_SD_FORMAT_SUCCESS: - FormatSdFlag = 2; + if(sf_get_pir_statu_flag()){ + FormatSdFlag = 2; + } sf_led_set(SF_LED_SD_G, SF_LED_STATE_ON); sf_led_set(SF_LED_SD_R, SF_LED_STATE_OFF); break; case SF_LED_SYS_STATE_SD_FORMAT_FAIL: - FormatSdFlag = 3; + if(sf_get_pir_statu_flag()){ + FormatSdFlag = 3; + } sf_led_set(SF_LED_SD_G, SF_LED_STATE_OFF); sf_led_set(SF_LED_SD_R, SF_LED_STATE_ON); break; @@ -815,7 +822,7 @@ void sf_sys_status_led_set(LedSysState_t ledSysStateId) case SF_LED_SYS_STATE_SIM_ERROR: sf_set_runningLed(0); - sf_led_set(SF_LED_SIG1_R, SF_LED_STATE_FLASHING); + sf_led_set(SF_LED_SIG1_R, SF_LED_STATE_SLOW_FLASHING); sf_led_set(SF_LED_SIG1_G, SF_LED_STATE_OFF); sf_led_set(SF_LED_SIG2, SF_LED_STATE_OFF); sf_led_set(SF_LED_SIG3, SF_LED_STATE_OFF); @@ -824,7 +831,7 @@ void sf_sys_status_led_set(LedSysState_t ledSysStateId) case SF_LED_SYS_STATE_SERVER_FAIL: sf_set_runningLed(0); - sf_led_set(SF_LED_SIG1_R, SF_LED_STATE_SLOW_FLASHING); + sf_led_set(SF_LED_SIG1_R, SF_LED_STATE_FLASHING); sf_led_set(SF_LED_SIG1_G, SF_LED_STATE_OFF); sf_led_set(SF_LED_SIG2, SF_LED_STATE_OFF); sf_led_set(SF_LED_SIG3, SF_LED_STATE_OFF);