From 3e7800dd74e332a4251b51a6c83c9d8336dfe30d Mon Sep 17 00:00:00 2001 From: payton Date: Tue, 9 Jan 2024 16:29:52 +0800 Subject: [PATCH] =?UTF-8?q?1..=E5=8D=A1=E7=9B=B8=E5=85=B3=E7=9A=84?= =?UTF-8?q?=E5=AE=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../source/cardv/SrcCode/PrjCfg_HUNTING_S550.h | 4 ++++ .../source/cardv/SrcCode/System/SF_SysStrgMng.c | 10 +++++----- .../source/cardv/SrcCode/System/SysStrg_Exe.c | 4 ++-- .../source/cardv/SrcCode/UIApp/Movie/UIAppMovie_Exe.c | 6 +++--- .../source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c | 6 +++--- .../source/sf_app/code/source/4gMng/sf_ftp.c | 6 +++--- .../source/sf_app/code/source/fileMng/sf_fileMng.c | 4 ++-- .../source/sf_app/code/source/storeMng/sf_storeMng.c | 4 ++-- .../source/sf_app/code/source/wifi/sf_wifi_svr.c | 4 ++-- code/lib/source/sifar/code/source/common/sf_common.c | 2 +- 10 files changed, 27 insertions(+), 23 deletions(-) diff --git a/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h b/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h index 87744d544..6fea488fb 100755 --- a/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h +++ b/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h @@ -928,6 +928,10 @@ #define HW_S530 DISABLE #define DCF_DIR_NAME "MEDIA" /* 100MEDIA */ #define DCF_FILE_NAME "SYGW" /* SYFW0001.JPG */ +#define SF_EMMC_DCF_FILE_NAME "SYBX" /* SYBX0001.JPG */ +#define SF_SD_DCF_FILE_NAME "SYEX" /* SYEX0001.JPG */ +#define SF_EMMC_DCF_HANDLE 'B' +#define SF_SD_DCF_HANDLE 'E' #define PHOTO_THUMB_PATH ":\\THUMB\\" #define MOVIE_THUMB_PATH ":\\THUMB\\" diff --git a/code/application/source/cardv/SrcCode/System/SF_SysStrgMng.c b/code/application/source/cardv/SrcCode/System/SF_SysStrgMng.c index d8049ba2c..ed6092b60 100755 --- a/code/application/source/cardv/SrcCode/System/SF_SysStrgMng.c +++ b/code/application/source/cardv/SrcCode/System/SF_SysStrgMng.c @@ -19,12 +19,12 @@ #include #include #include "sf_mcu.h" -#if (USE_DCF == ENABLE) -#include "DCF.h" +#if (USE_DCF == ENABLE) +#include "DCF.h" #endif -#if HUNTING_CAMERA_MCU == ENABLE +#if HUNTING_CAMERA_MCU == ENABLE #include #endif @@ -342,9 +342,9 @@ SF_ST_MMC_DEV *SF_StrgCheckWorkableDev(void) SF_SetMMCDev(sf_mmc_dev[workable_dev]); if(workable_dev == MMC_DEV_SD) - DCF_SetFileFreeChars(DCF_FILE_TYPE_ANYFORMAT, "SYEX"); + DCF_SetFileFreeChars(DCF_FILE_TYPE_ANYFORMAT, SF_SD_DCF_FILE_NAME); else if(workable_dev == MMC_DEV_EMMC) - DCF_SetFileFreeChars(DCF_FILE_TYPE_ANYFORMAT, "SYBX"); + DCF_SetFileFreeChars(DCF_FILE_TYPE_ANYFORMAT, SF_EMMC_DCF_FILE_NAME); 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 01b197a99..936ceff4c 100644 --- a/code/application/source/cardv/SrcCode/System/SysStrg_Exe.c +++ b/code/application/source/cardv/SrcCode/System/SysStrg_Exe.c @@ -989,11 +989,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, SF_SD_DCF_FILE_NAME); } 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, SF_EMMC_DCF_FILE_NAME); 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 d42ea7127..a60993ef5 100755 --- a/code/application/source/cardv/SrcCode/UIApp/Movie/UIAppMovie_Exe.c +++ b/code/application/source/cardv/SrcCode/UIApp/Movie/UIAppMovie_Exe.c @@ -1225,8 +1225,8 @@ BOOL MovieExe_CheckSNFull(void) 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"; + char font = System_Get_DCF_Disk_Drive(dcf_handle) == SF_EMMC_DCF_HANDLE ? SF_EMMC_DCF_HANDLE : SF_SD_DCF_HANDLE; + char *dcf_file = System_Get_DCF_Disk_Drive(dcf_handle) == SF_EMMC_DCF_HANDLE ? SF_EMMC_DCF_FILE_NAME : SF_SD_DCF_FILE_NAME; 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 @@ -1301,7 +1301,7 @@ static void MovieExe_FileNamingCB(MOVIE_CFG_REC_ID id, char *pFileName) 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"; + char *dcf_file = System_Get_DCF_Disk_Drive(dcf_handle) == SF_EMMC_DCF_HANDLE ? SF_EMMC_DCF_FILE_NAME : SF_SD_DCF_FILE_NAME; 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 diff --git a/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c b/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c index 4d9a10e82..743bf6458 100755 --- a/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c +++ b/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c @@ -6884,12 +6884,12 @@ INT32 PhotoExe_Preview_SliceEncode_CB3(void* user_data) char* file_path = ImageApp_Photo_GetLastWriteFilePath(); char tmp[256] = {'\0'}; UINT32 length = strlen(file_path); - char font = System_Get_DCF_Disk_Drive(dcf_handle) == 'B' ? 'B' : 'E'; + char font = System_Get_DCF_Disk_Drive(dcf_handle) == SF_EMMC_DCF_HANDLE ? SF_EMMC_DCF_HANDLE : SF_SD_DCF_HANDLE; #if HUNTING_CAMERA_MCU == ENABLE char folder[4], number[5]; - strncpy(folder, file_path + length - 21, 3); - folder[3] = '\0'; + strncpy(folder, file_path + length - 22, 2); + folder[2] = '\0'; strncpy(number, file_path + length - 8, 4); number[4] = '\0'; diff --git a/code/application/source/sf_app/code/source/4gMng/sf_ftp.c b/code/application/source/sf_app/code/source/4gMng/sf_ftp.c index 57a1c3340..85010df6d 100755 --- a/code/application/source/sf_app/code/source/4gMng/sf_ftp.c +++ b/code/application/source/sf_app/code/source/4gMng/sf_ftp.c @@ -1806,7 +1806,7 @@ SINT32 sf_hd_ftp_send(void) return SF_FAILURE; } - char font = sf_get_strg_dev() == MMC_DEV_EMMC ? 'B' : 'E'; + char font = sf_get_strg_dev() == MMC_DEV_EMMC ? SF_EMMC_DCF_HANDLE : SF_SD_DCF_HANDLE; sf_set_send_hd(0); sf_custom_str_get(CamNameStr); @@ -1968,7 +1968,7 @@ UINT32 sf_video_find_file(UINT16 dirKey, UINT16 fileKey, UINT8 *destFname) //UINT8 srcFname[50] = {0}; char *strg_path = sf_get_root_path(); - char *dcf_file = sf_get_strg_dev() == MMC_DEV_EMMC ? "SYBX" : "SYEX"; + char *dcf_file = sf_get_strg_dev() == MMC_DEV_EMMC ? SF_EMMC_DCF_FILE_NAME : SF_SD_DCF_FILE_NAME; if(strg_path == NULL) { free(strg_path); @@ -2040,7 +2040,7 @@ SINT32 sf_video_ftp_send(void) SINT64 sendEndTime = 0; UINT32 size = 0; - char font = sf_get_strg_dev() == MMC_DEV_EMMC ? 'B' : 'E'; + char font = sf_get_strg_dev() == MMC_DEV_EMMC ? SF_EMMC_DCF_HANDLE : SF_SD_DCF_HANDLE; sf_set_send_video(0); sf_custom_str_get(CamNameStr); diff --git a/code/application/source/sf_app/code/source/fileMng/sf_fileMng.c b/code/application/source/sf_app/code/source/fileMng/sf_fileMng.c index bdb719ad4..48c875479 100755 --- a/code/application/source/sf_app/code/source/fileMng/sf_fileMng.c +++ b/code/application/source/sf_app/code/source/fileMng/sf_fileMng.c @@ -312,7 +312,7 @@ SINT32 sf_file_subscribe_check(SF_FILE_ATTR_S *pstfileAttr, SF_SUBSCRIBE_ATTR_S memset(pstfileAttr->txtfileName, '\0', sizeof(pstfileAttr->txtfileName)); memset(pstfileAttr->txtfilePath, '\0', sizeof(pstfileAttr->txtfilePath)); - char *dcf_file = sf_get_strg_dev() == MMC_DEV_EMMC ? "SYBX" : "SYEX"; + char *dcf_file = sf_get_strg_dev() == MMC_DEV_EMMC ? SF_EMMC_DCF_FILE_NAME : SF_SD_DCF_FILE_NAME; char *strg_path = sf_get_root_path(); if(strg_path == NULL) @@ -556,7 +556,7 @@ SINT32 sf_file_subscribe_check(SF_FILE_ATTR_S *pstfileAttr, SF_SEND_FILE_ATTR_S* free(strg_path); return SF_FAILURE; } - char *dcf_file = sf_get_strg_dev() == MMC_DEV_EMMC ? "SYBX" : "SYEX"; + char *dcf_file = sf_get_strg_dev() == MMC_DEV_EMMC ? SF_EMMC_DCF_FILE_NAME : SF_SD_DCF_FILE_NAME; switch(pSendFileAttr->enFileTye) { 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 3260e94ea..815834c38 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 @@ -882,8 +882,8 @@ int sf_app_sd_loop(void) free(strg_path); return SF_FAILURE; } - char font = sf_get_strg_dev() == MMC_DEV_EMMC ? 'B' : 'E'; - char *dcf_file = sf_get_strg_dev() == MMC_DEV_EMMC ? "SYBX" : "SYEX"; + char font = sf_get_strg_dev() == MMC_DEV_EMMC ? SF_EMMC_DCF_HANDLE : SF_SD_DCF_HANDLE; + char *dcf_file = sf_get_strg_dev() == MMC_DEV_EMMC ? SF_EMMC_DCF_FILE_NAME : SF_SD_DCF_FILE_NAME; while((nloop) && (dircount < 5)) { 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 f6aafad7c..05ac61b75 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 @@ -432,7 +432,7 @@ S8 *appThumbKeyToName(thumbSize_t imgSize, thumbType_t fileType, UINT16 dirKey, } 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 font = System_Get_DCF_Disk_Drive(dcf_handle) == SF_EMMC_DCF_HANDLE ? SF_EMMC_DCF_HANDLE : SF_SD_DCF_HANDLE; if(imgSize == THUMB_320x240) { @@ -1145,7 +1145,7 @@ SINT32 sf_svr_packet_proc(SINT32 fd, UINT8 *pAppData, UINT16 dataLen) } 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"; + char *dcf_file = System_Get_DCF_Disk_Drive(dcf_handle) == SF_EMMC_DCF_HANDLE ? SF_EMMC_DCF_FILE_NAME : SF_SD_DCF_FILE_NAME; //printf("[sf_svr_packet_proc]dataLen: %d\n",dataLen); diff --git a/code/lib/source/sifar/code/source/common/sf_common.c b/code/lib/source/sifar/code/source/common/sf_common.c index 1ac0b1e18..e472b679f 100755 --- a/code/lib/source/sifar/code/source/common/sf_common.c +++ b/code/lib/source/sifar/code/source/common/sf_common.c @@ -2917,7 +2917,7 @@ void* sf_cardv_hd_cap_thread(void *arg) UINT8 PowerOnMode = sf_cardv_convert_power_on_mode(); MLOGD(" HD start PowerOnMode:%d\n", PowerOnMode); - char font = sf_get_strg_dev() == MMC_DEV_EMMC ? 'B' : 'E'; + char font = sf_get_strg_dev() == MMC_DEV_EMMC ? SF_EMMC_DCF_HANDLE : SF_SD_DCF_HANDLE; char *font_str = sf_get_strg_dev() == MMC_DEV_EMMC ? "BX" : "EX"; if((PWR_ON_SMS == PowerOnMode) || (PWR_ON_TIME_SYNC == PowerOnMode)) {