From e19006a46720665ddbbb971868a7ada58fed9d78 Mon Sep 17 00:00:00 2001 From: payton Date: Fri, 29 Dec 2023 16:46:02 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6emmc?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=86=99=E5=85=A5=E6=96=87=E4=BB=B6=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rtos/code/application/source/cardv/SrcCode/System/sys_filesys.c | 2 +- .../source/cardv/SrcCode/UIApp/PhotoFast/PhotoFastSliceEncode.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 3589fa9fe..d58c67edb 100755 --- a/rtos/code/application/source/cardv/SrcCode/System/sys_filesys.c +++ b/rtos/code/application/source/cardv/SrcCode/System/sys_filesys.c @@ -89,7 +89,7 @@ static void card_insert_job2(void) int ret; FILE_TSK_INIT_PARAM Param = {0}; FS_HANDLE StrgDXH2; - UINT32 start_sector = 16 ; /* linux cmd fdisk can list partition info */ + UINT32 start_sector = 8192 ; /* linux cmd fdisk can list partition info */ UINT32 totoal_sectors = 0; StrgDXH2 = (FS_HANDLE)sdio2_getStorageObject(STRG_OBJ_FAT1); STORAGE_OBJ* pStrg = sdio2_getStorageObject(STRG_OBJ_FAT1); diff --git a/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFastSliceEncode.c b/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFastSliceEncode.c index af71e4420..436ddbb7c 100644 --- a/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFastSliceEncode.c +++ b/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFastSliceEncode.c @@ -2248,7 +2248,7 @@ INT32 PhotoFast_SliceEncode_CB2(void* user_data) if(param->cnt >= param->max_cnt) break; #if SF_NO_SD_SEND == ENABLE - if(PhotoFast_Wait_FileSys(1) != E_OK){ + if(PhotoFast_Wait_FileSys(FASTBOOT_WAIT_FILESYS_TIMEOUT_MS) != E_OK){ goto EXIT; } #endif From 51a1789e977bf4fc4f38b5e10686a5af8bbb1556 Mon Sep 17 00:00:00 2001 From: payton Date: Fri, 29 Dec 2023 16:46:17 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1.=E5=8F=91=E9=80=81=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rtos/code/driver/na51089/source/mcu/sf_mcu.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/rtos/code/driver/na51089/source/mcu/sf_mcu.c b/rtos/code/driver/na51089/source/mcu/sf_mcu.c index b0866f118..59998b393 100755 --- a/rtos/code/driver/na51089/source/mcu/sf_mcu.c +++ b/rtos/code/driver/na51089/source/mcu/sf_mcu.c @@ -2171,7 +2171,7 @@ void sf_file_thumb_cfg_sava(void) UINT8 fileIndex = 0; INT32 ret_fs = 0; FST_FILE_STATUS FileStat; - + char tmp[64] = {'\0'}; UIMenuStoreInfo *puiPara = sf_ui_para_get(); if (pThumbFileCfg != NULL) { @@ -2185,21 +2185,23 @@ void sf_file_thumb_cfg_sava(void) #if SF_IQ_TEST != ENABLE INT32 uiStatus = 0; UINT8 ucAttrib = 0; - uiStatus = FileSys_GetAttrib(PHOTO_THUMB_PATH, &ucAttrib); + snprintf(tmp, sizeof(tmp), "%c%s", 'A', PHOTO_THUMB_PATH); + + uiStatus = FileSys_GetAttrib(tmp, &ucAttrib); if (uiStatus == FST_STA_OK) { if(!(ucAttrib&FST_ATTRIB_HIDDEN)){ - FileSys_SetAttrib(PHOTO_THUMB_PATH, FST_ATTRIB_HIDDEN/* | FST_ATTRIB_SYSTEM*/, TRUE); + FileSys_SetAttrib(tmp, FST_ATTRIB_HIDDEN/* | FST_ATTRIB_SYSTEM*/, TRUE); } } #endif //printf("Add %s to send.List\n", sendfname); if(0 == puiPara->SendType){ - snprintf(sendListName, sizeof(sendListName), "%s", SF_THUMB_SEND_AUTO); + snprintf(sendListName, sizeof(sendListName), "A%s", SF_THUMB_SEND_AUTO); fs = FileSys_OpenFile(sendListName, FST_CREATE_ALWAYS | FST_OPEN_WRITE); }else { - snprintf(sendListName, sizeof(sendListName), "%s", SF_THUMB_SEND_LIST); + snprintf(sendListName, sizeof(sendListName), "A%s", SF_THUMB_SEND_LIST); fs = FileSys_OpenFile(sendListName, FST_OPEN_ALWAYS | FST_OPEN_WRITE); } From 92aa1909ba8853fd6a007ff8d1193217bd0f98a2 Mon Sep 17 00:00:00 2001 From: xiehongyan Date: Fri, 29 Dec 2023 17:13:19 +0800 Subject: [PATCH 3/3] =?UTF-8?q?BUG:10614=20=E8=87=AA=E5=8A=A8=E5=85=B3?= =?UTF-8?q?=E6=9C=BA=E5=80=92=E8=AE=A1=E6=97=B65=E7=A7=92=E5=90=8E?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E6=89=93=E6=96=AD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SrcCode/UIApp/Photo/UIStorageCheck.c | 23 +++++++++++++--- .../UIFlowPhoto/UIFlowPhotoEventCallback.c | 26 ++++++++++--------- .../UIFlowLVGL/UIFlowPhoto/UIFlowPhotoFuncs.c | 4 +++ .../UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c | 7 +++++ .../sifar/code/source/common/sf_common.c | 6 ++--- loader/Project/Model/tmp_awk1 | 0 6 files changed, 48 insertions(+), 18 deletions(-) create mode 100644 loader/Project/Model/tmp_awk1 diff --git a/code/application/source/cardv/SrcCode/UIApp/Photo/UIStorageCheck.c b/code/application/source/cardv/SrcCode/UIApp/Photo/UIStorageCheck.c index 97c8e4dfb..a460b030e 100755 --- a/code/application/source/cardv/SrcCode/UIApp/Photo/UIStorageCheck.c +++ b/code/application/source/cardv/SrcCode/UIApp/Photo/UIStorageCheck.c @@ -167,7 +167,7 @@ BOOL UIStorageCheck_DCIMWritable(void) } { - ret = TRUE; + //ret = TRUE; DBG_IND("check_DCIM_writable: uiStatus=%d\r\n", uiStatus); } return ret; @@ -216,7 +216,18 @@ static BOOL UIStrgCheckFull(UINT32 *pFreeCount) *pFreeCount = uiCountTmp; } if (uiCountTmp == 0) { - return TRUE; +#if (USE_DCF == ENABLE) + if (DCF_GetDBInfo(DCF_INFO_TOL_FILE_COUNT)) + { + return FALSE; + } + else + { + return TRUE; + } +#else + return TRUE; +#endif } else { return FALSE; } @@ -248,7 +259,13 @@ static BOOL UIStrgCheckErr(MMC_DEV_TYPE dev_id) DBG_ERR("UIStorageCheck: %d Card Error\r\n", System_GetState(SYS_STATE_FS)); return TRUE; } else { - return FALSE; + if (UIStorageCheck_DCIMWritable() == FALSE) + { + return TRUE; + } + else{ + return FALSE; + } } } diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c index ca82cb57e..1e0a9614f 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c @@ -726,18 +726,20 @@ static void update_camera_message(void) UINT32 cardStatus = System_GetState(SYS_STATE_CARD); if (cardStatus != CARD_REMOVED) { - //if (g_SysStrg_Chg) - //{ - //static int cnt = 0; - //if(cnt++<3){ - // lv_label_set_text(label_6_scr_uiflowphoto, "wait"); - //}else{ - //g_SysStrg_Chg = false; - //cnt = 0; - //} - //} else - if (UIStorageCheck(STORAGE_CHECK_ERROR, NULL) == TRUE) + if (g_SysStrg_Chg) { + static int cnt = 0; + if(cnt++<1){ + lv_label_set_text(label_6_scr_uiflowphoto, "Loarding..."); + }else{ + g_SysStrg_Chg = false; + cnt = 0; + } + } else if (UIStorageCheck(STORAGE_CHECK_ERROR, NULL) == TRUE) + { + if(UIStorageCheck_DCIMWritable() == FALSE){ + lv_label_set_text(label_6_scr_uiflowphoto, "SD CARD ERROR"); + } // lv_label_set_text(label_6_scr_uiflowphoto, "SD CARD ERROR"); } else if (UIStorageCheck(STORAGE_CHECK_FULL, NULL) == TRUE) { @@ -1860,7 +1862,7 @@ static void UIFlowPhoto_NVTMSG(lv_obj_t* obj, const LV_USER_EVENT_NVTMSG_DATA* m { g_SysStrg_Chg = false; UIStorageCheck(STORAGE_CHECK_FULL, &g_uiFreePicNum); - printf("[*x]===================================================================================\n"); + printf("[*x]====UI_StorageCheck: g_uiFreePicNum = 0x%ld\r\n", g_uiFreePicNum); DBG_DUMP("UI_StorageCheck: g_uiFreePicNum = 0x%ld\r\n", g_uiFreePicNum); lv_label_set_text(label_6_scr_uiflowphoto, Get_FreePicNumString(g_uiFreePicNum)); break; diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoFuncs.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoFuncs.c index a66781439..f030b989a 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoFuncs.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoFuncs.c @@ -23,6 +23,10 @@ extern void UIFlowPhoto_update_selftimer_cnt(UINT32 time); CHAR *Get_FreePicNumString(UINT32 uiValue) { + if (System_GetState(SYS_STATE_FS) != FS_INIT_OK) + { + return 0; + } unsigned long fileCount = 0; fileCount = DCF_GetDBInfo(DCF_INFO_TOL_FILE_COUNT); snprintf(g_cFreePicNumStr, sizeof(g_cFreePicNumStr), "%05ld/%05ld", fileCount, uiValue); diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c index ab157e9bc..0b7f6ca9b 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c @@ -42,8 +42,15 @@ static void task_msgbox_timer_cb(lv_task_t* task) UINT16 autoOffTime = sf_get_auto_off_time(); const lv_plugin_string_t* string = lv_plugin_get_string(msgID); + if (6000 == autoClose) + { + sf_set_pir_statu_flag(1); + } + if (0 == autoClose || autoOffTime <= 10) { + + //sf_set_pir_statu_flag(0); lv_task_del(msgbox_timer); msgbox_timer = NULL; if (msgbox) 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 8f4b4ce82..8623c3b60 100755 --- a/code/lib/source/sifar/code/source/common/sf_common.c +++ b/code/lib/source/sifar/code/source/common/sf_common.c @@ -289,8 +289,8 @@ void sf_mode_detect(void) } else if(pwroffcnt == 6) { - //LCD_BACKLIGHT_OFF; - sf_sys_status_led_set(SF_LED_SYS_STATE_POWER_OFF); + sf_sys_status_led_set(SF_LED_SYS_STATE_EXIT_GO_TO_PIR); + /* printf("[power off] %s(%d) AutoOfftime:%d\n", __FUNCTION__, __LINE__, AutoOfftime); #define DO_NOT_SHOW_POWER_OFF 0 if(AutoOfftime >= KeepAliveTime_s) @@ -305,7 +305,7 @@ void sf_mode_detect(void) Ux_PostEvent(NVTEVT_SYSTEM_SHUTDOWN, 2, APP_POWER_OFF_APO, DO_NOT_SHOW_POWER_OFF); //shutdown start #endif } - sf_set_power_off_flag(1); + sf_set_power_off_flag(1);*/ } } else diff --git a/loader/Project/Model/tmp_awk1 b/loader/Project/Model/tmp_awk1 new file mode 100644 index 000000000..e69de29bb