From e0212e4146512823207cbf656e58ffc4e62a1d03 Mon Sep 17 00:00:00 2001 From: payton Date: Fri, 19 Jan 2024 16:07:25 +0800 Subject: [PATCH 1/7] =?UTF-8?q?1.sd=E5=8D=A1=E5=92=8Cqlog=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sf_app/code/source/app/sf_service.c | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/code/application/source/sf_app/code/source/app/sf_service.c b/code/application/source/sf_app/code/source/app/sf_service.c index eebb87b0e..dbfaa04f3 100755 --- a/code/application/source/sf_app/code/source/app/sf_service.c +++ b/code/application/source/sf_app/code/source/app/sf_service.c @@ -158,12 +158,6 @@ SF_BOOL app_disconnect_4g_module(void) { #if SF_QLOG_ENABLE static SINT16 app_Qlog_procress(void) { 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 qlogDirCmd[128] = {0}; @@ -172,10 +166,14 @@ static SINT16 app_Qlog_procress(void) { if(SF_FAILURE == sf_check_sd()) { MLOGE("ERROR sf_check_sd\n"); - free(file_path); return SF_FAILURE; } - + char *file_path = sf_root_path_strcat(QLOG_PATH); + if(file_path == NULL) + { + free(file_path); + return SF_FAILURE; + } time(&timep); p = gmtime(&timep); if (access(file_path, F_OK) != 0) { @@ -2417,6 +2415,7 @@ int sf_check_sd(void) { UINT8 i = 0; int ret = SF_SUCCESS; + int cnt = 0; if(0 == sf_in_card_exist() && (0 == sf_in_emmc_exist())) { NET_SLOGE("NO SD\r\n"); @@ -2437,10 +2436,14 @@ int sf_check_sd(void) { if (1 == sf_is_sdc_mounted()) { - ret = SF_SUCCESS; - MLOGI("mounted SD\r\n"); - sf_statistics_param_load(sf_statistics_param_get()); - break; + if(cnt > 3) + { + ret = SF_SUCCESS; + MLOGI("mounted SD\r\n"); + sf_statistics_param_load(sf_statistics_param_get()); + break; + } + cnt++; } sleep(1); From 69411a2ec05512b454f474d5fbd4175658f8787e Mon Sep 17 00:00:00 2001 From: payton Date: Fri, 19 Jan 2024 18:36:16 +0800 Subject: [PATCH 2/7] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=97=A0emmc=E6=9C=89s?= =?UTF-8?q?d=E5=8D=A1=E6=97=B6WiFi=E5=8D=A1=E6=AD=BB=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cardv/SrcCode/System/SF_SysStrgMng.c | 3 +- .../cardv/SrcCode/System/SF_SysStrgMng.h | 37 ++++++++++--------- .../sf_app/code/source/storeMng/sf_storeMng.c | 17 ++++++++- .../sf_app/code/source/wifi/sf_wifi_svr.c | 2 +- 4 files changed, 37 insertions(+), 22 deletions(-) diff --git a/code/application/source/cardv/SrcCode/System/SF_SysStrgMng.c b/code/application/source/cardv/SrcCode/System/SF_SysStrgMng.c index 3e5b66c3e..f790f63cc 100755 --- a/code/application/source/cardv/SrcCode/System/SF_SysStrgMng.c +++ b/code/application/source/cardv/SrcCode/System/SF_SysStrgMng.c @@ -85,7 +85,7 @@ void SF_StrgInit(void) { sf_mmc_dev[i]->space_state = MMC_DEV_SPACE_STATE_ENOUGH; 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)); } @@ -365,6 +365,7 @@ static int sfStrgOnActionSendCurrentDev(SF_ST_MMC_DEV *pMMCDev) stMessageBuf.arg2 = pMMCDev->dev_type; stMessageBuf.arg3 = pMMCDev->moumted_state; stMessageBuf.cmdId = CMD_SD; + sf_strg_dev_register(pMMCDev->dev_type, pMMCDev->moumted_state); sf_com_message_send_to_app(&stMessageBuf); MLOGD("sf sys strg update current dev!\n"); return 0; diff --git a/code/application/source/cardv/SrcCode/System/SF_SysStrgMng.h b/code/application/source/cardv/SrcCode/System/SF_SysStrgMng.h index f254c6b40..06671823a 100755 --- a/code/application/source/cardv/SrcCode/System/SF_SysStrgMng.h +++ b/code/application/source/cardv/SrcCode/System/SF_SysStrgMng.h @@ -21,6 +21,7 @@ #define _SF_SYS_STRG_MNG_H_ #include "sf_type.h" #include "sf_param_common.h" +#include "sf_storeMng.h" #define MMC_DEV_MAX_NUM (2) @@ -35,26 +36,26 @@ #define USE_MMC_DEV_CHECK (1) -typedef enum -{ - MMC_DEV_SD = 0, - MMC_DEV_EMMC = 1, - MMC_DEV_NO = 2, -}MMC_DEV_TYPE; +// typedef enum +// { +// MMC_DEV_SD = 0, +// MMC_DEV_EMMC = 1, +// MMC_DEV_NO = 2, +// }MMC_DEV_TYPE; -typedef enum -{ - MMC_DEV_NODE_STATE_NO = 0, - MMC_DEV_NODE_STATE_EXIST = 1, - MMC_DEV_NODE_STATE_NO_EXIST = 2, -}MMC_DEV_NODE_STATE; +// typedef enum +// { +// MMC_DEV_NODE_STATE_NO = 0, +// MMC_DEV_NODE_STATE_EXIST = 1, +// MMC_DEV_NODE_STATE_NO_EXIST = 2, +// }MMC_DEV_NODE_STATE; -typedef enum -{ - MMC_DEV_MOUNT_STATE_NO = 0, - MMC_DEV_MOUNT_STATE_MOUNTED = 1, - MMC_DEV_MOUNT_STATE_UNMOUNTED = 2, -}MMC_DEV_MOUNT_STATE; +// typedef enum +// { +// MMC_DEV_MOUNT_STATE_NO = 0, +// MMC_DEV_MOUNT_STATE_MOUNTED = 1, +// MMC_DEV_MOUNT_STATE_UNMOUNTED = 2, +// }MMC_DEV_MOUNT_STATE; typedef enum { diff --git a/code/application/source/sf_app/code/source/storeMng/sf_storeMng.c b/code/application/source/sf_app/code/source/storeMng/sf_storeMng.c index 8def81ef8..981e48e05 100644 --- a/code/application/source/sf_app/code/source/storeMng/sf_storeMng.c +++ b/code/application/source/sf_app/code/source/storeMng/sf_storeMng.c @@ -54,8 +54,21 @@ void sf_strg_dev_uninit(void) void sf_strg_dev_register(SINT32 dev_id, SINT32 mounted) { - sf_strg_dev->dev_type = dev_id; - sf_strg_dev->moumted_state = mounted; + MLOGD("dev_id:%d mounted:%d\n",dev_id, 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) diff --git a/code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c b/code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c index 30564096b..3a15f9661 100755 --- a/code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c +++ b/code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c @@ -2106,7 +2106,7 @@ SINT32 sf_svr_packet_proc(SINT32 fd, UINT8 *pAppData, UINT16 dataLen) case WIFI_CONTROL_CAMERA_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)) { From 4b02d7d050dcc18d50935704be43e1ec344528cb Mon Sep 17 00:00:00 2001 From: payton Date: Fri, 19 Jan 2024 18:36:36 +0800 Subject: [PATCH 3/7] 1. killall qlog --- code/application/source/sf_app/code/source/app/sf_system.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/application/source/sf_app/code/source/app/sf_system.c b/code/application/source/sf_app/code/source/app/sf_system.c index 7060ae756..5f3fa1ef7 100755 --- a/code/application/source/sf_app/code/source/app/sf_system.c +++ b/code/application/source/sf_app/code/source/app/sf_system.c @@ -700,7 +700,7 @@ SINT32 app_system_poweroff(SF_POWEROFF_TYPE_E enType ) #if SF_QLOG_ENABLE if(puiPara->QLogSwitch) { - system("killall qlog"); + system("killall QLog"); } #endif //if((puiPara->DebugMode) || (puiPara->QLogSwitch)){ From 1bdd5222478c87e1ee06cf75607df06edadba05c Mon Sep 17 00:00:00 2001 From: payton Date: Fri, 19 Jan 2024 18:37:05 +0800 Subject: [PATCH 4/7] =?UTF-8?q?1.linux=E4=B8=8Blog=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../source/cardv/SrcCode/System/SysMain.c | 16 ++-- .../source/cardv/SrcCode/System/SysStrg_Exe.c | 75 ++++++++++++++++++- .../source/cardv/SrcCode/System/main.c | 2 + 3 files changed, 84 insertions(+), 9 deletions(-) diff --git a/code/application/source/cardv/SrcCode/System/SysMain.c b/code/application/source/cardv/SrcCode/System/SysMain.c index be96d70eb..edc6cd185 100644 --- a/code/application/source/cardv/SrcCode/System/SysMain.c +++ b/code/application/source/cardv/SrcCode/System/SysMain.c @@ -858,14 +858,14 @@ exit: stMessageBuf.cmdId = CMD_POWEROFF; sf_com_message_send_to_app(&stMessageBuf); #if (LOGFILE_FUNC==ENABLE) - UIMenuStoreInfo *puiPara = sf_ui_para_get(); - if (puiPara->DebugMode) - { - DBG_DUMP("LogFile_Close ...\n"); - LogFile_Close(); - system("rm -rf /mnt/sd/LOG/*dummy*");//Clear intermediate files. - system("sync"); - } + // UIMenuStoreInfo *puiPara = sf_ui_para_get(); + // if (puiPara->DebugMode) + // { + // DBG_DUMP("LogFile_Close ...\n"); + // LogFile_Close(); + // system("rm -rf /mnt/sd/LOG/*dummy*");//Clear intermediate files. + // system("sync"); + // } #endif #else sf_mcu_reg_set(SF_MCU_POWEROFF,paramArray[0]); diff --git a/code/application/source/cardv/SrcCode/System/SysStrg_Exe.c b/code/application/source/cardv/SrcCode/System/SysStrg_Exe.c index 89d2e2de7..b07c8deee 100644 --- a/code/application/source/cardv/SrcCode/System/SysStrg_Exe.c +++ b/code/application/source/cardv/SrcCode/System/SysStrg_Exe.c @@ -75,6 +75,7 @@ #include #include #include "sf_sd_common.h" +#include "sf_mcu.h" #endif #if (LOGFILE_FUNC==ENABLE) #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); #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) { @@ -399,6 +469,7 @@ void System_OnStrgInit_FS(void) #if (LOGFILE_FUNC==ENABLE) { + #if 0 LOGFILE_CFG cfg = {0}; #if 0 // only store system error log @@ -423,6 +494,8 @@ void System_OnStrgInit_FS(void) cfg.LogBuffSize2 = gLogFile_Buff2_Size; #endif LogFile_Config(&cfg); + #endif + sf_log_confgs(); } #endif @@ -1227,7 +1300,7 @@ INT32 System_OnStrgAttach(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray) } #endif -#if (LOGFILE_FUNC==ENABLE) +#if 0//(LOGFILE_FUNC==ENABLE) #if HUNTING_CAMERA_MCU == ENABLE UIMenuStoreInfo *puiPara = sf_ui_para_get(); diff --git a/code/application/source/cardv/SrcCode/System/main.c b/code/application/source/cardv/SrcCode/System/main.c index 0c7c274ce..15bc67ad9 100755 --- a/code/application/source/cardv/SrcCode/System/main.c +++ b/code/application/source/cardv/SrcCode/System/main.c @@ -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 void lvglTimer(void); +extern void sf_log_sava(void); /****************************************************** * static variables *******************************************************/ @@ -490,6 +491,7 @@ int NvtMain(void) #endif System_WaitForPowerOffStart(); // Wait for shutdown cmd + sf_log_sava(); nvt_user_uninit(); nvt_hdal_uninit(); From c24d93ddc0432b95b46afd4fa837dfae3fcf1d0b Mon Sep 17 00:00:00 2001 From: payton Date: Fri, 19 Jan 2024 18:37:25 +0800 Subject: [PATCH 5/7] =?UTF-8?q?1.rtos=E4=B8=8Blog=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../source/cardv/SrcCode/System/SysStrg_Exe.c | 6 +- .../source/cardv/SrcCode/System/rtos-main.c | 27 ++++++- .../source/cardv/SrcCode/System/sys_filesys.c | 71 ------------------- .../source/cardv/SrcCode/System/sys_filesys.h | 2 - .../UIApp/Background/UIBackgroundObj.c | 12 ++-- .../cardv/SrcCode/UIApp/MovieFast/MovieFast.c | 18 ++--- .../cardv/SrcCode/UIApp/PhotoFast/PhotoFast.c | 19 ++--- 7 files changed, 54 insertions(+), 101 deletions(-) diff --git a/rtos/code/application/source/cardv/SrcCode/System/SysStrg_Exe.c b/rtos/code/application/source/cardv/SrcCode/System/SysStrg_Exe.c index 500f1d61e..204bd4448 100644 --- a/rtos/code/application/source/cardv/SrcCode/System/SysStrg_Exe.c +++ b/rtos/code/application/source/cardv/SrcCode/System/SysStrg_Exe.c @@ -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 diff --git a/rtos/code/application/source/cardv/SrcCode/System/rtos-main.c b/rtos/code/application/source/cardv/SrcCode/System/rtos-main.c index 61e3591f0..cce0b6576 100644 --- a/rtos/code/application/source/cardv/SrcCode/System/rtos-main.c +++ b/rtos/code/application/source/cardv/SrcCode/System/rtos-main.c @@ -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) diff --git a/rtos/code/application/source/cardv/SrcCode/System/sys_filesys.c b/rtos/code/application/source/cardv/SrcCode/System/sys_filesys.c index ab0857fa7..a0e51276c 100755 --- a/rtos/code/application/source/cardv/SrcCode/System/sys_filesys.c +++ b/rtos/code/application/source/cardv/SrcCode/System/sys_filesys.c @@ -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 diff --git a/rtos/code/application/source/cardv/SrcCode/System/sys_filesys.h b/rtos/code/application/source/cardv/SrcCode/System/sys_filesys.h index acbddd5ea..86c92c99f 100644 --- a/rtos/code/application/source/cardv/SrcCode/System/sys_filesys.h +++ b/rtos/code/application/source/cardv/SrcCode/System/sys_filesys.h @@ -2,6 +2,4 @@ #define SYS_FILESYS_H void filesys_init(void); -void sf_log_open(void); -void sf_log_confg(void); #endif \ No newline at end of file diff --git a/rtos/code/application/source/cardv/SrcCode/UIApp/Background/UIBackgroundObj.c b/rtos/code/application/source/cardv/SrcCode/UIApp/Background/UIBackgroundObj.c index bd24b3159..5c4562da5 100644 --- a/rtos/code/application/source/cardv/SrcCode/UIApp/Background/UIBackgroundObj.c +++ b/rtos/code/application/source/cardv/SrcCode/UIApp/Background/UIBackgroundObj.c @@ -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(); } diff --git a/rtos/code/application/source/cardv/SrcCode/UIApp/MovieFast/MovieFast.c b/rtos/code/application/source/cardv/SrcCode/UIApp/MovieFast/MovieFast.c index d50d00ba9..a1bf0d6f7 100644 --- a/rtos/code/application/source/cardv/SrcCode/UIApp/MovieFast/MovieFast.c +++ b/rtos/code/application/source/cardv/SrcCode/UIApp/MovieFast/MovieFast.c @@ -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"); diff --git a/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.c b/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.c index 8da49f4d8..3fd535e06 100644 --- a/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.c +++ b/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.c @@ -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); From f9a12e505d78a5ddc26bb491a11dccb1918303cc Mon Sep 17 00:00:00 2001 From: payton Date: Fri, 19 Jan 2024 18:37:55 +0800 Subject: [PATCH 6/7] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=A4=9C=E8=A7=86?= =?UTF-8?q?=E4=BD=8E=E7=94=B5=E5=85=B3=E6=9C=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/DxHunting.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rtos/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/DxHunting.c b/rtos/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/DxHunting.c index d9617ea30..68b2cd3f8 100755 --- a/rtos/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/DxHunting.c +++ b/rtos/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/DxHunting.c @@ -26,6 +26,7 @@ #if HUNTING_CAMERA_MCU == ENABLE #include #include "sys_fastboot.h" +#include "sf_battery.h" #endif #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); IsNightLedOn = 1; + sf_set_night_led_flag(1); } else { //sf_pwm_set(IR_LED_1, 0, 100, 100, 0); pwm_pwm_disable(IRLED_PWMID); IsNightLedOn = 0; + sf_set_night_led_flag(0); } } From 570f5691dbc3b083a8dc5be2a3bc50b47c9fd1f4 Mon Sep 17 00:00:00 2001 From: payton Date: Fri, 19 Jan 2024 18:40:03 +0800 Subject: [PATCH 7/7] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E7=94=B5=E6=B1=A0?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E4=BC=9A=E5=BC=80=E5=A7=8B=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=BB=A1=E6=A0=BC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/application/source/cardv/SrcCode/System/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/application/source/cardv/SrcCode/System/main.c b/code/application/source/cardv/SrcCode/System/main.c index 15bc67ad9..293f7f5b0 100755 --- a/code/application/source/cardv/SrcCode/System/main.c +++ b/code/application/source/cardv/SrcCode/System/main.c @@ -471,9 +471,9 @@ int NvtMain(void) stMessageBuf.cmdId = CMD_MCU; sf_com_message_send_to_app(&stMessageBuf); - stMessageBuf.arg1 = SF_DEV_CMD_BAT; - stMessageBuf.cmdId = CMD_DEV; - sf_com_message_send_to_app(&stMessageBuf); + // stMessageBuf.arg1 = SF_DEV_CMD_BAT; + // stMessageBuf.cmdId = CMD_DEV; + // sf_com_message_send_to_app(&stMessageBuf); stMessageBuf.arg1 = SF_DEV_CMD_TEMPER; stMessageBuf.cmdId = CMD_DEV;