From 9b6fa552e6e530a923424bd81830fa6ec8a34267 Mon Sep 17 00:00:00 2001 From: "sober.song" Date: Sat, 6 Jan 2024 18:36:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dlinux=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E9=A6=96=E6=AC=A1=E5=91=BD=E5=90=8D=E7=9B=98?= =?UTF-8?q?=E7=AC=A6=E9=94=99=E4=B9=B1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../source/cardv/SrcCode/System/SF_SysStrgMng.c | 10 ++++++++++ .../source/cardv/SrcCode/System/SysStrg_Exe.c | 4 ++-- .../source/cardv/SrcCode/UIApp/Movie/UIAppMovie_Exe.c | 9 ++++++--- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/code/application/source/cardv/SrcCode/System/SF_SysStrgMng.c b/code/application/source/cardv/SrcCode/System/SF_SysStrgMng.c index 7a363e3de..d8049ba2c 100755 --- a/code/application/source/cardv/SrcCode/System/SF_SysStrgMng.c +++ b/code/application/source/cardv/SrcCode/System/SF_SysStrgMng.c @@ -19,6 +19,10 @@ #include #include #include "sf_mcu.h" +#if (USE_DCF == ENABLE) +#include "DCF.h" +#endif + #if HUNTING_CAMERA_MCU == ENABLE #include @@ -336,6 +340,12 @@ SF_ST_MMC_DEV *SF_StrgCheckWorkableDev(void) sf_mmc_dev[workable_dev]->dev_type = workable_dev; //MLOGD("Strg Check, workable_dev = %d\n", workable_dev); SF_SetMMCDev(sf_mmc_dev[workable_dev]); + + if(workable_dev == MMC_DEV_SD) + DCF_SetFileFreeChars(DCF_FILE_TYPE_ANYFORMAT, "SYEX"); + else if(workable_dev == MMC_DEV_EMMC) + DCF_SetFileFreeChars(DCF_FILE_TYPE_ANYFORMAT, "SYBX"); + return sf_mmc_dev[workable_dev]; } } diff --git a/code/application/source/cardv/SrcCode/System/SysStrg_Exe.c b/code/application/source/cardv/SrcCode/System/SysStrg_Exe.c index 05c0620e9..ee4d0a1fd 100644 --- a/code/application/source/cardv/SrcCode/System/SysStrg_Exe.c +++ b/code/application/source/cardv/SrcCode/System/SysStrg_Exe.c @@ -983,11 +983,11 @@ INT32 System_OnStrgInsert(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray) if(strg_id == STRG_ID_SD){ DBG_WRN("sd act\n"); System_Set_Storage_Act_Drive(g_strg_mapping_table[strg_id].drive); - DCF_SetFileFreeChars(DCF_FILE_TYPE_ANYFORMAT, "SYEX"); + //DCF_SetFileFreeChars(DCF_FILE_TYPE_ANYFORMAT, "SYEX"); } else if(strg_id == STRG_ID_EMMC){ DBG_WRN("emmc act\n"); - DCF_SetFileFreeChars(DCF_FILE_TYPE_ANYFORMAT, "SYBX"); + //DCF_SetFileFreeChars(DCF_FILE_TYPE_ANYFORMAT, "SYBX"); System_Set_Storage_Act_Drive(g_strg_mapping_table[strg_id].drive); } #if USE_MMC_DEV_CHECK diff --git a/code/application/source/cardv/SrcCode/UIApp/Movie/UIAppMovie_Exe.c b/code/application/source/cardv/SrcCode/UIApp/Movie/UIAppMovie_Exe.c index 8a61e7e67..d42ea7127 100755 --- a/code/application/source/cardv/SrcCode/UIApp/Movie/UIAppMovie_Exe.c +++ b/code/application/source/cardv/SrcCode/UIApp/Movie/UIAppMovie_Exe.c @@ -1227,6 +1227,8 @@ static void MovieExe_FileNamingCB(MOVIE_CFG_REC_ID id, char *pFileName) UINT32 dcf_handle = (UINT32)System_Get_DCF_Handle(); /* 0:emmc 1:sd */ char font = System_Get_DCF_Disk_Drive(dcf_handle) == 'B' ? 'B' : 'E'; char *dcf_file = System_Get_DCF_Disk_Drive(dcf_handle) == 'B' ? "SYBX" : "SYEX"; + DBG_DUMP("movie naming: %c %s\n", System_Get_DCF_Disk_Drive(dcf_handle), dcf_file); + DCF_SetFileFreeChars(DCF_FILE_TYPE_ANYFORMAT, dcf_file); #if USE_FILEDB static struct tm CurDateTime = {0}; g_FileSerialNum++; @@ -1264,8 +1266,7 @@ static void MovieExe_FileNamingCB(MOVIE_CFG_REC_ID id, char *pFileName) DBG_ERR("Exceed max dcf file!\r\n"); pFileName[0] = '\0'; } else { - - DCF_SetFileFreeChars(DCF_FILE_TYPE_ANYFORMAT, dcf_file); + DCF_GetNextIDEx(dcf_handle, &nextFolderID,&nextFileID); DCF_MakeObjPathEx(dcf_handle, nextFolderID, nextFileID, DCF_FILE_TYPE_MP4, pFileName); DCF_AddDBfileEx(dcf_handle, pFileName); @@ -1301,6 +1302,8 @@ static void MovieExe_RawEncodeFileNamingCB(MOVIE_CFG_REC_ID id, char *pFileName) { UINT32 dcf_handle = (UINT32)System_Get_DCF_Handle(); /* 0:emmc 1:sd */ char *dcf_file = System_Get_DCF_Disk_Drive(dcf_handle) == 'B' ? "SYBX" : "SYEX"; + DBG_DUMP("photo naming: %c %s\n", System_Get_DCF_Disk_Drive(dcf_handle), dcf_file); + DCF_SetFileFreeChars(DCF_FILE_TYPE_ANYFORMAT, dcf_file); #if USE_FILEDB static struct tm CurDateTime = {0}; @@ -1339,7 +1342,7 @@ static void MovieExe_RawEncodeFileNamingCB(MOVIE_CFG_REC_ID id, char *pFileName) pFileName[0] = '\0'; } else { DBG_DUMP("JPG %s added to DCF Path%lu\r\n", pFileName, dcf_handle); - DCF_SetFileFreeChars(DCF_FILE_TYPE_ANYFORMAT, dcf_file); + DCF_GetNextIDEx(dcf_handle, &nextFolderID,&nextFileID); DCF_MakeObjPathEx(dcf_handle, nextFolderID, nextFileID, DCF_FILE_TYPE_JPG, pFileName); }