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

合入Branch_S550_Fast_Emmc代码

Browse Source
This commit is contained in:
sober.song 2024-01-04 13:42:43 +08:00
commit 55e5373443
11 changed files with 54 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h
View File

@ -984,6 +984,8 @@
#define SF_SD_LOG_INFO_FILENAME "/tmp/SD.txt" #define SF_SD_LOG_INFO_FILENAME "/tmp/SD.txt"
#define SF_4G_MODE_TEST DISABLE #define SF_4G_MODE_TEST DISABLE
#define SF_DCIM_PATH ":\\DCIM\\"
//////////////////////sf end/////////////////////////////// //////////////////////sf end///////////////////////////////
/******************************************************************************************* /*******************************************************************************************

6
code/application/source/cardv/SrcCode/UIApp/Background/UIBackgroundObj.c
View File

@ -922,6 +922,9 @@ UINT32 BackgroundFormatEmmc(void)
{ {
LogFile_ReOpen(); LogFile_ReOpen();
} }
char tmp[32] = {'\0'};
snprintf(tmp, sizeof(tmp), "B%s", SF_DCIM_PATH); /* DCF 8.3 naming rule */
FileSys_MakeDir(tmp);
#else #else
LogFile_ReOpen(); LogFile_ReOpen();
#endif #endif
@ -1021,6 +1024,9 @@ UINT32 BackgroundFormatCard(void)
{ {
LogFile_ReOpen(); LogFile_ReOpen();
} }
char tmp[32] = {'\0'};
snprintf(tmp, sizeof(tmp), "A%s", SF_DCIM_PATH); /* DCF 8.3 naming rule */
FileSys_MakeDir(tmp);
#else #else
LogFile_ReOpen(); LogFile_ReOpen();
#endif #endif

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

