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

1.rtos下dcf修改

Browse Source
This commit is contained in:
payton 2023-07-05 17:08:25 +08:00
parent 5b1c048a3d
commit 9beb914ec9
8 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtos/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S530.h
View File

@ -474,7 +474,7 @@
#define USE_FILEDB DISABLE //DISABLE #define USE_FILEDB DISABLE //DISABLE
#define FILEDB_CARDV_ROOT "Novatek" // the max length should not exceeds 16 #define FILEDB_CARDV_ROOT "Novatek" // the max length should not exceeds 16
// DCF Config // 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) #define DCF_SUPPORT_FORMAT (DCF_FILE_TYPE_JPG|DCF_FILE_TYPE_AVI|DCF_FILE_TYPE_MOV|DCF_FILE_TYPE_MP4)
//.............................................................................. //..............................................................................
// EXIF Config // EXIF Config

6
rtos/code/application/source/cardv/SrcCode/System/SysStrg_Exe.c Executable file → Normal file
View File

@ -50,7 +50,9 @@
#include "UICommon.h" #include "UICommon.h"
#include "dma.h" #include "dma.h"
#include "PStore.h" #include "PStore.h"
//#include "DCF.h"h" #if (USE_DCF == ENABLE)
#include "DCF.h"
#endif
//#include "ExifVendor.h" //#include "ExifVendor.h"
#include "FileSysTsk.h" #include "FileSysTsk.h"
#include "SysCommon.h" #include "SysCommon.h"
@ -600,7 +602,7 @@ INT32 System_OnStrgInsert(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray)
} }
#else #else
dcfParm.WorkbuffAddr = dma_getCacheAddr(OS_GetMempoolAddr(POOL_ID_DCF_BUFFER)); dcfParm.WorkbuffAddr = mempool_dcf;//dma_getCacheAddr(OS_GetMempoolAddr(POOL_ID_DCF_BUFFER));
#endif #endif
dcfParm.WorkbuffSize = POOL_SIZE_DCF_BUFFER; dcfParm.WorkbuffSize = POOL_SIZE_DCF_BUFFER;

4
rtos/code/application/source/cardv/SrcCode/UIApp/Background/UIBackgroundObj.c Executable file → Normal file
View File

@ -19,6 +19,10 @@
#include "UIApp/Network/EthCamAppSocket.h" #include "UIApp/Network/EthCamAppSocket.h"
#include "UIApp/Network/EthCamAppNetwork.h" #include "UIApp/Network/EthCamAppNetwork.h"
#include "UIApp/Network/EthCamAppCmd.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 //#NT#2016/05/30#Lincy Lin -end
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////

4
rtos/code/application/source/cardv/SrcCode/UIApp/Play/UIAppMoviePlay_Exe.c Executable file → Normal file
View File

@ -15,6 +15,10 @@
#include <kwrap/debug.h> #include <kwrap/debug.h>
#include "UIWnd/UIFlow.h" #include "UIWnd/UIFlow.h"
#if (USE_DCF == ENABLE)
#include "DCF.h"
#endif
#if 0 #if 0
#define MoviePlay_Open(x) SMediaPlay_Open((PSMEDIAPLAY_USEROBJ)x) #define MoviePlay_Open(x) SMediaPlay_Open((PSMEDIAPLAY_USEROBJ)x)
#define MoviePlay_WaitReady(x) SMediaPlay_WaitReady(x) #define MoviePlay_WaitReady(x) SMediaPlay_WaitReady(x)

4
rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c Executable file → Normal file
View File

@ -4,7 +4,9 @@
#include "UIFlowLVGL/UIFlowLVGL.h" #include "UIFlowLVGL/UIFlowLVGL.h"
#include "UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgAPI.h" #include "UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgAPI.h"
#include <kwrap/debug.h> #include <kwrap/debug.h>
#if (USE_DCF == ENABLE)
#include "DCF.h"
#endif
extern BOOL FlowMovie_IsStorageErr2(lv_obj_t* parent,BOOL IsCheckFull); extern BOOL FlowMovie_IsStorageErr2(lv_obj_t* parent,BOOL IsCheckFull);

3
rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c Executable file → Normal file
View File

@ -12,6 +12,9 @@
#include "UIApp/Photo/UIAppPhoto.h" #include "UIApp/Photo/UIAppPhoto.h"
#include "exif/Exif.h" #include "exif/Exif.h"
#include <kwrap/util.h> #include <kwrap/util.h>
#if (USE_DCF == ENABLE)
#include "DCF.h"
#endif
#define IDE_FD_MAX_NUM 8 #define IDE_FD_MAX_NUM 8

4
rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoFuncs.c Executable file → Normal file
View File

@ -39,7 +39,7 @@ void FlowPhoto_DoCapture(void)
#if (USE_FILEDB == DISABLE) #if (USE_FILEDB == DISABLE)
#if (USE_DCF==ENABLE) #if (USE_DCF==ENABLE)
// update DCF Folder/File name // update DCF Folder/File name
FlowDCF_UpdateName(); // FlowDCF_UpdateName();
#endif #endif
#endif #endif
Ux_SendEvent(&CustomPhotoObjCtrl, NVTEVT_EXE_CAPTURE_START, 1, ON_CAPTURE_CONT); Ux_SendEvent(&CustomPhotoObjCtrl, NVTEVT_EXE_CAPTURE_START, 1, ON_CAPTURE_CONT);
@ -53,7 +53,7 @@ void FlowPhoto_DoCapture(void)
#if (USE_FILEDB == DISABLE) #if (USE_FILEDB == DISABLE)
// update DCF Folder/File name // update DCF Folder/File name
#if (USE_DCF==ENABLE) #if (USE_DCF==ENABLE)
FlowDCF_UpdateName(); // FlowDCF_UpdateName();
#endif #endif
#endif #endif
Ux_SendEvent(&CustomPhotoObjCtrl, NVTEVT_EXE_CAPTURE_START, 1, ON_CAPTURE_SINGLE); Ux_SendEvent(&CustomPhotoObjCtrl, NVTEVT_EXE_CAPTURE_START, 1, ON_CAPTURE_SINGLE);

8
rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c Executable file → Normal file
View File

@ -18,6 +18,10 @@
#include <sf_mcu.h> #include <sf_mcu.h>
#endif #endif
#if (USE_DCF == ENABLE)
#include "DCF.h"
#endif
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
#define __MODULE__ UIInfo #define __MODULE__ UIInfo
#define __DBGLVL__ 2 // 0=FATAL, 1=ERR, 2=WRN, 3=UNIT, 4=FUNC, 5=IND, 6=MSG, 7=VALUE, 8=USER #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; UINT32 uiAddr, uiNextDCFID;
CHAR filePath[DCF_FULL_FILE_PATH_LEN]; CHAR filePath[DCF_FULL_FILE_PATH_LEN];
struct tm Curr_DateTime; 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(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); 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); DCF_SetNextID(uiNextDCFID, MIN_DCF_FILE_NUM);
} else { } else {
debug_msg("DCF Folder full\r\n"); DBG_DUMP("DCF Folder full\r\n");
} }
} }