Compare commits

...

2 Commits

3 changed files with 7 additions and 1 deletions

View File

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

View File

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

View File

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