diff --git a/App/Src/anemometer_dev.c b/App/Src/anemometer_dev.c index 97059a8..ae96bb5 100644 --- a/App/Src/anemometer_dev.c +++ b/App/Src/anemometer_dev.c @@ -1118,7 +1118,7 @@ void tem_hum_update_task(void const * argument) if(tem_hun_check_flag) { //采集温湿度与大气压 - osDelay(10);//等待传感器初始化 +// osDelay(10);//等待传感器初始化 getTempHumiPress(); } diff --git a/Drivers/MS5607/ms5607.c b/Drivers/MS5607/ms5607.c index 4b30ff8..80190e6 100644 --- a/Drivers/MS5607/ms5607.c +++ b/Drivers/MS5607/ms5607.c @@ -42,7 +42,7 @@ static HAL_StatusTypeDef MS56XX_ReadD1_Press(uint32_t *D1_Value) { return HAL_ERROR; } - osDelay(20); + osDelay(10); if(HAL_I2C_Master_Transmit(&hi2c3, MS5607_ADDRESS, _addr, 1, 0xff) != HAL_OK) { return HAL_ERROR; @@ -71,7 +71,7 @@ static HAL_StatusTypeDef MS56XX_ReadD2_Temp(uint32_t *D2_Value_) { return HAL_ERROR; } - osDelay(20); + osDelay(10); if(HAL_I2C_Master_Transmit(&hi2c3, MS5607_ADDRESS, _addr, 1, 0xff) != HAL_OK) { return HAL_ERROR; @@ -183,11 +183,15 @@ static HAL_StatusTypeDef MS56XX_GetPressureTemp(float *Temp, float *Press) // } if(Tmp_Pressure<1000) { - Tmp_Pressure=1000; +// Tmp_Pressure=1000; + *Press = 0; + return HAL_ERROR; } if(Tmp_Pressure>120000) { - Tmp_Pressure=120000; +// Tmp_Pressure=120000; + *Press = 0; + return HAL_ERROR; } *Temp = ((float)MS56XX_Temperature)/100; *Press = ((float)Tmp_Pressure)/100;