Compare commits

..

No commits in common. "b021471f5ba62701306507d1350f1e31479a3b47" and "cc668ea47828c8f3177c972e4cd0f3da37478665" have entirely different histories.

3 changed files with 1 additions and 7 deletions

View File

@ -1077,7 +1077,6 @@ static void getTempHumiPress(void)
//置错误标志位
g_error_log.temp_error_HP203B = 1;
//错误处理
g_stMcs_Para.pressure = 0;
}
else
{

View File

@ -150,7 +150,7 @@ void MX_FREERTOS_Init(void) {
void StartDefaultTask(void const * argument)
{
/* USER CODE BEGIN StartDefaultTask */
osDelay(5000);
osDelay(2000);
/* Infinite loop */
for(;;)
{

View File

@ -226,16 +226,11 @@ HAL_StatusTypeDef MS56XX_GetPressure(float *Press)
ret_falt++;
pressure_buff[i] = 0;
}
osDelay(15);//转换时间
}
if(ret_falt >= COLLECT_DATA_NUM)
{
return HAL_ERROR;
}
*Press = calculateAverage( pressure_buff,COLLECT_DATA_NUM - ret_falt);
// if(MS56XX_GetPressureTemp(&temp_buff, Press) != HAL_OK)
// {
// return HAL_ERROR;
// }
return HAL_OK;
}