1.格式化led显示;2.注网led调整

This commit is contained in:
payton 2023-08-09 11:51:55 +08:00
parent 8f26bdcb0b
commit 89c032a209
2 changed files with 24 additions and 11 deletions

View File

@ -883,20 +883,26 @@ UINT32 BackgroundFormatCard(void)
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
//vos_util_delay_ms(1000); //vos_util_delay_ms(1000);
sf_sys_status_led_set(SF_LED_SYS_STATE_SD_FORMAT_SUCCESS); 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 #endif
} }
else else
{ {
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
sf_sys_status_led_set(SF_LED_SYS_STATE_SD_FORMAT_FAIL); 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 #endif
} }
MovieExe_ResetFileSN(); MovieExe_ResetFileSN();
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
sf_sys_status_led_set(SF_LED_SYS_STATE_SD_FORMAT_EXIT); 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); sf_set_card_statu(ret);
#endif #endif
DBG_FUNC_END("\r\n"); DBG_FUNC_END("\r\n");

View File

@ -684,10 +684,13 @@ void sf_sys_status_led_set(LedSysState_t ledSysStateId)
break; break;
case SF_LED_SYS_STATE_SD_FORMAT_START: case SF_LED_SYS_STATE_SD_FORMAT_START:
FormatSdFlag = 1; if(sf_get_pir_statu_flag()){
sf_led_set(SF_LED_BUSY, SF_LED_STATE_OFF); FormatSdFlag = 1;
sf_set_runningLed(0); sf_led_set(SF_LED_BUSY, SF_LED_STATE_OFF);
isGoToPir = FALSE; sf_set_runningLed(0);
isGoToPir = FALSE;
}
//sf_led_set(SF_LED_BUSY, SF_LED_STATE_ON); //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_ALL, SF_LED_STATE_OFF);
sf_led_set(SF_LED_SD_G, SF_LED_STATE_FLASHING); 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; break;
case SF_LED_SYS_STATE_SD_FORMAT_SUCCESS: 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_G, SF_LED_STATE_ON);
sf_led_set(SF_LED_SD_R, SF_LED_STATE_OFF); sf_led_set(SF_LED_SD_R, SF_LED_STATE_OFF);
break; break;
case SF_LED_SYS_STATE_SD_FORMAT_FAIL: 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_G, SF_LED_STATE_OFF);
sf_led_set(SF_LED_SD_R, SF_LED_STATE_ON); sf_led_set(SF_LED_SD_R, SF_LED_STATE_ON);
break; break;
@ -815,7 +822,7 @@ void sf_sys_status_led_set(LedSysState_t ledSysStateId)
case SF_LED_SYS_STATE_SIM_ERROR: case SF_LED_SYS_STATE_SIM_ERROR:
sf_set_runningLed(0); 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_SIG1_G, SF_LED_STATE_OFF);
sf_led_set(SF_LED_SIG2, SF_LED_STATE_OFF); sf_led_set(SF_LED_SIG2, SF_LED_STATE_OFF);
sf_led_set(SF_LED_SIG3, 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: case SF_LED_SYS_STATE_SERVER_FAIL:
sf_set_runningLed(0); 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_SIG1_G, SF_LED_STATE_OFF);
sf_led_set(SF_LED_SIG2, SF_LED_STATE_OFF); sf_led_set(SF_LED_SIG2, SF_LED_STATE_OFF);
sf_led_set(SF_LED_SIG3, SF_LED_STATE_OFF); sf_led_set(SF_LED_SIG3, SF_LED_STATE_OFF);