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

Merge branch 'Branch_S550_Fast_Emmc' of 192.168.6.216:linux-em-group/s530-ntk into S550_Base

Browse Source
This commit is contained in:
xiehongyan 2024-01-19 18:55:10 +08:00
commit dfa4720f22
17 changed files with 197 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code/application/source/cardv/SrcCode/System/SF_SysStrgMng.c
View File

@ -85,7 +85,7 @@ void SF_StrgInit(void) {
sf_mmc_dev[i]->space_state = MMC_DEV_SPACE_STATE_ENOUGH; sf_mmc_dev[i]->space_state = MMC_DEV_SPACE_STATE_ENOUGH;
sf_mmc_dev[i]->loop_state = MMC_DEV_LOOP_STATE_OFF; sf_mmc_dev[i]->loop_state = MMC_DEV_LOOP_STATE_OFF;
} }
sf_strg_dev_init();
pMMCDev = (SF_ST_MMC_DEV *)malloc(sizeof(SF_ST_MMC_DEV)); pMMCDev = (SF_ST_MMC_DEV *)malloc(sizeof(SF_ST_MMC_DEV));
} }
@ -365,6 +365,7 @@ static int sfStrgOnActionSendCurrentDev(SF_ST_MMC_DEV *pMMCDev)
stMessageBuf.arg2 = pMMCDev->dev_type; stMessageBuf.arg2 = pMMCDev->dev_type;
stMessageBuf.arg3 = pMMCDev->moumted_state; stMessageBuf.arg3 = pMMCDev->moumted_state;
stMessageBuf.cmdId = CMD_SD; stMessageBuf.cmdId = CMD_SD;
sf_strg_dev_register(pMMCDev->dev_type, pMMCDev->moumted_state);
sf_com_message_send_to_app(&stMessageBuf); sf_com_message_send_to_app(&stMessageBuf);
MLOGD("sf sys strg update current dev!\n"); MLOGD("sf sys strg update current dev!\n");
return 0; return 0;

37
code/application/source/cardv/SrcCode/System/SF_SysStrgMng.h
View File