@ -364,12 +364,12 @@ static void LV_MenuCommonOption_UpdateContent(TM_MENU *pMenu)
printf("[LV_MenuCommonOption_UpdateContent]s_SelOption: %d\n", s_SelOption); printf("[LV_MenuCommonOption_UpdateContent]s_SelOption: %d\n", s_SelOption);
if (IDM_FORMAT_SD == pItem->ItemId) { if (IDM_FORMAT_SD == pItem->ItemId) {
if (0 == SelOption && i == 0) { if (0 == SelOption && i == 0) {
itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED;//√ itemIconId = LV_PLUGIN_IMG_ID_SF_NEXT2;//>
lv_obj_set_pos(image_option1_scr_uiflowmenucommonoption, 272, 0); lv_obj_set_pos(image_option1_scr_uiflowmenucommonoption, 288, 0);
ui_hidden = false; ui_hidden = false;
} else if (1 == SelOption && i == 1) { } else if (1 == SelOption && i == 1) {
itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED;//√ itemIconId = LV_PLUGIN_IMG_ID_SF_NEXT2;//>
lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 272, 0); lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 288, 0);
ui_hidden = false; ui_hidden = false;
} else if (0 == SelOption && i == 1) { } else if (0 == SelOption && i == 1) {
itemIconId = LV_PLUGIN_IMG_ID_SF_NEXT1;//> itemIconId = LV_PLUGIN_IMG_ID_SF_NEXT1;//>

4
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlay/UIFlowPlayEventCallback.c
View File

@ -2380,6 +2380,10 @@ static void UIFlowPlay_Key(lv_obj_t* obj, uint32_t key)
case LV_USER_KEY_UP: case LV_USER_KEY_UP:
case LV_USER_KEY_PREV: case LV_USER_KEY_PREV:
{ {
printf("[UIFlowPlay_Key]exit play handle change: %d. \n", FirstHandle);
ChangeHandle = FirstHandle;
FirstHandle = -1;
UIFlowPlay_Exit(obj); UIFlowPlay_Exit(obj);
break; break;
UINT32 uiFileSeq; UINT32 uiFileSeq;

1
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c
View File

@ -1748,6 +1748,7 @@ void SysResetFlag(void)
///////////// /////////////
puiPara->StampSwitch = DEFAULT_DATE_STAMP;//DEFAULT_STAMP_SWITCH; puiPara->StampSwitch = DEFAULT_DATE_STAMP;//DEFAULT_STAMP_SWITCH;
puiPara->BatteryType = DEFAULT_BATTERY_TYPE; puiPara->BatteryType = DEFAULT_BATTERY_TYPE;
puiPara->LiBatteryType = DEFAULT_BATTERY_TYPE;
puiPara->SdLoopSwitch = DEFAULT_SD_LOOP_SWITCH; puiPara->SdLoopSwitch = DEFAULT_SD_LOOP_SWITCH;
puiPara->PwdSwitch = DEFAULT_PWD_SWITCH; puiPara->PwdSwitch = DEFAULT_PWD_SWITCH;
puiPara->SendPhotoSwitch = DEFAULT_SEND_PHOTO_SWITCH; puiPara->SendPhotoSwitch = DEFAULT_SEND_PHOTO_SWITCH;

1
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h
View File

@ -580,6 +580,7 @@ typedef struct _UIMenuUIMenuStoreInfo {
CHAR SimIccidV[21]; CHAR SimIccidV[21];
CHAR SimIccidA[21]; CHAR SimIccidA[21];
UINT32 SdFailCount; UINT32 SdFailCount;
CHAR LiBatteryType;/*Alkaline/NI-MH/LI*/
UINT32 x1; UINT32 x1;
UINT32 x2; UINT32 x2;
UINT32 x3; UINT32 x3;

1
code/application/source/sf_app/code/source/app/sf_common.c
View File

@ -802,6 +802,7 @@ static SINT32 sf_app_proccess_cmd_para_update(SF_MESSAGE_BUF_S *pMessageBuf)
break; break;
case SF_PARA_CMD_RESET: case SF_PARA_CMD_RESET:
sf_statistics_param_reset(pSifarPara); sf_statistics_param_reset(pSifarPara);
sf_statistics_param_save(pSifarPara);
break; break;
case SF_PARA_CMD_FWUP: case SF_PARA_CMD_FWUP:
FwUpdate = pMessageBuf->arg2; FwUpdate = pMessageBuf->arg2;

22
code/application/source/sf_app/code/source/app/sf_service.c
View File

@ -1118,6 +1118,8 @@ SINT16 app_file_transfer_Error_return_server(SF_FN_PARAM_S *pfnParam) {
static SINT32 app_file_transfer(SF_FN_PARAM_S *pfnParam) { static SINT32 app_file_transfer(SF_FN_PARAM_S *pfnParam) {
SINT32 s32ret = 0; SINT32 s32ret = 0;
static int DailyreportSendFlag = 0; static int DailyreportSendFlag = 0;
static int PicUpDailyReportFlag = 0;
// SF_MESSAGE_BUF_S stMessageBuf = {0}; // SF_MESSAGE_BUF_S stMessageBuf = {0};
// UIMenuStoreInfo *pCustomerParam = pfnParam->pstParam; // UIMenuStoreInfo *pCustomerParam = pfnParam->pstParam;
// SF_PDT_PARAM_STATISTICS_S *pStaticParam = pfnParam->pstaticParam; // SF_PDT_PARAM_STATISTICS_S *pStaticParam = pfnParam->pstaticParam;
@ -1203,8 +1205,22 @@ static SINT32 app_file_transfer(SF_FN_PARAM_S *pfnParam) {
if(sf_get_send_gps_txt()){ if(sf_get_send_gps_txt()){
s32ret = sf_gps_send_ftp(); s32ret = sf_gps_send_ftp();
} }
if((!PicUpDailyReportFlag) && (pCustomerParam->PicUpDailyReport))
{
PicUpDailyReportFlag = 1;
sf_sms_set_pic(1);
sf_sleep_ms(200);
SLOGD("GpsSendFlag:%d\n", pCustomerParam->GpsSendFlag);
break;
}
if (!DailyreportSendFlag) if (!DailyreportSendFlag)
{ {
if ((sf_get_pic()) && (pCustomerParam->PicUpDailyReport)) {
s32ret = sf_send_file_to_ftp(1);
sf_sms_set_pic(0);
}
DailyreportSendFlag = 1; DailyreportSendFlag = 1;
s32ret = sf_send_file_to_ftp(2); s32ret = sf_send_file_to_ftp(2);
if(pCustomerParam->SdFailCount) if(pCustomerParam->SdFailCount)
@ -1214,12 +1230,6 @@ static SINT32 app_file_transfer(SF_FN_PARAM_S *pfnParam) {
sf_sleep_ms(200); sf_sleep_ms(200);
} }
//pCustomerParam->GpsSendFlag = 0; //pCustomerParam->GpsSendFlag = 0;
if(pCustomerParam->PicUpDailyReport){
sf_sms_set_pic(1);
sf_sleep_ms(200);
SLOGD("GpsSendFlag:%d\n", pCustomerParam->GpsSendFlag);
break;
}
} }
if (sf_get_pic()) { if (sf_get_pic()) {

24
code/application/source/sf_app/code/source/battery/sf_battery.c
View File

@ -411,6 +411,7 @@ UINT32 sf_battery_adc_value_get_once(void)
printf("[sf_battery_level_polling]is lith battery\n"); printf("[sf_battery_level_polling]is lith battery\n");
if(SF_BATT_LI_PACK != puiPara->BatteryType) if(SF_BATT_LI_PACK != puiPara->BatteryType)
{ {
puiPara->LiBatteryType = puiPara->BatteryType;
puiPara->BatteryType = SF_BATT_LI_PACK; puiPara->BatteryType = SF_BATT_LI_PACK;
} }
@ -420,7 +421,7 @@ UINT32 sf_battery_adc_value_get_once(void)
{ first_init--; { first_init--;
if (puiPara->BatteryType == SF_BATT_LI_PACK) if (puiPara->BatteryType == SF_BATT_LI_PACK)
{ {
puiPara->BatteryType = SF_BATT_ALKALINE; puiPara->BatteryType = puiPara->LiBatteryType == SF_BATT_LI_PACK ?SF_BATT_ALKALINE:puiPara->LiBatteryType;
} }
} }
@ -901,15 +902,15 @@ void sf_battery_level_polling(void)
readBatCnt++; readBatCnt++;
if(puiPara->BatteryLogSwitch) if(puiPara->BatteryLogSwitch)
{ {
printf("\nDC Adc:%d After Convert:(%d.%dV),Is Dc In=%s, TemperAdc:%d \n", sf_battery_convert_to_adc(24, 100, DcVoltageVal), DcVoltageVal / 10, DcVoltageVal % 10, IsPowerDcIn == 1? "Yes" : "No", TemperAdc); printf("\nDC Adc:%d After Convert:(%d.%dV),Is Dc In=%s, TemperAdc:%d \n", sf_battery_convert_to_adc(24, 100, _DcVoltageVal), _DcVoltageVal / 10, _DcVoltageVal % 10, IsPowerDcIn == 1? "Yes" : "No", TemperAdc);
if(LiPolymerVoltageVal) if(_LiPolymerVoltageVal)
{ {
printf("Li Battery Adc:%d After Convert:(%d.%dV)\n\n", sf_battery_convert_to_adc(24, 100, LiPolymerVoltageVal), LiPolymerVoltageVal / 10, LiPolymerVoltageVal % 10); printf("Li Battery Adc:%d After Convert:(%d.%dV)\n\n", sf_battery_convert_to_adc(24, 100, _LiPolymerVoltageVal), _LiPolymerVoltageVal / 10, _LiPolymerVoltageVal % 10);
} }
else else
{ {
printf("Other Battery Adc:%d After Convert:(%d.%dV)\n\n", sf_aa_battery_convert_to_adc(24, 100, BatVoltageVal),BatVoltageVal / 10, BatVoltageVal % 10); printf("Other Battery Adc:%d After Convert:(%d.%dV)\n\n", sf_aa_battery_convert_to_adc(24, 100, _BatVoltageVal),_BatVoltageVal / 10, _BatVoltageVal % 10);
} }
} }
if(readBatCnt >= 10) if(readBatCnt >= 10)
@ -969,16 +970,17 @@ void sf_battery_level_polling(void)
printf("[sf_battery_level_polling]is lith battery\n"); printf("[sf_battery_level_polling]is lith battery\n");
if(SF_BATT_LI_PACK != puiPara->BatteryType) if(SF_BATT_LI_PACK != puiPara->BatteryType)
{ {
puiPara->LiBatteryType = puiPara->BatteryType;
puiPara->BatteryType = SF_BATT_LI_PACK; puiPara->BatteryType = SF_BATT_LI_PACK;
} }
} }
else{ else{
if(puiPara->BatteryType == SF_BATT_LI_PACK) if(puiPara->BatteryType == SF_BATT_LI_PACK)
{ {
puiPara->BatteryType = SF_BATT_ALKALINE; puiPara->BatteryType = puiPara->LiBatteryType == SF_BATT_LI_PACK ?SF_BATT_ALKALINE:puiPara->LiBatteryType;
} }
} }
//ret = sf_check_low_battery(); //ret = sf_check_low_battery();

3
code/application/source/sf_app/code/source/paramMng/sf_param_common.c
View File

@ -1311,7 +1311,10 @@ SINT32 sf_statistics_param_save(SF_PDT_PARAM_STATISTICS_S* pStatisticsParam)
MLOGE("save param failed!!!\n"); MLOGE("save param failed!!!\n");
fsync(fd); fsync(fd);
close(fd); close(fd);
free(file_path); free(file_path);
system("sync");
MLOGI("save e\n");
return SF_SUCCESS; return SF_SUCCESS;
} }

1
rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h
View File

@ -580,6 +580,7 @@ typedef struct _UIMenuUIMenuStoreInfo {
CHAR SimIccidV[21]; CHAR SimIccidV[21];
CHAR SimIccidA[21]; CHAR SimIccidA[21];
UINT32 SdFailCount; UINT32 SdFailCount;
CHAR LiBatteryType;/*Alkaline/NI-MH/LI*/
UINT32 x1; UINT32 x1;
UINT32 x2; UINT32 x2;