Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc

build_all.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 #用于gitlab-ci.yml编译使用
 
-make app_clean
+#make app_clean
 
 echo "Start compile."
 export ROOT_PATH=$PWD
@@ -9,8 +9,8 @@ export ROOT_PATH=$PWD
 cd rtos
 source build/envsetup.sh
 lunch rtos cfg_565_HUNTING_EVB_LINUX_4G_S550 gcc-6.5-newlib-2.4-2019.11-arm-ca9-eabihf
-make clean
+#make clean
-make all  > /dev/null
+bear make all  > /dev/null
 cp output/application.bin ../
 cp output/rtos-main.bin ../
 
@@ -18,8 +18,8 @@ cp output/rtos-main.bin ../
 cd $ROOT_PATH
 source build/envsetup.sh
 lunch Linux cfg_565_HUNTING_EVB_LINUX_4G_S550 arm-ca9-linux-uclibcgnueabihf-8.4.01
-make clean
+#make clean
-make all  > /dev/null
+bear make all  > /dev/null
 
 cd $ROOT_PATH
 cd loader/MakeCommon

code/application/source/cardv/SrcCode/Mode/UIModePhoto.c

@@ -46,6 +46,9 @@ void ModePhoto_Open(void)
 		else
 #endif
 		{
+			printf("[%s]open.........................\n", __FUNCTION__);
+			//lv_obj_t* parent = lv_scr_act();
+			//lv_plugin_scr_close(parent, NULL);
             #if defined(_UI_STYLE_LVGL_)
 			lv_plugin_scr_open(UIFlowPhoto, NULL);
             #else

code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h

@@ -34,7 +34,7 @@
 
 //..............................................................................
 // FW version and name
-#define FW_UPDATE_NAME                  ":\\FW98565A.bin"
+#define FW_UPDATE_NAME                  "A:\\FW98565A.bin"
 #define FW_VERSION_RELEASE              DISABLE //DISABLE
 #define FW_VERSION_NUM                  "REGULAR_0402_001"
 

code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmEventCallback.c

@@ -619,6 +619,7 @@ void message_box_confirm_msg_event_callback(lv_obj_t* obj, lv_event_t event)
 	/* this makes message box closing animation can be completed before closing screen */
 	case LV_EVENT_DELETE:
 	{
+		printf("[*x][%s]LV_EVENT_DELETE\n", __FUNCTION__);
 		/* reset pointer of msgbox */
 		msgbox = NULL;
 		if (Confirm_label)
@@ -636,6 +637,7 @@ void message_box_confirm_msg_event_callback(lv_obj_t* obj, lv_event_t event)
 	// case LV_EVENT_KEY:
 	case LV_USER_EVENT_KEY_RELEASE:
 	{
+		printf("[*x][%s]LV_USER_EVENT_KEY_RELEASE\n", __FUNCTION__);
 		uint32_t* key = (uint32_t*)lv_event_get_data();
 
 		/* handle key event */
@@ -655,8 +657,10 @@ void message_box_confirm_msg_event_callback(lv_obj_t* obj, lv_event_t event)
 
 	/* triggered by button release */
 	case LV_EVENT_VALUE_CHANGED:
+		printf("[*x][%s]LV_EVENT_VALUE_CHANGED\n", __FUNCTION__);
 	case LV_EVENT_CLICKED:
 	{
+		printf("[*x][%s]LV_EVENT_CLICKED\n", __FUNCTION__);
 		UIFlowMenuCommonConfirm_MessageBox_ValueChanged(obj, (uint32_t*)lv_event_get_data());
 		break;
 	}

code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c

@@ -90,15 +90,16 @@ static int is_camera_fw_upgrade(void)
 {
 	FST_FILE hFile = NULL;
 		// return UPGRADABLE;
-	UINT32 dcf_handle = (UINT32)System_Get_DCF_Handle(); /* 0:emmc 1:sd */
+	//UINT32 dcf_handle = (UINT32)System_Get_DCF_Handle(); /* 0:emmc 1:sd */
-	char font = System_Get_DCF_Disk_Drive(dcf_handle) == 'B' ? 'B' : 'A';
+	//char font = System_Get_DCF_Disk_Drive(dcf_handle) == 'B' ? 'B' : 'A';
-	char fw_file[64] = {'\0'};
+	//char fw_file[64] = {'\0'};
-	sprintf((char *)fw_file, "%c%s", font, FW_UPDATE_NAME);
+	//sprintf((char *)fw_file, "%c%s", font, FW_UPDATE_NAME);
-	hFile =  FileSys_OpenFile(fw_file, FST_OPEN_READ);
+	hFile =  FileSys_OpenFile(FW_UPDATE_NAME, FST_OPEN_READ);
+	//hFile =  FileSys_OpenFile(fw_file, FST_OPEN_READ);
 	//if (gBattery < 40 || hFile == NULL)
 	if (hFile == NULL)
 	{
-
+		printf("[%s]sd card no update file\n", __FUNCTION__);
 		return NOT_UPGRADABLE;
 	}
 	else

code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c

@@ -1228,7 +1228,7 @@ static void UIFlowMenuCommonOption_ScrClose(lv_obj_t* obj)
 	DBG_DUMP("%s\r\n", __func__);
 	message_item_close();
 	UIMenuStoreInfo *puiPara = sf_ui_para_get();
-	printf("camera mode = %d\n", puiPara->CamMode);
+	printf("[%s]camera mode = %d\n", __FUNCTION__, puiPara->CamMode);
 	UINT16 itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED;//√
 	lv_obj_set_pos(image_option1_scr_uiflowmenucommonoption, 272, 0);
 	lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 272, 0);

code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c

@@ -807,6 +807,8 @@ static void update_sd_emmc_status(void)
 	else{
 		diskSizeSd =  FileSys_GetDiskInfoEx('A', FST_INFO_DISK_SIZE);
 		diskFreeSd =  FileSys_GetDiskInfoEx('A', FST_INFO_FREE_SPACE);
+		//printf("[%s]sd card disk size: %lld,free size: %lld\n", __FUNCTION__, diskSizeSd, diskFreeSd);
+		//printf("[%s]emmc card disk size: %lld,free size: %lld\n", __FUNCTION__, diskSizeEmmc, diskFreeEmmc);
 		
 		if (diskSizeEmmc > 0 && diskFreeEmmc >= (FREE_SIZE_MB*1024*1024) && diskSizeSd > 0 && diskFreeSd >= (FREE_SIZE_MB*1024*1024))
 		{/*emmc normal sd normal*/

code/lib/source/sifar/code/source/common/sf_common.c

@@ -3436,6 +3436,7 @@ void sf_set_ble_status(SF_BLE_STATUS_E enStatus)
         BleStatus = enStatus;
         if(BleStatus == SF_BLE_CON)
         {
+            printf("[%s]set ble on status", __FUNCTION__);
             sf_wifi_set_cam_mode();
         }
     }