|
@@ -242,21 +242,7 @@ static void Power_ReadCheck(void *parameter)
|
|
|
|
|
|
|
|
device_status.bat_status = 0; //解除欠压
|
|
device_status.bat_status = 0; //解除欠压
|
|
|
}
|
|
}
|
|
|
- //
|
|
|
|
|
- if(1){
|
|
|
|
|
- RV = 10000 * (4096 - Read_Ntc_Voltage()) / Read_Ntc_Voltage();
|
|
|
|
|
- if(TempCalculate(RV, 3950, 10000)-TempCalculate(RV, 3950, 10000)>10)
|
|
|
|
|
- {
|
|
|
|
|
- LOG_E("temp value err!!!!");
|
|
|
|
|
- }
|
|
|
|
|
- else {
|
|
|
|
|
- device_status.heattem = TempCalculate(RV, 3950, 10000);
|
|
|
|
|
- if(device_status.heattem>160)
|
|
|
|
|
- {
|
|
|
|
|
- device_status.heattem = 25;
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
|
|
+
|
|
|
//rt_sprintf(device_status.voltage,"%d.%02d",filter_voltage()/100,filter_voltage()%100);
|
|
//rt_sprintf(device_status.voltage,"%d.%02d",filter_voltage()/100,filter_voltage()%100);
|
|
|
rt_uint16_t in_voltage_int = moving_average_filter_update(filter_v,Read_Real_Voltage());
|
|
rt_uint16_t in_voltage_int = moving_average_filter_update(filter_v,Read_Real_Voltage());
|
|
|
sprintf(device_status.voltage,"%d.%02d",in_voltage_int/100,in_voltage_int%100);
|
|
sprintf(device_status.voltage,"%d.%02d",in_voltage_int/100,in_voltage_int%100);
|