payton/nt9856x
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.rtos下log记录

Browse Source
This commit is contained in:
payton 2024-01-19 18:37:25 +08:00
parent 1bdd522247
commit c24d93ddc0
7 changed files with 54 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rtos/code/application/source/cardv/SrcCode/System/SysStrg_Exe.c
View File

@ -486,7 +486,7 @@ void System_OnStrgExit_FS(void)
#if (LOGFILE_FUNC==ENABLE)
#if HUNTING_CAMERA_MCU == ENABLE
UIMenuStoreInfo *puiPara = sf_ui_para_get();
if(puiPara->AutoLogSwitch)
if(((puiPara->DebugMode) || (puiPara->AutoLogSwitch)))
{
LogFile_Close();
}
@ -640,7 +640,7 @@ INT32 System_OnStrgRemove(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray)
#if (LOGFILE_FUNC==ENABLE)
#if HUNTING_CAMERA_MCU == ENABLE
UIMenuStoreInfo *puiPara = sf_ui_para_get();
if(puiPara->AutoLogSwitch)
if(((puiPara->DebugMode) || (puiPara->AutoLogSwitch)))
{
LogFile_Suspend();
LogFile_Close();
@ -787,7 +787,7 @@ INT32 System_OnStrgAttach(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray)
#if HUNTING_CAMERA_MCU == ENABLE
UIMenuStoreInfo *puiPara = sf_ui_para_get();
if ((puiPara->AutoLogSwitch) && SxTimer_GetFuncActive(SX_TIMER_DET_SYSTEM_ERROR_ID) == 0)
if (((puiPara->DebugMode) || (puiPara->AutoLogSwitch)) && SxTimer_GetFuncActive(SX_TIMER_DET_SYSTEM_ERROR_ID) == 0)
#else
if (SxTimer_GetFuncActive(SX_TIMER_DET_SYSTEM_ERROR_ID) == 0)
#endif

27
rtos/code/application/source/cardv/SrcCode/System/rtos-main.c
View File

@ -120,7 +120,7 @@ void sf_log_confgs(void)
{
#if (LOGFILE_FUNC==ENABLE)
UIMenuStoreInfo *puiPara = sf_ui_para_get();
if(puiPara->AutoLogSwitch && (!sf_is_usb_flag()))
if(((puiPara->DebugMode) || (puiPara->AutoLogSwitch)) && (!sf_is_usb_flag()))
{
DBG_WRN("SwTimer_Init\n");
SwTimer_Init(); // sw timer
@ -131,7 +131,12 @@ void sf_log_confgs(void)
UINT32 maxFileSize = 0x100000; // 1MB
CHAR rootDir[LOGFILE_ROOT_DIR_MAX_LEN + 1] = "A:\\LOG\\";
CHAR sysErrRootDir[LOGFILE_ROOT_DIR_MAX_LEN + 1] = "A:\\SYS\\";
cfg.ConType = LOGFILE_CON_MEM | LOGFILE_CON_UART;
if(puiPara->DebugMode){
cfg.ConType = LOGFILE_CON_MEM | LOGFILE_CON_UART;
}
else {
cfg.ConType = LOGFILE_CON_MEM;
}
cfg.TimeType = LOGFILE_TIME_TYPE_DATETIME;
cfg.LogBuffAddr = (UINT32)gLogFile_Buff;
cfg.LogBuffSize = sizeof(gLogFile_Buff);
@ -156,6 +161,24 @@ void sf_log_confgs(void)
#endif
}
void sf_log_sava(void)
{
#if (LOGFILE_FUNC==ENABLE)
UIMenuStoreInfo *puiPara = sf_ui_para_get();
struct tm current_time2 = {0};
char tmp[64] = {'\0'};
if(((puiPara->DebugMode) || (puiPara->AutoLogSwitch)) && (!sf_is_usb_flag()))
{
DBG_DUMP("LogFile_Close ...\n");
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_DumpToFile(tmp);
LogFile_Close();
}
#endif
}
static void insmod_system(void)
{
#if (HUNTING_CAMERA_MODEL == ENABLE)

71
rtos/code/application/source/cardv/SrcCode/System/sys_filesys.c
View File

@ -258,74 +258,3 @@ void filesys_init(void)
#endif
FileDB_InstallID();
}
#if HUNTING_CAMERA_MCU == ENABLE
static int SF_SX_TIMER_DET_SYSTEM_ERROR_ID = -1;
_ALIGNED(64) static CHAR gLogFile_Buff[LOGFILE_BUFFER_SIZE]= {0};
void sfSystem_DetErr(void);
SX_TIMER_ITEM(sfSystem_DetErr, sfSystem_DetErr,50, FALSE)
void sfSystem_DetErr(void)
{
}
void sf_log_confg(void)
{
#if (LOGFILE_FUNC==ENABLE)
UIMenuStoreInfo *puiPara = sf_ui_para_get();
if(puiPara->AutoLogSwitch)
{
LOGFILE_CFG cfg = {0};
cfg.ConType = LOGFILE_CON_UART|LOGFILE_CON_STORE;
cfg.TimeType = LOGFILE_TIME_TYPE_DATETIME;
cfg.LogBuffAddr = (UINT32)gLogFile_Buff;
cfg.LogBuffSize = sizeof(gLogFile_Buff);
LogFile_Config(&cfg);
SF_SX_TIMER_DET_SYSTEM_ERROR_ID = SxTimer_AddItem(&Timer_sfSystem_DetErr);
}
#endif
}
void sf_log_open(void)
{
#if (LOGFILE_FUNC==ENABLE)
UIMenuStoreInfo *puiPara = sf_ui_para_get();
if ((puiPara->AutoLogSwitch) && SxTimer_GetFuncActive(SF_SX_TIMER_DET_SYSTEM_ERROR_ID) == 0)
{
LOGFILE_OPEN logOpenParm = {0};
UINT32 maxFileNum = 32;
UINT32 maxFileSize = 0x100000; // 1MB
CHAR rootDir[LOGFILE_ROOT_DIR_MAX_LEN + 1] = "A:\\LOG\\";
#if defined(_CPU2_LINUX_)
CHAR rootDir2[LOGFILE_ROOT_DIR_MAX_LEN + 1] = "A:\\Novatek\\LOG2\\";
#endif
CHAR sysErrRootDir[LOGFILE_ROOT_DIR_MAX_LEN + 1] = "A:\\SYS\\";
logOpenParm.maxFileNum = maxFileNum;
logOpenParm.maxFileSize = maxFileSize;
logOpenParm.isPreAllocAllFiles = FALSE;
logOpenParm.isSaveLastTimeSysErrLog = wdt_getResetNum()>0 ? TRUE : FALSE;
logOpenParm.lastTimeSysErrLogBuffAddr = mempool_logfile;
logOpenParm.lastTimeSysErrLogBuffSize = POOL_SIZE_LOGFILE;
logOpenParm.isZeroFile = TRUE;
strncpy(logOpenParm.rootDir, rootDir, LOGFILE_ROOT_DIR_MAX_LEN);
#if defined(_CPU2_LINUX_)
strncpy(logOpenParm.rootDir2, rootDir2, LOGFILE_ROOT_DIR_MAX_LEN);
#endif
strncpy(logOpenParm.sysErrRootDir, sysErrRootDir, LOGFILE_ROOT_DIR_MAX_LEN);
LogFile_Open(&logOpenParm);
//start scan
SxTimer_SetFuncActive(SF_SX_TIMER_DET_SYSTEM_ERROR_ID, TRUE);
sf_para_print();
}
#endif
}
#endif

2
rtos/code/application/source/cardv/SrcCode/System/sys_filesys.h
View File

@ -2,6 +2,4 @@
#define SYS_FILESYS_H
void filesys_init(void);
void sf_log_open(void);
void sf_log_confg(void);
#endif

12
rtos/code/application/source/cardv/SrcCode/UIApp/Background/UIBackgroundObj.c
View File

@ -750,7 +750,7 @@ UINT32 BackgroundFormat(void)
#if (LOGFILE_FUNC==ENABLE)
#if HUNTING_CAMERA_MCU == ENABLE
UIMenuStoreInfo *puiPara = sf_ui_para_get();
if(puiPara->AutoLogSwitch)
if(((puiPara->DebugMode) || (puiPara->AutoLogSwitch)))
{
LogFile_Suspend();
LogFile_Close();
@ -788,7 +788,7 @@ UINT32 BackgroundFormat(void)
//#NT#Support logfile function
#if (LOGFILE_FUNC==ENABLE)
#if HUNTING_CAMERA_MCU == ENABLE
if(puiPara->AutoLogSwitch)
if(((puiPara->DebugMode) || (puiPara->AutoLogSwitch)))
{
LogFile_ReOpen();
}
@ -826,7 +826,7 @@ UINT32 BackgroundFormatCard(void)
#if (LOGFILE_FUNC==ENABLE)
#if HUNTING_CAMERA_MCU == ENABLE
UIMenuStoreInfo *puiPara = sf_ui_para_get();
if(puiPara->AutoLogSwitch)
if(((puiPara->DebugMode) || (puiPara->AutoLogSwitch)))
{
LogFile_Suspend();
LogFile_Complete();
@ -864,7 +864,7 @@ UINT32 BackgroundFormatCard(void)
//#NT#Support logfile function
#if (LOGFILE_FUNC==ENABLE)
#if HUNTING_CAMERA_MCU == ENABLE
if(puiPara->AutoLogSwitch)
if(((puiPara->DebugMode) || (puiPara->AutoLogSwitch)))
{
LogFile_ReOpen();
}
@ -894,7 +894,7 @@ UINT32 BackgroundFormatNand(void)
#if HUNTING_CAMERA_MCU == ENABLE
UIMenuStoreInfo *puiPara = sf_ui_para_get();
if(puiPara->AutoLogSwitch)
if(((puiPara->DebugMode) || (puiPara->AutoLogSwitch)))
{
LogFile_Suspend();
LogFile_Complete();
@ -932,7 +932,7 @@ UINT32 BackgroundFormatNand(void)
//#NT#Support logfile function
#if (LOGFILE_FUNC==ENABLE)
#if HUNTING_CAMERA_MCU == ENABLE
if(puiPara->AutoLogSwitch)
if(((puiPara->DebugMode) || (puiPara->AutoLogSwitch)))
{
LogFile_ReOpen();
}

18
rtos/code/application/source/cardv/SrcCode/UIApp/MovieFast/MovieFast.c
View File

@ -134,6 +134,7 @@ static void MovieFast_ShutDown(void);
static void MovieFast_Close(void);
static void MovieFast_Load_Sen_Cfg(MOVIEFAST_IQ_CFG cfg);
extern void sf_log_sava(void);
static VOID MovieFast_Set_RecStartTick(VOS_TICK tick)
{
g_rec_start_tick = tick;
@ -316,14 +317,15 @@ static void MovieFast_ShutDown(void)
sf_file_thumb_cfg_sava();
sf_para_print();
#if (LOGFILE_FUNC==ENABLE)
UIMenuStoreInfo *puiPara = sf_ui_para_get();
if(puiPara->DebugMode)
{
DBG_DUMP("LogFile_Close ...\n");
LogFile_Suspend();
LogFile_DumpToFile("A:\\Log.txt");
LogFile_Close();
}
sf_log_sava();
// UIMenuStoreInfo *puiPara = sf_ui_para_get();
// if(puiPara->AutoLogSwitch)
// {
// DBG_DUMP("LogFile_Close ...\n");
// LogFile_Suspend();
// LogFile_DumpToFile("A:\\Log.txt");
// LogFile_Close();
// }
#endif
//DBG_DUMP("wait filesys close ...\n");

19
rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.c
View File

@ -137,7 +137,7 @@ static void PhotoFast_ShutDown(void);
void Set_NIGHTMODE(UINT32 id, UINT8 isSnapVideo);
void Set_AEMODE(UINT32 id);
void PhotoFast_TriggerFrm_Dump(void);
extern void sf_log_sava(void);
static HD_RESULT init_enc_module(void)
{
HD_RESULT hd_ret;
@ -2268,14 +2268,15 @@ static void PhotoFast_ShutDown(void)
sf_para_print();
// DBG_DUMP("wait filesys close ...\n");
#if (LOGFILE_FUNC==ENABLE)
UIMenuStoreInfo *puiPara = sf_ui_para_get();
if(puiPara->AutoLogSwitch)
{
DBG_DUMP("LogFile_Close ...\n");
LogFile_Suspend();
LogFile_DumpToFile("A:\\Log.txt");
LogFile_Close();
}
sf_log_sava();
// UIMenuStoreInfo *puiPara = sf_ui_para_get();
// if(puiPara->AutoLogSwitch)
// {
// DBG_DUMP("LogFile_Close ...\n");
// LogFile_Suspend();
// LogFile_DumpToFile("A:\\Log.txt");
// LogFile_Close();
// }
#endif
// FileSys_Close(FST_TIME_INFINITE);
FileSys_CloseEx('A', FST_TIME_INFINITE);