Compare commits
No commits in common. "bb5e52ff5208481ffa580043bb350c0ed5f9d6b7" and "dfc64ef786b075f08dc4526d5aaaeff700582a68" have entirely different histories.
bb5e52ff52
...
dfc64ef786
|
@ -1118,7 +1118,7 @@ void tem_hum_update_task(void const * argument)
|
||||||
if(tem_hun_check_flag)
|
if(tem_hun_check_flag)
|
||||||
{
|
{
|
||||||
//采集温湿度与大气压
|
//采集温湿度与大气压
|
||||||
// osDelay(10);//等待传感器初始化
|
osDelay(10);//等待传感器初始化
|
||||||
getTempHumiPress();
|
getTempHumiPress();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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);
|
|
||||||
/* Infinite loop */
|
/* Infinite loop */
|
||||||
for(;;)
|
for(;;)
|
||||||
{
|
{
|
||||||
|
|
|
@ -42,7 +42,7 @@ static HAL_StatusTypeDef MS56XX_ReadD1_Press(uint32_t *D1_Value)
|
||||||
{
|
{
|
||||||
return HAL_ERROR;
|
return HAL_ERROR;
|
||||||
}
|
}
|
||||||
osDelay(10);
|
osDelay(20);
|
||||||
if(HAL_I2C_Master_Transmit(&hi2c3, MS5607_ADDRESS, _addr, 1, 0xff) != HAL_OK)
|
if(HAL_I2C_Master_Transmit(&hi2c3, MS5607_ADDRESS, _addr, 1, 0xff) != HAL_OK)
|
||||||
{
|
{
|
||||||
return HAL_ERROR;
|
return HAL_ERROR;
|
||||||
|
@ -71,7 +71,7 @@ static HAL_StatusTypeDef MS56XX_ReadD2_Temp(uint32_t *D2_Value_)
|
||||||
{
|
{
|
||||||
return HAL_ERROR;
|
return HAL_ERROR;
|
||||||
}
|
}
|
||||||
osDelay(10);
|
osDelay(20);
|
||||||
if(HAL_I2C_Master_Transmit(&hi2c3, MS5607_ADDRESS, _addr, 1, 0xff) != HAL_OK)
|
if(HAL_I2C_Master_Transmit(&hi2c3, MS5607_ADDRESS, _addr, 1, 0xff) != HAL_OK)
|
||||||
{
|
{
|
||||||
return HAL_ERROR;
|
return HAL_ERROR;
|
||||||
|
@ -183,15 +183,11 @@ static HAL_StatusTypeDef MS56XX_GetPressureTemp(float *Temp, float *Press) //
|
||||||
}
|
}
|
||||||
if(Tmp_Pressure<1000)
|
if(Tmp_Pressure<1000)
|
||||||
{
|
{
|
||||||
// Tmp_Pressure=1000;
|
Tmp_Pressure=1000;
|
||||||
*Press = 0;
|
|
||||||
return HAL_ERROR;
|
|
||||||
}
|
}
|
||||||
if(Tmp_Pressure>120000)
|
if(Tmp_Pressure>120000)
|
||||||
{
|
{
|
||||||
// Tmp_Pressure=120000;
|
Tmp_Pressure=120000;
|
||||||
*Press = 0;
|
|
||||||
return HAL_ERROR;
|
|
||||||
}
|
}
|
||||||
*Temp = ((float)MS56XX_Temperature)/100;
|
*Temp = ((float)MS56XX_Temperature)/100;
|
||||||
*Press = ((float)Tmp_Pressure)/100;
|
*Press = ((float)Tmp_Pressure)/100;
|
||||||
|
|
Loading…
Reference in New Issue