diff --git a/rtos/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S530.h b/rtos/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S530.h index 064bf8297..0abf20e18 100644 --- a/rtos/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S530.h +++ b/rtos/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S530.h @@ -474,7 +474,7 @@ #define USE_FILEDB DISABLE //DISABLE #define FILEDB_CARDV_ROOT "Novatek" // the max length should not exceeds 16 // DCF Config -#define USE_DCF DISABLE +#define USE_DCF ENABLE #define DCF_SUPPORT_FORMAT (DCF_FILE_TYPE_JPG|DCF_FILE_TYPE_AVI|DCF_FILE_TYPE_MOV|DCF_FILE_TYPE_MP4) //.............................................................................. // EXIF Config diff --git a/rtos/code/application/source/cardv/SrcCode/System/SysStrg_Exe.c b/rtos/code/application/source/cardv/SrcCode/System/SysStrg_Exe.c old mode 100755 new mode 100644 index fe6d6cddb..e0f4a0355 --- a/rtos/code/application/source/cardv/SrcCode/System/SysStrg_Exe.c +++ b/rtos/code/application/source/cardv/SrcCode/System/SysStrg_Exe.c @@ -50,7 +50,9 @@ #include "UICommon.h" #include "dma.h" #include "PStore.h" -//#include "DCF.h"h" +#if (USE_DCF == ENABLE) +#include "DCF.h" +#endif //#include "ExifVendor.h" #include "FileSysTsk.h" #include "SysCommon.h" @@ -600,7 +602,7 @@ INT32 System_OnStrgInsert(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray) } #else - dcfParm.WorkbuffAddr = dma_getCacheAddr(OS_GetMempoolAddr(POOL_ID_DCF_BUFFER)); + dcfParm.WorkbuffAddr = mempool_dcf;//dma_getCacheAddr(OS_GetMempoolAddr(POOL_ID_DCF_BUFFER)); #endif dcfParm.WorkbuffSize = POOL_SIZE_DCF_BUFFER; diff --git a/rtos/code/application/source/cardv/SrcCode/UIApp/Background/UIBackgroundObj.c b/rtos/code/application/source/cardv/SrcCode/UIApp/Background/UIBackgroundObj.c old mode 100755 new mode 100644 index 9604639bb..13f8cc943 --- a/rtos/code/application/source/cardv/SrcCode/UIApp/Background/UIBackgroundObj.c +++ b/rtos/code/application/source/cardv/SrcCode/UIApp/Background/UIBackgroundObj.c @@ -19,6 +19,10 @@ #include "UIApp/Network/EthCamAppSocket.h" #include "UIApp/Network/EthCamAppNetwork.h" #include "UIApp/Network/EthCamAppCmd.h" +#if (USE_DCF == ENABLE) +#include "DCF.h" +#endif +#include "Utility/SwTimer.h" //#NT#2016/05/30#Lincy Lin -end /////////////////////////////////////////////////////////////////////////////// diff --git a/rtos/code/application/source/cardv/SrcCode/UIApp/Play/UIAppMoviePlay_Exe.c b/rtos/code/application/source/cardv/SrcCode/UIApp/Play/UIAppMoviePlay_Exe.c old mode 100755 new mode 100644 index a90c64d01..6d40afc20 --- a/rtos/code/application/source/cardv/SrcCode/UIApp/Play/UIAppMoviePlay_Exe.c +++ b/rtos/code/application/source/cardv/SrcCode/UIApp/Play/UIAppMoviePlay_Exe.c @@ -15,6 +15,10 @@ #include #include "UIWnd/UIFlow.h" +#if (USE_DCF == ENABLE) +#include "DCF.h" +#endif + #if 0 #define MoviePlay_Open(x) SMediaPlay_Open((PSMEDIAPLAY_USEROBJ)x) #define MoviePlay_WaitReady(x) SMediaPlay_WaitReady(x) diff --git a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c old mode 100755 new mode 100644 index 15a9d0768..0d41b7829 --- a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c +++ b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c @@ -4,7 +4,9 @@ #include "UIFlowLVGL/UIFlowLVGL.h" #include "UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgAPI.h" #include - +#if (USE_DCF == ENABLE) +#include "DCF.h" +#endif extern BOOL FlowMovie_IsStorageErr2(lv_obj_t* parent,BOOL IsCheckFull); diff --git a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c old mode 100755 new mode 100644 index ca615da88..aa2bf9a6a --- a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c +++ b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c @@ -12,6 +12,9 @@ #include "UIApp/Photo/UIAppPhoto.h" #include "exif/Exif.h" #include +#if (USE_DCF == ENABLE) +#include "DCF.h" +#endif #define IDE_FD_MAX_NUM 8 diff --git a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoFuncs.c b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoFuncs.c old mode 100755 new mode 100644 index 55465d3aa..abc7a144d --- a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoFuncs.c +++ b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoFuncs.c @@ -39,7 +39,7 @@ void FlowPhoto_DoCapture(void) #if (USE_FILEDB == DISABLE) #if (USE_DCF==ENABLE) // update DCF Folder/File name - FlowDCF_UpdateName(); +// FlowDCF_UpdateName(); #endif #endif Ux_SendEvent(&CustomPhotoObjCtrl, NVTEVT_EXE_CAPTURE_START, 1, ON_CAPTURE_CONT); @@ -53,7 +53,7 @@ void FlowPhoto_DoCapture(void) #if (USE_FILEDB == DISABLE) // update DCF Folder/File name #if (USE_DCF==ENABLE) - FlowDCF_UpdateName(); +// FlowDCF_UpdateName(); #endif #endif Ux_SendEvent(&CustomPhotoObjCtrl, NVTEVT_EXE_CAPTURE_START, 1, ON_CAPTURE_SINGLE); diff --git a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c old mode 100755 new mode 100644 index 75d72042f..15f9ebcf2 --- a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c +++ b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c @@ -18,6 +18,10 @@ #include #endif +#if (USE_DCF == ENABLE) +#include "DCF.h" +#endif + /////////////////////////////////////////////////////////////////////////////// #define __MODULE__ UIInfo #define __DBGLVL__ 2 // 0=FATAL, 1=ERR, 2=WRN, 3=UNIT, 4=FUNC, 5=IND, 6=MSG, 7=VALUE, 8=USER @@ -1596,7 +1600,7 @@ void FlowDCF_UpdateName(void) UINT32 uiAddr, uiNextDCFID; CHAR filePath[DCF_FULL_FILE_PATH_LEN]; struct tm Curr_DateTime; - Curr_DateTime = HwClock_GetTime(TIME_ID_CURRENT); + Curr_DateTime = hwclock_get_time(TIME_ID_CURRENT); snprintf(FolderName, sizeof(FolderName), "%1d%02d%02d", Curr_DateTime.tm_year % 0x0A, Curr_DateTime.tm_mon,Curr_DateTime.tm_mday); snprintf(FileName, sizeof(FileName), "%02d%02d", Curr_DateTime.tm_hour, Curr_DateTime.tm_min); @@ -1612,7 +1616,7 @@ void FlowDCF_UpdateName(void) } DCF_SetNextID(uiNextDCFID, MIN_DCF_FILE_NUM); } else { - debug_msg("DCF Folder full\r\n"); + DBG_DUMP("DCF Folder full\r\n"); } }