1.log记录修改
This commit is contained in:
parent
9eefddeda7
commit
7aa48a9d25
|
@ -382,17 +382,33 @@ void sf_log_sava(void)
|
||||||
UIMenuStoreInfo *puiPara = sf_ui_para_get();
|
UIMenuStoreInfo *puiPara = sf_ui_para_get();
|
||||||
struct tm current_time2 = {0};
|
struct tm current_time2 = {0};
|
||||||
char tmp[64] = {'\0'};
|
char tmp[64] = {'\0'};
|
||||||
if((((puiPara->DebugMode) || (puiPara->AutoLogSwitch)) && (!sf_is_usb_flag())) && ((TRUE != sf_is_card_full())))
|
SF_ST_MMC_DEV *mmc_dev = SF_GetMMCDev();
|
||||||
|
if((((puiPara->DebugMode) || (puiPara->AutoLogSwitch)) && (!sf_is_usb_flag())) && ((mmc_dev != NULL)))
|
||||||
{
|
{
|
||||||
DBG_DUMP("LogFile_Close ...\n");
|
DBG_DUMP("LogFile_Close ...\n");
|
||||||
|
if(mmc_dev->dcf_handle < 0)
|
||||||
|
{
|
||||||
|
DBG_ERR("dcf_handle err\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
current_time2 = hwclock_get_time(TIME_ID_CURRENT);
|
current_time2 = hwclock_get_time(TIME_ID_CURRENT);
|
||||||
snprintf(tmp, sizeof(tmp), "A:\\LOG\\%lu%02lu%02lu%02lu%02lu%02lu_%d.log", current_time2.tm_year, current_time2.tm_mon, current_time2.tm_mday, current_time2.tm_hour, current_time2.tm_min, current_time2.tm_sec,sf_get_power_on_mode());
|
|
||||||
//
|
|
||||||
LogFile_Suspend();
|
LogFile_Suspend();
|
||||||
LogFile_DumpToFile(tmp);
|
if((mmc_dev->dev_type == MMC_DEV_SD) && (TRUE != sf_is_card_full()))
|
||||||
|
{
|
||||||
|
snprintf(tmp, sizeof(tmp), "A:\\LOG\\%lu%02lu%02lu%02lu%02lu%02lu_%d.log", current_time2.tm_year, current_time2.tm_mon, current_time2.tm_mday, current_time2.tm_hour, current_time2.tm_min, current_time2.tm_sec,sf_get_power_on_mode());
|
||||||
|
LogFile_DumpToFile(tmp);
|
||||||
|
}
|
||||||
|
else if((TRUE != sf_is_emmc_full()))
|
||||||
|
{
|
||||||
|
snprintf(tmp, sizeof(tmp), "B:\\LOG\\%lu%02lu%02lu%02lu%02lu%02lu_%d.log", current_time2.tm_year, current_time2.tm_mon, current_time2.tm_mday, current_time2.tm_hour, current_time2.tm_min, current_time2.tm_sec,sf_get_power_on_mode());
|
||||||
|
LogFile_DumpToFile(tmp);
|
||||||
|
}
|
||||||
|
//
|
||||||
LogFile_Close();
|
LogFile_Close();
|
||||||
|
|
||||||
DBG_DUMP("LogFile:%s\n",tmp);
|
DBG_DUMP("LogFile:%s\n",tmp);
|
||||||
system("rm -rf /mnt/sd/LOG/*dummy*");//Clear intermediate files.
|
system("rm -rf /mnt/sd/LOG/*dummy*");//Clear intermediate files.
|
||||||
|
system("rm -rf /mnt/sd2/LOG/*dummy*");//Clear intermediate files.
|
||||||
system("sync");
|
system("sync");
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -87,6 +87,7 @@
|
||||||
#include <sf_mcu.h>
|
#include <sf_mcu.h>
|
||||||
#include "sf_led.h"
|
#include "sf_led.h"
|
||||||
#include "sf_battery.h"
|
#include "sf_battery.h"
|
||||||
|
#include "sf_sd_common.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//dis
|
//dis
|
||||||
|
@ -168,14 +169,35 @@ void sf_log_sava(void)
|
||||||
struct tm current_time2 = {0};
|
struct tm current_time2 = {0};
|
||||||
char tmp[64] = {'\0'};
|
char tmp[64] = {'\0'};
|
||||||
ER ret = 0;
|
ER ret = 0;
|
||||||
|
SF_RTOS_ST_MMC_DEV *mmc_dev = NULL;
|
||||||
if((((puiPara->DebugMode) || (puiPara->AutoLogSwitch)) && (!sf_is_usb_flag())) && ((TRUE != sf_is_card_full()) || (TRUE != sf_is_emmc_full())))
|
if((((puiPara->DebugMode) || (puiPara->AutoLogSwitch)) && (!sf_is_usb_flag())) && ((TRUE != sf_is_card_full()) || (TRUE != sf_is_emmc_full())))
|
||||||
{
|
{
|
||||||
|
#if USE_RTOS_MMC_CHECK
|
||||||
|
mmc_dev = SF_RtosStrgCheckWorkableDev();
|
||||||
|
if(mmc_dev == NULL)
|
||||||
|
{
|
||||||
|
DBG_ERR("No MMC_Dev Can use!\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if(mmc_dev->dcf_handle < 0)
|
||||||
|
{
|
||||||
|
DBG_ERR("dcf_handle err\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
current_time2 = hwclock_get_time(TIME_ID_CURRENT);
|
current_time2 = hwclock_get_time(TIME_ID_CURRENT);
|
||||||
snprintf(tmp, sizeof(tmp), "A:\\LOG\\%lu%02lu%02lu%02lu%02lu%02lu_%d.log", current_time2.tm_year, current_time2.tm_mon, current_time2.tm_mday, current_time2.tm_hour, current_time2.tm_min, current_time2.tm_sec,sf_get_power_on_mode());
|
|
||||||
//
|
|
||||||
LogFile_Suspend();
|
LogFile_Suspend();
|
||||||
ret = LogFile_DumpToFile(tmp);
|
if((mmc_dev->dev_type == MMC_DEV_SD) && (TRUE != sf_is_card_full()))
|
||||||
|
{
|
||||||
|
snprintf(tmp, sizeof(tmp), "A:\\LOG\\%lu%02lu%02lu%02lu%02lu%02lu_%d.log", current_time2.tm_year, current_time2.tm_mon, current_time2.tm_mday, current_time2.tm_hour, current_time2.tm_min, current_time2.tm_sec,sf_get_power_on_mode());
|
||||||
|
ret = LogFile_DumpToFile(tmp);
|
||||||
|
}
|
||||||
|
else if((TRUE != sf_is_emmc_full()))
|
||||||
|
{
|
||||||
|
snprintf(tmp, sizeof(tmp), "B:\\LOG\\%lu%02lu%02lu%02lu%02lu%02lu_%d.log", current_time2.tm_year, current_time2.tm_mon, current_time2.tm_mday, current_time2.tm_hour, current_time2.tm_min, current_time2.tm_sec,sf_get_power_on_mode());
|
||||||
|
ret = LogFile_DumpToFile(tmp);
|
||||||
|
}
|
||||||
|
//
|
||||||
LogFile_Close();
|
LogFile_Close();
|
||||||
DBG_DUMP("LogFile_Close:%s ret:%d\n", tmp, ret);
|
DBG_DUMP("LogFile_Close:%s ret:%d\n", tmp, ret);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user