1.优化代码,及时关机;
2.更正卡满时led亮灯; 3.调用系统sync,以免丢失数据; 4.调整led时序
This commit is contained in:
parent
fcf604c606
commit
dc82bcc18e
|
@ -151,7 +151,7 @@ int main(int argc, char *argv[])
|
||||||
printf("[%s:%d] isUsb = %d isCard = %d isUpdate:%d CamMode:%d startup:%d %s\n", __FUNCTION__, __LINE__, isUsb,isCard,isUpdate,puiPara->CamMode, startup, sf_poweron_type_string(startup));
|
printf("[%s:%d] isUsb = %d isCard = %d isUpdate:%d CamMode:%d startup:%d %s\n", __FUNCTION__, __LINE__, isUsb,isCard,isUpdate,puiPara->CamMode, startup, sf_poweron_type_string(startup));
|
||||||
sf_led_init();
|
sf_led_init();
|
||||||
|
|
||||||
if((!isUsb) && (SF_MCU_STARTUP_NORMAL != startup) /*&& (0 == isUpdate)*/)
|
if((!isUsb) && (SF_MCU_STARTUP_NORMAL != startup) && (SF_MCU_STARTUP_OFF != startup)/*&& (0 == isUpdate)*/)
|
||||||
{
|
{
|
||||||
#if SF_IQ_TEST != ENABLE
|
#if SF_IQ_TEST != ENABLE
|
||||||
if((0 == isUpdate))
|
if((0 == isUpdate))
|
||||||
|
|
|
@ -580,11 +580,11 @@ static SINT32 sf_app_process_cmd_SD(SF_MESSAGE_BUF_S *pMessageBuf)
|
||||||
printf("SD free=%dM/%dM\n", storeattrs.SDFree, storeattrs.SDTotalSize);
|
printf("SD free=%dM/%dM\n", storeattrs.SDFree, storeattrs.SDTotalSize);
|
||||||
if (storeattrs.SDFree < 30) /* 30MB */
|
if (storeattrs.SDFree < 30) /* 30MB */
|
||||||
{
|
{
|
||||||
sf_sys_status_led_set(SF_LED_SYS_STATE_SD_NORMAL);
|
sf_sys_status_led_set(SF_LED_SYS_STATE_SD_FULL);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
sf_sys_status_led_set(SF_LED_SYS_STATE_SD_FULL);
|
sf_sys_status_led_set(SF_LED_SYS_STATE_SD_NORMAL);
|
||||||
}
|
}
|
||||||
sf_statistics_param_load(sf_statistics_param_get());
|
sf_statistics_param_load(sf_statistics_param_get());
|
||||||
MLOGI("card-%d mount OK\r\n", pMessageBuf->arg2 + 1);
|
MLOGI("card-%d mount OK\r\n", pMessageBuf->arg2 + 1);
|
||||||
|
|
|
@ -682,13 +682,13 @@ SINT32 app_system_poweroff(SF_POWEROFF_TYPE_E enType )
|
||||||
//if((puiPara->DebugMode) || (puiPara->QLogSwitch)){
|
//if((puiPara->DebugMode) || (puiPara->QLogSwitch)){
|
||||||
// sync();
|
// sync();
|
||||||
//}
|
//}
|
||||||
if(SF_MCU_STARTUP_ONKEY != sf_poweron_type_get())
|
//if(SF_MCU_STARTUP_ONKEY != sf_poweron_type_get())
|
||||||
sync();
|
system("sync");
|
||||||
//MLOGD("s\n");
|
//MLOGD("s\n");
|
||||||
|
|
||||||
sf_mcu_reg_set(SF_MCU_POWEROFF,sf_poweroff_type_get());
|
sf_mcu_reg_set(SF_MCU_POWEROFF,sf_poweroff_type_get());
|
||||||
if(SF_MCU_STARTUP_ONKEY != sf_poweron_type_get())
|
//if(SF_MCU_STARTUP_ONKEY != sf_poweron_type_get())
|
||||||
sync();
|
system("sync");
|
||||||
/*
|
/*
|
||||||
SF_STORE_ATTR_S storeattrs = {0};
|
SF_STORE_ATTR_S storeattrs = {0};
|
||||||
SF_STARTUP_TYPE_E startup = SF_MCU_STARTUP_ONKEY;
|
SF_STARTUP_TYPE_E startup = SF_MCU_STARTUP_ONKEY;
|
||||||
|
@ -738,7 +738,7 @@ SINT32 app_system_poweroff(SF_POWEROFF_TYPE_E enType )
|
||||||
|
|
||||||
sf_sys_poweroff(sf_poweroff_type_get());
|
sf_sys_poweroff(sf_poweroff_type_get());
|
||||||
*/
|
*/
|
||||||
return SF_SUCCESS;
|
return SF_SUCCESS;
|
||||||
}
|
}
|
||||||
SINT32 app_http_time_by_timezone_set(void)
|
SINT32 app_http_time_by_timezone_set(void)
|
||||||
{
|
{
|
||||||
|
|
|
@ -395,7 +395,6 @@ void* sf_led_thread(void *arg)
|
||||||
printf("[%s:%d] s\n", __FUNCTION__, __LINE__);
|
printf("[%s:%d] s\n", __FUNCTION__, __LINE__);
|
||||||
while(isLedExit)
|
while(isLedExit)
|
||||||
{
|
{
|
||||||
|
|
||||||
for(i = 0; i < SF_LED_ALL; i++)
|
for(i = 0; i < SF_LED_ALL; i++)
|
||||||
{
|
{
|
||||||
if(isUsbIn)
|
if(isUsbIn)
|
||||||
|
@ -423,11 +422,11 @@ void* sf_led_thread(void *arg)
|
||||||
{
|
{
|
||||||
sf_led_off(LedInfo[i].ledId);
|
sf_led_off(LedInfo[i].ledId);
|
||||||
}
|
}
|
||||||
else if(LedInfo[i].times == 50) //50*10ms
|
else if(LedInfo[i].times == 10) //10*50ms
|
||||||
{
|
{
|
||||||
sf_led_on(LedInfo[i].ledId);
|
sf_led_on(LedInfo[i].ledId);
|
||||||
}
|
}
|
||||||
else if(LedInfo[i].times == 100) //100*10ms
|
else if(LedInfo[i].times == 20) //20*50ms
|
||||||
{
|
{
|
||||||
sf_led_off(LedInfo[i].ledId);
|
sf_led_off(LedInfo[i].ledId);
|
||||||
LedInfo[i].times = 0;
|
LedInfo[i].times = 0;
|
||||||
|
@ -466,11 +465,11 @@ void* sf_led_thread(void *arg)
|
||||||
{
|
{
|
||||||
sf_led_off(LedInfo[i].ledId);
|
sf_led_off(LedInfo[i].ledId);
|
||||||
}
|
}
|
||||||
else if(LedInfo[i].times == 25) //50*10ms
|
else if(LedInfo[i].times == 10) //10*50ms
|
||||||
{
|
{
|
||||||
sf_led_on(LedInfo[i].ledId);
|
sf_led_on(LedInfo[i].ledId);
|
||||||
}
|
}
|
||||||
else if(LedInfo[i].times == 50) //100*10ms
|
else if(LedInfo[i].times == 20) //20*50ms
|
||||||
{
|
{
|
||||||
sf_led_off(LedInfo[i].ledId);
|
sf_led_off(LedInfo[i].ledId);
|
||||||
LedInfo[i].times = 0;
|
LedInfo[i].times = 0;
|
||||||
|
@ -493,11 +492,11 @@ void* sf_led_thread(void *arg)
|
||||||
{
|
{
|
||||||
sf_led_on(LedInfo[i].ledId);
|
sf_led_on(LedInfo[i].ledId);
|
||||||
}
|
}
|
||||||
else if(LedInfo[i].times == 50) //50*10ms
|
else if(LedInfo[i].times == 10) //10*50ms
|
||||||
{
|
{
|
||||||
sf_led_off(LedInfo[i].ledId);
|
sf_led_off(LedInfo[i].ledId);
|
||||||
}
|
}
|
||||||
else if(LedInfo[i].times == 100) //100*10ms
|
else if(LedInfo[i].times == 20) //20*50ms
|
||||||
{
|
{
|
||||||
sf_led_on(LedInfo[i].ledId);
|
sf_led_on(LedInfo[i].ledId);
|
||||||
LedInfo[i].times = 0;
|
LedInfo[i].times = 0;
|
||||||
|
@ -510,11 +509,11 @@ void* sf_led_thread(void *arg)
|
||||||
{
|
{
|
||||||
sf_led_on(LedInfo[i].ledId);
|
sf_led_on(LedInfo[i].ledId);
|
||||||
}
|
}
|
||||||
else if(LedInfo[i].times == 25) //25*10ms
|
else if(LedInfo[i].times == 5) //5*50ms
|
||||||
{
|
{
|
||||||
sf_led_off(LedInfo[i].ledId);
|
sf_led_off(LedInfo[i].ledId);
|
||||||
}
|
}
|
||||||
else if(LedInfo[i].times == 50) //50*10ms
|
else if(LedInfo[i].times == 10) //10*50ms
|
||||||
{
|
{
|
||||||
sf_led_on(LedInfo[i].ledId);
|
sf_led_on(LedInfo[i].ledId);
|
||||||
LedInfo[i].times = 0;
|
LedInfo[i].times = 0;
|
||||||
|
@ -523,7 +522,7 @@ void* sf_led_thread(void *arg)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
sf_sleep_ms(10);
|
sf_sleep_ms(40);
|
||||||
}
|
}
|
||||||
|
|
||||||
printf("[%s:%d] e \n", __FUNCTION__, __LINE__);
|
printf("[%s:%d] e \n", __FUNCTION__, __LINE__);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user