@ -21,6 +21,7 @@
#define _SF_SYS_STRG_MNG_H_ #define _SF_SYS_STRG_MNG_H_
#include "sf_type.h" #include "sf_type.h"
#include "sf_param_common.h" #include "sf_param_common.h"
#include "sf_storeMng.h"
#define MMC_DEV_MAX_NUM (2) #define MMC_DEV_MAX_NUM (2)
@ -35,26 +36,26 @@
#define USE_MMC_DEV_CHECK (1) #define USE_MMC_DEV_CHECK (1)
typedef enum // typedef enum
{ // {
MMC_DEV_SD = 0, // MMC_DEV_SD = 0,
MMC_DEV_EMMC = 1, // MMC_DEV_EMMC = 1,
MMC_DEV_NO = 2, // MMC_DEV_NO = 2,
}MMC_DEV_TYPE; // }MMC_DEV_TYPE;
typedef enum // typedef enum
{ // {
MMC_DEV_NODE_STATE_NO = 0, // MMC_DEV_NODE_STATE_NO = 0,
MMC_DEV_NODE_STATE_EXIST = 1, // MMC_DEV_NODE_STATE_EXIST = 1,
MMC_DEV_NODE_STATE_NO_EXIST = 2, // MMC_DEV_NODE_STATE_NO_EXIST = 2,
}MMC_DEV_NODE_STATE; // }MMC_DEV_NODE_STATE;
typedef enum // typedef enum
{ // {
MMC_DEV_MOUNT_STATE_NO = 0, // MMC_DEV_MOUNT_STATE_NO = 0,
MMC_DEV_MOUNT_STATE_MOUNTED = 1, // MMC_DEV_MOUNT_STATE_MOUNTED = 1,
MMC_DEV_MOUNT_STATE_UNMOUNTED = 2, // MMC_DEV_MOUNT_STATE_UNMOUNTED = 2,
}MMC_DEV_MOUNT_STATE; // }MMC_DEV_MOUNT_STATE;
typedef enum typedef enum
{ {

16
code/application/source/cardv/SrcCode/System/SysMain.c
View File

@ -858,14 +858,14 @@ exit:
stMessageBuf.cmdId = CMD_POWEROFF; stMessageBuf.cmdId = CMD_POWEROFF;
sf_com_message_send_to_app(&stMessageBuf); sf_com_message_send_to_app(&stMessageBuf);
#if (LOGFILE_FUNC==ENABLE) #if (LOGFILE_FUNC==ENABLE)
UIMenuStoreInfo *puiPara = sf_ui_para_get(); // UIMenuStoreInfo *puiPara = sf_ui_para_get();
if (puiPara->DebugMode) // if (puiPara->DebugMode)
{ // {
DBG_DUMP("LogFile_Close ...\n"); // DBG_DUMP("LogFile_Close ...\n");
LogFile_Close(); // LogFile_Close();
system("rm -rf /mnt/sd/LOG/*dummy*");//Clear intermediate files. // system("rm -rf /mnt/sd/LOG/*dummy*");//Clear intermediate files.
system("sync"); // system("sync");
} // }
#endif #endif
#else #else
sf_mcu_reg_set(SF_MCU_POWEROFF,paramArray[0]); sf_mcu_reg_set(SF_MCU_POWEROFF,paramArray[0]);

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

@ -75,6 +75,7 @@
#include <sf_message_queue.h> #include <sf_message_queue.h>
#include <sf_param_struct.h> #include <sf_param_struct.h>
#include "sf_sd_common.h" #include "sf_sd_common.h"
#include "sf_mcu.h"
#endif #endif
#if (LOGFILE_FUNC==ENABLE) #if (LOGFILE_FUNC==ENABLE)
#include "LogFile.h" #include "LogFile.h"
@ -327,6 +328,75 @@ _ALIGNED(64) static CHAR gLogFile_Buff2[LOGFILE_BUFFER_SIZE]= {0};
static UINT32 gLogFile_Buff2_Size = sizeof(gLogFile_Buff2); static UINT32 gLogFile_Buff2_Size = sizeof(gLogFile_Buff2);
#endif #endif
#endif #endif
void sf_log_confgs(void)
{
#if (LOGFILE_FUNC==ENABLE)
UIMenuStoreInfo *puiPara = sf_ui_para_get();
DBG_WRN("sf_log_confgs s\n");
if(((puiPara->DebugMode) || (puiPara->AutoLogSwitch)) && (!sf_is_usb_flag()) && (SxTimer_GetFuncActive(SX_TIMER_DET_SYSTEM_ERROR_ID) == 0))
{
{
LOGFILE_OPEN logOpenParm = {0};
LOGFILE_CFG cfg = {0};
UINT32 maxFileNum = 32;
UINT32 maxFileSize = 0x100000; // 1MB
CHAR rootDir[LOGFILE_ROOT_DIR_MAX_LEN + 1] = "A:\\LOG\\";
CHAR sysErrRootDir[LOGFILE_ROOT_DIR_MAX_LEN + 1] = "A:\\SYS\\";
if(puiPara->DebugMode){
cfg.ConType = LOGFILE_CON_MEM | LOGFILE_CON_UART;
}
else {
cfg.ConType = LOGFILE_CON_MEM;
}
logfile_init_dma_buff();
cfg.TimeType = LOGFILE_TIME_TYPE_DATETIME;
cfg.LogBuffAddr = (UINT32)gLogFile_Buff;
cfg.LogBuffSize = gLogFile_Buff_Size;
maxFileSize = gLogFile_Buff_Size;
DBG_WRN("LogFile_Config\n");
LogFile_Config(&cfg);
logOpenParm.maxFileNum = maxFileNum;
logOpenParm.maxFileSize = maxFileSize;
logOpenParm.isPreAllocAllFiles = FALSE;
logOpenParm.isSaveLastTimeSysErrLog = FALSE;
logOpenParm.lastTimeSysErrLogBuffAddr = 0;
logOpenParm.lastTimeSysErrLogBuffSize = 0;
logOpenParm.isZeroFile = TRUE;
strncpy(logOpenParm.rootDir, rootDir, LOGFILE_ROOT_DIR_MAX_LEN);
strncpy(logOpenParm.sysErrRootDir, sysErrRootDir, LOGFILE_ROOT_DIR_MAX_LEN);
DBG_WRN("LogFile_Open\n");
LogFile_Open(&logOpenParm);
//start scan
SxTimer_SetFuncActive(SX_TIMER_DET_SYSTEM_ERROR_ID, TRUE);
}
}
#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();
DBG_DUMP("LogFile:%s\n",tmp);
system("rm -rf /mnt/sd/LOG/*dummy*");//Clear intermediate files.
system("sync");
}
#endif
}
void System_OnStrgInit_FS(void) void System_OnStrgInit_FS(void)
{ {
@ -399,6 +469,7 @@ void System_OnStrgInit_FS(void)
#if (LOGFILE_FUNC==ENABLE) #if (LOGFILE_FUNC==ENABLE)
{ {
#if 0
LOGFILE_CFG cfg = {0}; LOGFILE_CFG cfg = {0};
#if 0 #if 0
// only store system error log // only store system error log
@ -423,6 +494,8 @@ void System_OnStrgInit_FS(void)
cfg.LogBuffSize2 = gLogFile_Buff2_Size; cfg.LogBuffSize2 = gLogFile_Buff2_Size;
#endif #endif
LogFile_Config(&cfg); LogFile_Config(&cfg);
#endif
sf_log_confgs();
} }
#endif #endif
@ -1227,7 +1300,7 @@ INT32 System_OnStrgAttach(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray)
} }
#endif #endif
#if (LOGFILE_FUNC==ENABLE) #if 0//(LOGFILE_FUNC==ENABLE)
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
UIMenuStoreInfo *puiPara = sf_ui_para_get(); UIMenuStoreInfo *puiPara = sf_ui_para_get();

8
code/application/source/cardv/SrcCode/System/main.c
View File

@ -57,6 +57,7 @@ extern bool keypad_read(lv_indev_drv_t * indev_drv, lv_indev_data_t * data);
extern bool pointer_read(lv_indev_drv_t * indev_drv, lv_indev_data_t * data); extern bool pointer_read(lv_indev_drv_t * indev_drv, lv_indev_data_t * data);
extern void lvglTimer(void); extern void lvglTimer(void);
extern void sf_log_sava(void);
/****************************************************** /******************************************************
* static variables * static variables
*******************************************************/ *******************************************************/
@ -470,9 +471,9 @@ int NvtMain(void)
stMessageBuf.cmdId = CMD_MCU; stMessageBuf.cmdId = CMD_MCU;
sf_com_message_send_to_app(&stMessageBuf); sf_com_message_send_to_app(&stMessageBuf);
stMessageBuf.arg1 = SF_DEV_CMD_BAT; // stMessageBuf.arg1 = SF_DEV_CMD_BAT;
stMessageBuf.cmdId = CMD_DEV; // stMessageBuf.cmdId = CMD_DEV;
sf_com_message_send_to_app(&stMessageBuf); // sf_com_message_send_to_app(&stMessageBuf);
stMessageBuf.arg1 = SF_DEV_CMD_TEMPER; stMessageBuf.arg1 = SF_DEV_CMD_TEMPER;
stMessageBuf.cmdId = CMD_DEV; stMessageBuf.cmdId = CMD_DEV;
@ -490,6 +491,7 @@ int NvtMain(void)
#endif #endif
System_WaitForPowerOffStart(); // Wait for shutdown cmd System_WaitForPowerOffStart(); // Wait for shutdown cmd
sf_log_sava();
nvt_user_uninit(); nvt_user_uninit();
nvt_hdal_uninit(); nvt_hdal_uninit();

27
code/application/source/sf_app/code/source/app/sf_service.c
View File

@ -158,12 +158,6 @@ SF_BOOL app_disconnect_4g_module(void) {
#if SF_QLOG_ENABLE #if SF_QLOG_ENABLE
static SINT16 app_Qlog_procress(void) { static SINT16 app_Qlog_procress(void) {
SINT16 s32ret = SF_SUCCESS; SINT16 s32ret = SF_SUCCESS;
char *file_path = sf_root_path_strcat(QLOG_PATH);
if(file_path == NULL)
{
free(file_path);
return SF_FAILURE;
}
char qlogPath[128] = {0}; char qlogPath[128] = {0};
char qlogDirCmd[128] = {0}; char qlogDirCmd[128] = {0};
@ -172,10 +166,14 @@ static SINT16 app_Qlog_procress(void) {
if(SF_FAILURE == sf_check_sd()) if(SF_FAILURE == sf_check_sd())
{ {
MLOGE("ERROR sf_check_sd\n"); MLOGE("ERROR sf_check_sd\n");
free(file_path);
return SF_FAILURE; return SF_FAILURE;
} }
char *file_path = sf_root_path_strcat(QLOG_PATH);
if(file_path == NULL)
{
free(file_path);
return SF_FAILURE;
}
time(&timep); time(&timep);
p = gmtime(&timep); p = gmtime(&timep);
if (access(file_path, F_OK) != 0) { if (access(file_path, F_OK) != 0) {
@ -2417,6 +2415,7 @@ int sf_check_sd(void)
{ {
UINT8 i = 0; UINT8 i = 0;
int ret = SF_SUCCESS; int ret = SF_SUCCESS;
int cnt = 0;
if(0 == sf_in_card_exist() && (0 == sf_in_emmc_exist())) if(0 == sf_in_card_exist() && (0 == sf_in_emmc_exist()))
{ {
NET_SLOGE("NO SD\r\n"); NET_SLOGE("NO SD\r\n");
@ -2437,10 +2436,14 @@ int sf_check_sd(void)
{ {
if (1 == sf_is_sdc_mounted()) if (1 == sf_is_sdc_mounted())
{ {
ret = SF_SUCCESS; if(cnt > 3)
MLOGI("mounted SD\r\n"); {
sf_statistics_param_load(sf_statistics_param_get()); ret = SF_SUCCESS;
break; MLOGI("mounted SD\r\n");
sf_statistics_param_load(sf_statistics_param_get());
break;
}
cnt++;
} }
sleep(1); sleep(1);

2
code/application/source/sf_app/code/source/app/sf_system.c
View File

@ -700,7 +700,7 @@ SINT32 app_system_poweroff(SF_POWEROFF_TYPE_E enType )
#if SF_QLOG_ENABLE #if SF_QLOG_ENABLE
if(puiPara->QLogSwitch) if(puiPara->QLogSwitch)
{ {
system("killall qlog"); system("killall QLog");
} }
#endif #endif
//if((puiPara->DebugMode) || (puiPara->QLogSwitch)){ //if((puiPara->DebugMode) || (puiPara->QLogSwitch)){

17
code/application/source/sf_app/code/source/storeMng/sf_storeMng.c
View File

@ -54,8 +54,21 @@ void sf_strg_dev_uninit(void)
void sf_strg_dev_register(SINT32 dev_id, SINT32 mounted) void sf_strg_dev_register(SINT32 dev_id, SINT32 mounted)
{ {
sf_strg_dev->dev_type = dev_id; MLOGD("dev_id:%d mounted:%d\n",dev_id, mounted);
sf_strg_dev->moumted_state = mounted; if(sf_strg_dev != NULL)
{
sf_strg_dev->dev_type = dev_id;
sf_strg_dev->moumted_state = mounted;
}
else {
MLOGE("dev_id:%d mounted:%d\n",dev_id, mounted);
sf_strg_dev = (SF_STRG_DEV *)malloc(sizeof(SF_STRG_DEV));
if(sf_strg_dev != NULL)
{
sf_strg_dev->dev_type = dev_id;
sf_strg_dev->moumted_state = mounted;
}
}
} }
MMC_DEV_TYPE sf_get_strg_dev(void) MMC_DEV_TYPE sf_get_strg_dev(void)

2
code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c
View File

@ -2106,7 +2106,7 @@ SINT32 sf_svr_packet_proc(SINT32 fd, UINT8 *pAppData, UINT16 dataLen)
case WIFI_CONTROL_CAMERA_SHOOT: case WIFI_CONTROL_CAMERA_SHOOT:
MLOGI("[WIFI_SET_CAMERA_SHOOT] shoot:%d\n",pMsgStruct->msgBuf.ctrlShoot.shoot); MLOGI("[WIFI_SET_CAMERA_SHOOT] shoot:%d\n",pMsgStruct->msgBuf.ctrlShoot.shoot);
if((FALSE == sf_get_send_statu()) && (System_GetState(SYS_STATE_CARD) == CARD_INSERTED) && (TRUE == sf_is_preview()) && (pMsgStruct->msgBuf.ctrlShoot.shoot <= 3)) if((FALSE == sf_get_send_statu()) && (TRUE == sf_is_preview()) && (pMsgStruct->msgBuf.ctrlShoot.shoot <= 3))
{ {
if((puiPara->CamMode != 1) && (pMsgStruct->msgBuf.ctrlShoot.shoot < 3)) if((puiPara->CamMode != 1) && (pMsgStruct->msgBuf.ctrlShoot.shoot < 3))
{ {

3
rtos/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/DxHunting.c
View File

@ -26,6 +26,7 @@
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
#include <sf_mcu.h> #include <sf_mcu.h>
#include "sys_fastboot.h" #include "sys_fastboot.h"
#include "sf_battery.h"
#endif #endif
#define IRLED_CTRL_BY_PWM ENABLE//DISABLE// #define IRLED_CTRL_BY_PWM ENABLE//DISABLE//
@ -517,12 +518,14 @@ void sf_ir_led_set(UINT8 mode, UINT8 flashLed, UINT8 stillExp, UINT8 isSnapVideo
pwm_pwm_enable(IRLED_PWMID); pwm_pwm_enable(IRLED_PWMID);
IsNightLedOn = 1; IsNightLedOn = 1;
sf_set_night_led_flag(1);
} }
else else
{ {
//sf_pwm_set(IR_LED_1, 0, 100, 100, 0); //sf_pwm_set(IR_LED_1, 0, 100, 100, 0);
pwm_pwm_disable(IRLED_PWMID); pwm_pwm_disable(IRLED_PWMID);
IsNightLedOn = 0; IsNightLedOn = 0;
sf_set_night_led_flag(0);
} }
} }

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 (LOGFILE_FUNC==ENABLE)
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
UIMenuStoreInfo *puiPara = sf_ui_para_get(); UIMenuStoreInfo *puiPara = sf_ui_para_get();
if(puiPara->AutoLogSwitch) if(((puiPara->DebugMode) || (puiPara->AutoLogSwitch)))
{ {
LogFile_Close(); LogFile_Close();
} }
@ -640,7 +640,7 @@ INT32 System_OnStrgRemove(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray)
#if (LOGFILE_FUNC==ENABLE) #if (LOGFILE_FUNC==ENABLE)
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
UIMenuStoreInfo *puiPara = sf_ui_para_get(); UIMenuStoreInfo *puiPara = sf_ui_para_get();
if(puiPara->AutoLogSwitch) if(((puiPara->DebugMode) || (puiPara->AutoLogSwitch)))
{ {
LogFile_Suspend(); LogFile_Suspend();
LogFile_Close(); LogFile_Close();
@ -787,7 +787,7 @@ INT32 System_OnStrgAttach(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray)
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
UIMenuStoreInfo *puiPara = sf_ui_para_get(); 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 #else
if (SxTimer_GetFuncActive(SX_TIMER_DET_SYSTEM_ERROR_ID) == 0) if (SxTimer_GetFuncActive(SX_TIMER_DET_SYSTEM_ERROR_ID) == 0)
#endif #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) #if (LOGFILE_FUNC==ENABLE)
UIMenuStoreInfo *puiPara = sf_ui_para_get(); 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"); DBG_WRN("SwTimer_Init\n");
SwTimer_Init(); // sw timer SwTimer_Init(); // sw timer
@ -131,7 +131,12 @@ void sf_log_confgs(void)
UINT32 maxFileSize = 0x100000; // 1MB UINT32 maxFileSize = 0x100000; // 1MB
CHAR rootDir[LOGFILE_ROOT_DIR_MAX_LEN + 1] = "A:\\LOG\\"; CHAR rootDir[LOGFILE_ROOT_DIR_MAX_LEN + 1] = "A:\\LOG\\";
CHAR sysErrRootDir[LOGFILE_ROOT_DIR_MAX_LEN + 1] = "A:\\SYS\\"; 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.TimeType = LOGFILE_TIME_TYPE_DATETIME;
cfg.LogBuffAddr = (UINT32)gLogFile_Buff; cfg.LogBuffAddr = (UINT32)gLogFile_Buff;
cfg.LogBuffSize = sizeof(gLogFile_Buff); cfg.LogBuffSize = sizeof(gLogFile_Buff);
@ -156,6 +161,24 @@ void sf_log_confgs(void)
#endif #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) static void insmod_system(void)
{ {
#if (HUNTING_CAMERA_MODEL == ENABLE) #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 #endif
FileDB_InstallID(); 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 #define SYS_FILESYS_H
void filesys_init(void); void filesys_init(void);
void sf_log_open(void);
void sf_log_confg(void);
#endif #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 (LOGFILE_FUNC==ENABLE)
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
UIMenuStoreInfo *puiPara = sf_ui_para_get(); UIMenuStoreInfo *puiPara = sf_ui_para_get();
if(puiPara->AutoLogSwitch) if(((puiPara->DebugMode) || (puiPara->AutoLogSwitch)))
{ {
LogFile_Suspend(); LogFile_Suspend();
LogFile_Close(); LogFile_Close();
@ -788,7 +788,7 @@ UINT32 BackgroundFormat(void)
//#NT#Support logfile function //#NT#Support logfile function
#if (LOGFILE_FUNC==ENABLE) #if (LOGFILE_FUNC==ENABLE)
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
if(puiPara->AutoLogSwitch) if(((puiPara->DebugMode) || (puiPara->AutoLogSwitch)))
{ {
LogFile_ReOpen(); LogFile_ReOpen();
} }
@ -826,7 +826,7 @@ UINT32 BackgroundFormatCard(void)
#if (LOGFILE_FUNC==ENABLE) #if (LOGFILE_FUNC==ENABLE)
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
UIMenuStoreInfo *puiPara = sf_ui_para_get(); UIMenuStoreInfo *puiPara = sf_ui_para_get();
if(puiPara->AutoLogSwitch) if(((puiPara->DebugMode) || (puiPara->AutoLogSwitch)))
{ {
LogFile_Suspend(); LogFile_Suspend();
LogFile_Complete(); LogFile_Complete();
@ -864,7 +864,7 @@ UINT32 BackgroundFormatCard(void)
//#NT#Support logfile function //#NT#Support logfile function
#if (LOGFILE_FUNC==ENABLE) #if (LOGFILE_FUNC==ENABLE)
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
if(puiPara->AutoLogSwitch) if(((puiPara->DebugMode) || (puiPara->AutoLogSwitch)))
{ {
LogFile_ReOpen(); LogFile_ReOpen();
} }
@ -894,7 +894,7 @@ UINT32 BackgroundFormatNand(void)
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
UIMenuStoreInfo *puiPara = sf_ui_para_get(); UIMenuStoreInfo *puiPara = sf_ui_para_get();
if(puiPara->AutoLogSwitch) if(((puiPara->DebugMode) || (puiPara->AutoLogSwitch)))
{ {
LogFile_Suspend(); LogFile_Suspend();
LogFile_Complete(); LogFile_Complete();
@ -932,7 +932,7 @@ UINT32 BackgroundFormatNand(void)
//#NT#Support logfile function //#NT#Support logfile function
#if (LOGFILE_FUNC==ENABLE) #if (LOGFILE_FUNC==ENABLE)
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
if(puiPara->AutoLogSwitch) if(((puiPara->DebugMode) || (puiPara->AutoLogSwitch)))
{ {
LogFile_ReOpen(); 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_Close(void);
static void MovieFast_Load_Sen_Cfg(MOVIEFAST_IQ_CFG cfg); static void MovieFast_Load_Sen_Cfg(MOVIEFAST_IQ_CFG cfg);
extern void sf_log_sava(void);
static VOID MovieFast_Set_RecStartTick(VOS_TICK tick) static VOID MovieFast_Set_RecStartTick(VOS_TICK tick)
{ {
g_rec_start_tick = tick; g_rec_start_tick = tick;
@ -316,14 +317,15 @@ static void MovieFast_ShutDown(void)
sf_file_thumb_cfg_sava(); sf_file_thumb_cfg_sava();
sf_para_print(); sf_para_print();
#if (LOGFILE_FUNC==ENABLE) #if (LOGFILE_FUNC==ENABLE)
UIMenuStoreInfo *puiPara = sf_ui_para_get(); sf_log_sava();
if(puiPara->DebugMode) // UIMenuStoreInfo *puiPara = sf_ui_para_get();
{ // if(puiPara->AutoLogSwitch)
DBG_DUMP("LogFile_Close ...\n"); // {
LogFile_Suspend(); // DBG_DUMP("LogFile_Close ...\n");
LogFile_DumpToFile("A:\\Log.txt"); // LogFile_Suspend();
LogFile_Close(); // LogFile_DumpToFile("A:\\Log.txt");
} // LogFile_Close();
// }
#endif #endif
//DBG_DUMP("wait filesys close ...\n"); //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_NIGHTMODE(UINT32 id, UINT8 isSnapVideo);
void Set_AEMODE(UINT32 id); void Set_AEMODE(UINT32 id);
void PhotoFast_TriggerFrm_Dump(void); void PhotoFast_TriggerFrm_Dump(void);
extern void sf_log_sava(void);
static HD_RESULT init_enc_module(void) static HD_RESULT init_enc_module(void)
{ {
HD_RESULT hd_ret; HD_RESULT hd_ret;
@ -2268,14 +2268,15 @@ static void PhotoFast_ShutDown(void)
sf_para_print(); sf_para_print();
// DBG_DUMP("wait filesys close ...\n"); // DBG_DUMP("wait filesys close ...\n");
#if (LOGFILE_FUNC==ENABLE) #if (LOGFILE_FUNC==ENABLE)
UIMenuStoreInfo *puiPara = sf_ui_para_get(); sf_log_sava();
if(puiPara->AutoLogSwitch) // UIMenuStoreInfo *puiPara = sf_ui_para_get();
{ // if(puiPara->AutoLogSwitch)
DBG_DUMP("LogFile_Close ...\n"); // {
LogFile_Suspend(); // DBG_DUMP("LogFile_Close ...\n");
LogFile_DumpToFile("A:\\Log.txt"); // LogFile_Suspend();
LogFile_Close(); // LogFile_DumpToFile("A:\\Log.txt");
} // LogFile_Close();
// }
#endif #endif
// FileSys_Close(FST_TIME_INFINITE); // FileSys_Close(FST_TIME_INFINITE);
FileSys_CloseEx('A', FST_TIME_INFINITE); FileSys_CloseEx('A', FST_TIME_INFINITE);