From aaac4bb4435ad143299a55815f9e7a6b28fd047b Mon Sep 17 00:00:00 2001
From: 95384 <664090429@qq.com>
Date: Sat, 8 Mar 2025 14:08:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E9=9B=8610=E6=AC=A1=E6=B0=94=E5=8E=8B?=
 =?UTF-8?q?=EF=BC=8C=E8=B6=85=E8=BF=87=E8=8C=83=E5=9B=B4=E7=AE=97=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=EF=BC=8C=E4=B8=8D=E6=8A=A5=E9=94=99=E5=B9=B3=E5=9D=87?=
 =?UTF-8?q?=E5=80=BC=E8=BF=94=E5=9B=9E=E6=B0=94=E5=8E=8B=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=EF=BC=8C=E6=B0=94=E5=8E=8B=E4=BC=A0=E6=84=9F=E5=99=A8D1?=
 =?UTF-8?q?=EF=BC=8CD2=E6=AF=8F=E6=AC=A1=E5=BC=80=E5=A7=8B=E8=BD=AC?=
 =?UTF-8?q?=E6=8D=A2=E5=88=B0=E8=8E=B7=E5=8F=96=E5=BB=B6=E6=97=B6=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA10MS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App/Src/anemometer_dev.c |  2 +-
 Drivers/MS5607/ms5607.c  | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

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;