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

1.修复插usb低电问题

Browse Source 
2.温度测试
3.先还原原始的电压读值
This commit is contained in:
payton 2023-07-21 22:03:22 +08:00
parent 88c3820e38
commit 34cdd88e1b
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rtos/code/driver/na51089/include/sf_battery.h
View File

@ -39,4 +39,5 @@ void sf_stamp_temperature_get(INT16 *fTem,INT16 *cTem); /*0:F 1:C*/
void sf_temper_update(void); void sf_temper_update(void);
INT16 sf_celsius_change_to_fahrenheit(INT16 cTemper); INT16 sf_celsius_change_to_fahrenheit(INT16 cTemper);
void sf_BatteryInfoSave(char *name); void sf_BatteryInfoSave(char *name);
UINT32 sf_get_temper_adc(void);
#endif #endif

27
rtos/code/driver/na51089/source/mcu/sf_battery.c
View File

@ -309,7 +309,7 @@ UINT32 sf_battery_adc_value_get_once(void)
if(sf_adc_value_get(SF_ADC_DC, &batAdc) == SUCCESS) if(sf_adc_value_get(SF_ADC_DC, &batAdc) == SUCCESS)
{ {
dcVoltageVal = sf_battery_voltage_convert(10, 100, batAdc); dcVoltageVal = sf_battery_voltage_convert(10, 100, batAdc);
dcVoltageVal += 4; //dcVoltageVal += 4;
if(puiPara->BatteryLogSwitch) if(puiPara->BatteryLogSwitch)
printf("DC ADC Value:%lu After Convert:%lu(%lu.%luV)\n",batAdc,dcVoltageVal,dcVoltageVal/10,dcVoltageVal%10); printf("DC ADC Value:%lu After Convert:%lu(%lu.%luV)\n",batAdc,dcVoltageVal,dcVoltageVal/10,dcVoltageVal%10);
} }
@ -317,7 +317,7 @@ UINT32 sf_battery_adc_value_get_once(void)
if(sf_adc_value_get(SF_ADC_LI, &batAdc) == SUCCESS) if(sf_adc_value_get(SF_ADC_LI, &batAdc) == SUCCESS)
{ {
liPolymerVoltageVal = sf_battery_voltage_convert(15, 100, batAdc); liPolymerVoltageVal = sf_battery_voltage_convert(15, 100, batAdc);
liPolymerVoltageVal += 4; //liPolymerVoltageVal += 4;
if(puiPara->BatteryLogSwitch) if(puiPara->BatteryLogSwitch)
printf("Li ADC Value:%lu After Convert:%lu(%lu.%luV)\n",batAdc,liPolymerVoltageVal,liPolymerVoltageVal/10,liPolymerVoltageVal%10); printf("Li ADC Value:%lu After Convert:%lu(%lu.%luV)\n",batAdc,liPolymerVoltageVal,liPolymerVoltageVal/10,liPolymerVoltageVal%10);
} }
@ -325,7 +325,7 @@ UINT32 sf_battery_adc_value_get_once(void)
if(sf_adc_value_get(SF_ADC_BATT, &batAdc) == SUCCESS) if(sf_adc_value_get(SF_ADC_BATT, &batAdc) == SUCCESS)
{ {
batVoltageVal = sf_battery_voltage_convert(15, 100, batAdc); batVoltageVal = sf_battery_voltage_convert(15, 100, batAdc);
batVoltageVal += 4; //batVoltageVal += 4;
if(puiPara->BatteryLogSwitch) if(puiPara->BatteryLogSwitch)
printf("Bat ADC Value:%lu After Convert:%lu(%lu.%luV)\n",batAdc,batVoltageVal,batVoltageVal/10,batVoltageVal%10); printf("Bat ADC Value:%lu After Convert:%lu(%lu.%luV)\n",batAdc,batVoltageVal,batVoltageVal/10,batVoltageVal%10);
@ -853,7 +853,7 @@ THREAD_RETTYPE sf_battery_check_thread(void *arg)
{ {
printf("[%s:%d]power off because low battery\n", __FUNCTION__, __LINE__); printf("[%s:%d]power off because low battery\n", __FUNCTION__, __LINE__);
//Ux_PostEvent(NVTEVT_SYSTEM_SHUTDOWN, 1, APP_POWER_OFF_BATT_EMPTY); //shutdown start //Ux_PostEvent(NVTEVT_SYSTEM_SHUTDOWN, 1, APP_POWER_OFF_BATT_EMPTY); //shutdown start
#if SF_IQ_TEST != ENABLE #if (SF_IQ_TEST != ENABLE) && (SF_BATTERY_TEST != ENABLE)
sf_set_power_off_flag(APP_POWER_OFF_BATT_EMPTY); sf_set_power_off_flag(APP_POWER_OFF_BATT_EMPTY);
flow_preview_set_stop_flag(TRUE); flow_preview_set_stop_flag(TRUE);
#endif #endif
@ -1278,6 +1278,11 @@ BOOL sf_is_battery_low(UINT8 refresh, UINT8 nightMode)
*************************************************/ *************************************************/
BOOL sf_battery_check_init(void) BOOL sf_battery_check_init(void)
{ {
if(sf_is_usb_flag()){
printf("[%s:%d]usb power\n", __FUNCTION__, __LINE__);
return TRUE;
}
sf_adc_init(); sf_adc_init();
if(sf_is_battery_low(1, 0) == TRUE) if(sf_is_battery_low(1, 0) == TRUE)
{ {
@ -1457,7 +1462,7 @@ void sf_BatteryInfoSave(char *name)
batAdc = sf_battery_convert_to_adc(15, 100, BatVoltageValTest); batAdc = sf_battery_convert_to_adc(15, 100, BatVoltageValTest);
sprintf(tmpBuf, "%s BatAdc=%lu BatVal=%lu LiBatAdc=%lu LiBatVal=%lu\r\n", name, batAdc, BatVoltageValTest, LibatAdc, LiPolymerVoltageValTest); sprintf(tmpBuf, "%s BatAdc=%lu BatVal=%lu LiBatAdc=%lu LiBatVal=%lu TemperAdc=%lu\r\n", name, batAdc, BatVoltageValTest, LibatAdc, LiPolymerVoltageValTest, TemperAdc);
printf("%s\r", tmpBuf); printf("%s\r", tmpBuf);
if(fd) if(fd)
@ -1472,5 +1477,17 @@ void sf_BatteryInfoSave(char *name)
} }
#endif #endif
/******************************************************
Function: sf_get_temper_adc
Description:
Input: N/A
Output: N/A
Return: TemperAdc
Others: N/A
*******************************************************/
UINT32 sf_get_temper_adc(void)
{
return TemperAdc;
}
#endif #endif