diff --git a/App/Src/anemometer_dev.c b/App/Src/anemometer_dev.c index 0d12442..d96ebe5 100644 --- a/App/Src/anemometer_dev.c +++ b/App/Src/anemometer_dev.c @@ -1079,6 +1079,7 @@ static void getTempHumiPress(void) //置错误标志位 g_error_log.temp_error_HP203B = 1; //错误处理 + g_stMcs_Para.pressure = 0; } else { diff --git a/Core/Src/freertos.c b/Core/Src/freertos.c index b28b8c9..3633196 100644 --- a/Core/Src/freertos.c +++ b/Core/Src/freertos.c @@ -151,7 +151,7 @@ void MX_FREERTOS_Init(void) { void StartDefaultTask(void const * argument) { /* USER CODE BEGIN StartDefaultTask */ - osDelay(2000); + osDelay(5000); /* Infinite loop */ for(;;) { diff --git a/Drivers/MS5607/ms5607.c b/Drivers/MS5607/ms5607.c index fb90034..6e8296c 100644 --- a/Drivers/MS5607/ms5607.c +++ b/Drivers/MS5607/ms5607.c @@ -178,9 +178,9 @@ static HAL_StatusTypeDef MS56XX_GetPressureTemp(float *Temp, float *Press) // MS56XX_Temperature=-6000; return HAL_ERROR; } - if(MS56XX_Temperature>8500) + if(MS56XX_Temperature>9000) { - MS56XX_Temperature=8500; + MS56XX_Temperature=9000; return HAL_ERROR; } if(Tmp_Pressure<1000) @@ -226,11 +226,16 @@ 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; } \ No newline at end of file