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

1.增加电池锂电切换和恢复原值

Browse Source
This commit is contained in:
payton 2024-01-04 10:09:14 +08:00
parent 5cc6f37df1
commit e883e059ef
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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;

18
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;
} }
} }
@ -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();

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;