From bb2c0d034e5b4ab7d60b8ec06cc7706d22f1bdde Mon Sep 17 00:00:00 2001
From: 95384 <664090429@qq.com>
Date: Sat, 1 Mar 2025 09:52:22 +0800
Subject: [PATCH 01/12] =?UTF-8?q?ADC=E5=A2=9E=E7=9B=8A=E5=BC=80=E5=90=AF?=
 =?UTF-8?q?=E4=B8=8E=E5=85=B3=E9=97=AD=E7=82=B9=E6=94=B9=E4=B8=BA=E5=AE=8F?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=EF=BC=8C=E5=BC=80=E5=90=AF=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?190=EF=BC=8C=E5=85=B3=E9=97=AD=E6=94=B9=E4=B8=BA1900?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App/Inc/anemometer_dev.h |  2 ++
 App/Src/anemometer_dev.c | 16 ++++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/App/Inc/anemometer_dev.h b/App/Inc/anemometer_dev.h
index dd40f8f..13107e5 100644
--- a/App/Inc/anemometer_dev.h
+++ b/App/Inc/anemometer_dev.h
@@ -20,6 +20,8 @@
 
 
 
+#define ADC_GAIN_ENABLE 190
+#define ADC_GAIN_DISABLE 1900
 
 #define K_128 0xA12EE1FE
 // 延时REV_MUTE_DELAY us启动ADC采集数据
diff --git a/App/Src/anemometer_dev.c b/App/Src/anemometer_dev.c
index bc0ea98..ea43e7d 100644
--- a/App/Src/anemometer_dev.c
+++ b/App/Src/anemometer_dev.c
@@ -93,30 +93,30 @@ void config_adc_gain(uint8_t channel, uint16_t max_val)
       switch(channel)
       {
       case 0x01:
-          if(max_val <= 180)
+          if(max_val <= ADC_GAIN_ENABLE)
               gain_status.gain_status_s = 1;
-          else if(max_val >= 1900)
+          else if(max_val >= ADC_GAIN_DISABLE)
               gain_status.gain_status_s = 0;
           break;
       
       case 0x02:
-          if(max_val <= 180)
+          if(max_val <= ADC_GAIN_ENABLE)
               gain_status.gain_status_n = 1;
-          else if(max_val >= 1900)
+          else if(max_val >= ADC_GAIN_DISABLE)
               gain_status.gain_status_n = 0;
           break;
       
       case 0x03:
-          if(max_val <= 180)
+          if(max_val <= ADC_GAIN_ENABLE)
               gain_status.gain_status_e = 1;
-          else if(max_val >= 1900)
+          else if(max_val >= ADC_GAIN_DISABLE)
               gain_status.gain_status_e = 0;
           break;
       
       case 0x04:
-          if(max_val <= 180)
+          if(max_val <= ADC_GAIN_ENABLE)
               gain_status.gain_status_w = 1;
-          else if(max_val >= 1900)
+          else if(max_val >= ADC_GAIN_DISABLE)
               gain_status.gain_status_w = 0;
           break;
       

From d1bbcc86d8655e55094e71e2ffdf8feebec725e6 Mon Sep 17 00:00:00 2001
From: 95384 <664090429@qq.com>
Date: Sat, 1 Mar 2025 10:59:45 +0800
Subject: [PATCH 02/12] =?UTF-8?q?=E5=A2=9E=E5=8A=A0SHT30=E5=87=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=90=8E=E9=87=8D=E6=96=B0=E4=B8=8A=E7=94=B5=EF=BC=8C?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E5=88=9D=E5=A7=8B=E5=8C=96IIC1=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=EF=BC=8CSHT30IIC=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E7=94=B10xFFFF=E6=94=B9=E4=B8=BA0xFF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App/Inc/anemometer_dev.h |  2 +-
 App/Src/anemometer_dev.c | 15 ++++++++++++++-
 Drivers/Sht3x/sht30.c    |  4 ++--
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/App/Inc/anemometer_dev.h b/App/Inc/anemometer_dev.h
index 13107e5..a0d385a 100644
--- a/App/Inc/anemometer_dev.h
+++ b/App/Inc/anemometer_dev.h
@@ -42,7 +42,7 @@
 // 温度探头版本，SHT30=1，TMP117=2
 #define SHT30_SENSOR    1
 #define TMP117_SENSOR   2
-#define TEMP_SENSOR     TMP117_SENSOR
+#define TEMP_SENSOR     SHT30_SENSOR
 
 
 ///已将DISTANCE写入配置文件，在结构体g_stConfigInfo.transducer_distace中
diff --git a/App/Src/anemometer_dev.c b/App/Src/anemometer_dev.c
index ea43e7d..ced44cf 100644
--- a/App/Src/anemometer_dev.c
+++ b/App/Src/anemometer_dev.c
@@ -1099,9 +1099,22 @@ static void getTempHumiPress(void)
     //    SHT30出问题
     if(sht30_ret == FALSE)
     {
+        //错误处理
+        //关电重启,第一次进入错误判断，此时此时错误标志位为0，关电并置位错误标志位；
+        //再进入错误标志位检测到错误标志位后开电
+        //下一次监测如果SHT30恢复，则正常运行，如果没有恢复，电继续开着，保证温度传感器正常运行
+        if(g_error_log.temp_error_SHT30 == 0)
+        {
+            HAL_GPIO_WritePin(GPIOB, GPIO_SHT_PWR_EN_Pin, GPIO_PIN_RESET);
+            HAL_I2C_DeInit(&hi2c1);
+        }else
+        {
+            HAL_GPIO_WritePin(GPIOB, GPIO_SHT_PWR_EN_Pin, GPIO_PIN_SET);
+            MX_I2C1_Init();
+            sht30_init();
+        }
         //置错误标志位
         g_error_log.temp_error_SHT30 = 1;
-        //错误处理
 #if TEMP_SENSOR == SHT30_SENSOR
         g_stMcs_Para.temperature = backupTemperature1;
 #endif /*TEMP_SENSOR == SHT30_SENSOR*/
diff --git a/Drivers/Sht3x/sht30.c b/Drivers/Sht3x/sht30.c
index f33a8d8..23bd38a 100644
--- a/Drivers/Sht3x/sht30.c
+++ b/Drivers/Sht3x/sht30.c
@@ -33,7 +33,7 @@ static u_int8_t i2c_write_cmd(u_int8_t addr,u_int16_t cmd)
     cmd_buff[0] = cmd>>8;
     cmd_buff[1] = cmd;
     
-    u_int8_t ret = HAL_I2C_Master_Transmit(&hi2c1,addr,cmd_buff,2,0xffff);
+    u_int8_t ret = HAL_I2C_Master_Transmit(&hi2c1,addr,cmd_buff,2,0xff);
     return ret;
 }
 
@@ -101,7 +101,7 @@ u_int8_t sht30_collect_data(stTempHumiSensor stSensorDev, float *temp, float *hu
 
     i2c_write_cmd(stSensorDev.i2c_reg_addr,stSensorDev.cmd_read_data);
 
-    if(HAL_I2C_Master_Receive(&hi2c1,stSensorDev.i2c_reg_addr,read_buff,6,0xffff) != HAL_OK){
+    if(HAL_I2C_Master_Receive(&hi2c1,stSensorDev.i2c_reg_addr,read_buff,6,0xff) != HAL_OK){
         return HAL_ERROR;
     }
        

From e9f0a3d61b0910089e14fc67416ab7a16af09516 Mon Sep 17 00:00:00 2001
From: 95384 <664090429@qq.com>
Date: Tue, 4 Mar 2025 13:20:19 +0800
Subject: [PATCH 03/12] =?UTF-8?q?=E6=B7=BB=E5=8A=A0MS5607=E9=A9=B1?=
 =?UTF-8?q?=E5=8A=A8=E6=9B=BF=E6=8D=A2HP203B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App/Src/anemometer_dev.c |   4 +-
 Core/Src/main.c          |   2 +
 Drivers/MS5607/ms5607.c  | 165 +++++++++++++++++++++++++++++++++++++++
 Drivers/MS5607/ms5607.h  |  21 +++++
 EWARM/micro_climate.ewp  |  13 ++-
 EWARM/micro_climate.ewt  |   9 +++
 6 files changed, 212 insertions(+), 2 deletions(-)
 create mode 100644 Drivers/MS5607/ms5607.c
 create mode 100644 Drivers/MS5607/ms5607.h

diff --git a/App/Src/anemometer_dev.c b/App/Src/anemometer_dev.c
index ced44cf..96bbcbe 100644
--- a/App/Src/anemometer_dev.c
+++ b/App/Src/anemometer_dev.c
@@ -10,6 +10,7 @@
 #include "FIR.h"
 #include "LowPassFilter.h"
 #include "encrypt.h"
+#include "ms5607.h"
 
 #define AVE_TIME 600 //滑动平均时间，秒，最大600
 #define COVER_TINE 10 //探头遮挡后导致的接收次数过小的报错临界次数
@@ -1070,7 +1071,8 @@ static void getTempHumiPress(void)
     //采集备用温度与大气压
     float backupTemperature1;
     float backupTemperature2;
-    uint8_t hp203_ret = get_HP203_data(&backupTemperature1, &g_stMcs_Para.pressure);
+//    uint8_t hp203_ret = get_HP203_data(&backupTemperature1, &g_stMcs_Para.pressure);
+    uint8_t hp203_ret = MS56XX_GetPressureTemp(&backupTemperature1, &g_stMcs_Para.pressure);
     uint8_t sht30_ret = get_temp_humi_data(&backupTemperature2, &g_stMcs_Para.humidity);
 #if TEMP_SENSOR == SHT30_SENSOR
     g_stMcs_Para.temperature = backupTemperature2;
diff --git a/Core/Src/main.c b/Core/Src/main.c
index 956ae80..90768f8 100644
--- a/Core/Src/main.c
+++ b/Core/Src/main.c
@@ -44,6 +44,7 @@
 #include "sht30.h"
 #include "hp203b.h"
 #include "tmp117.h"
+#include "ms5607.h"
       
 #include "inflash.h"
 /* USER CODE END Includes */
@@ -174,6 +175,7 @@ void Flash_EnableReadProtection(void)
   HAL_ADCEx_Calibration_Start(&hadc1,ADC_SINGLE_ENDED);
   sht30_init();
   TMP117_Init();
+  MS56XX_Init();
   /* USER CODE END 2 */
 
   /* Call init function for freertos objects (in cmsis_os2.c) */
diff --git a/Drivers/MS5607/ms5607.c b/Drivers/MS5607/ms5607.c
new file mode 100644
index 0000000..6c7ff5f
--- /dev/null
+++ b/Drivers/MS5607/ms5607.c
@@ -0,0 +1,165 @@
+#include "ms5607.h"
+#include "i2c.h"
+#include  "filter.h"
+#include "anemometer_dev.h"
+#include "uart_dev.h"
+
+static void MS56XX_Reset(void)
+{
+    uint8_t _cmd[] = {0x1e};
+    HAL_I2C_Master_Transmit(&hi2c3, MS5607_ADDRESS, _cmd, 1, 0xff);
+    HAL_Delay(5);
+}
+
+static void MS56XX_Read_PromData(uint16_t *VAL_C)
+{
+    uint8_t _cmd[] = {0xa0};
+    uint8_t temp_buff[2] = {0};
+    for(uint8_t i = 0; i < 8; i++)
+    {
+        HAL_I2C_Master_Transmit(&hi2c3, MS5607_ADDRESS, _cmd, 1, 0xff);
+        HAL_I2C_Master_Receive(&hi2c3, MS5607_ADDRESS, temp_buff, 2, 0xff);
+        *(VAL_C + i) = (temp_buff[0] << 8)|temp_buff[1];
+        _cmd[0] += 2;
+        osDelay(1000);
+    }
+    
+}
+
+static uint16_t MS56XX_C_Value[8] = {0};
+void MS56XX_Init(void)
+{
+    MS56XX_Reset();
+    MS56XX_Read_PromData(MS56XX_C_Value);
+}
+
+static uint32_t MS56XX_ReadD1_Press(void)
+{
+    uint8_t D1_Value_Buff[3] = {0xFF, 0xFF, 0xFF};
+    uint8_t _cmd[] = {0x48};
+    uint8_t _addr[] = {0x00};
+    HAL_I2C_Master_Transmit(&hi2c3, MS5607_ADDRESS, _cmd, 1, 0xff);
+    osDelay(10);
+    HAL_I2C_Master_Transmit(&hi2c3, MS5607_ADDRESS, _addr, 1, 0xff);
+    HAL_I2C_Master_Receive(&hi2c3, MS5607_ADDRESS, D1_Value_Buff, 3, 0xff);
+    
+    uint32_t press;
+    press = D1_Value_Buff[0];
+    press <<= 8;
+    press += D1_Value_Buff[1];
+    press <<= 8;
+    press += D1_Value_Buff[2];
+    term_printf("%x",press);
+    return press;
+}
+
+static uint32_t MS56XX_ReadD2_Temp(void)
+{
+    uint8_t D2_Value_Buff[3] = {0x00, 0x00, 0x00};
+    uint8_t _cmd[] = {0x58};
+    uint8_t _addr[] = {0x00};
+    HAL_I2C_Master_Transmit(&hi2c3, MS5607_ADDRESS, _cmd, 1, 0xff);
+    osDelay(10);
+    HAL_I2C_Master_Transmit(&hi2c3, MS5607_ADDRESS, _addr, 1, 0xff);
+    HAL_I2C_Master_Receive(&hi2c3, MS5607_ADDRESS, D2_Value_Buff, 3, 0xff);
+    
+    uint32_t Temp;
+    Temp = D2_Value_Buff[0];
+    Temp <<= 8;
+    Temp += D2_Value_Buff[1];
+    Temp <<= 8;
+    Temp += D2_Value_Buff[2];
+    return Temp;
+}
+
+static void MS56XX_GetTemperature (int32_t *dT, int32_t *MS56XX_Temperature)     //�����¶�
+{
+    uint32_t D2_Value = MS56XX_ReadD2_Temp();      //ѭ����ȡ D2
+    
+    if(D2_Value > ((uint32_t)MS56XX_C_Value[5] * (0x00000001 << 8) ))
+    {
+        *dT  = D2_Value - (( uint32_t )MS56XX_C_Value[5] * (0x00000001 << 8));  //��ʽ dT = D2 - TREF = D2 - C5 * 2^8
+    }
+    else
+    {
+        *dT  = (( uint32_t ) MS56XX_C_Value[5] * (0x00000001 << 8) ) - D2_Value;     
+        *dT *= -1;
+    }
+    *MS56XX_Temperature = 2000 + ( *dT * MS56XX_C_Value[6] ) / (0x00000001 << 23); //����¶�ֵ��100����2001��ʾ20.01��  ��ʽTEMP =20��C + dT * TEMPSENS =2000 + dT * C6 / 2^23
+
+    if(*MS56XX_Temperature < -6000) 
+    {
+        *MS56XX_Temperature=-6000;
+    }
+    if(*MS56XX_Temperature > 8500) 
+    {
+        *MS56XX_Temperature=8500;
+    }
+}
+
+uint8_t MS56XX_GetPressureTemp (float *Temp, float *Press)  //�����¶Ȳ���ѹ��
+{
+    int32_t dT;
+    int32_t MS56XX_Temperature;
+    uint32_t D1_Value = MS56XX_ReadD1_Press();      //ѭ����ȡ D1
+    
+    MS56XX_GetTemperature(&dT, &MS56XX_Temperature);//��ȡdT��Temp
+    
+    int64_t OFF =  ((int64_t)MS56XX_C_Value[2] * (0x00000001 << 17)) + ((int64_t)MS56XX_C_Value[4] * dT )/ 64.0;    //��ʽ OFF = OFFT1 + TCO *dT = C2 *2^17 +(C4 *dT )/ 2^6
+    int64_t SENS = ((int64_t)MS56XX_C_Value[1] * (0x00000001 << 16)) + ((int64_t)MS56XX_C_Value[3] * dT )/ 128.0; //��ʽSENS = SENST1 + TCS* dT= C1 * 2^16 + (C3 * dT )/ 2^7
+
+    //�¶Ȳ�������    �߼���оƬ�ֲ�   
+    int32_t T2;
+    int64_t OFF2;
+    int64_t SENS2;
+    if (MS56XX_Temperature < 2000 ) // second order temperature compensation when under 20 degrees C
+    {
+        T2 = ( dT * dT ) / (( uint64_t )0x0000000001 << 31);
+        OFF2 = 61 *  (( MS56XX_Temperature - 2000 ) * ( MS56XX_Temperature - 2000 )) / 16;
+        SENS2 = 2 * (( MS56XX_Temperature - 2000 ) * ( MS56XX_Temperature - 2000 )) ;
+        if ( MS56XX_Temperature < -1500 )
+        {
+            OFF2 = OFF2 + 15 * (( MS56XX_Temperature + 1500 ) * ( MS56XX_Temperature + 1500 ));
+            SENS2 = SENS2 + 8 * (( MS56XX_Temperature + 1500 ) * ( MS56XX_Temperature + 1500 ));
+        }
+    }
+    else        //(Temperature > 2000)
+    {
+        T2 = 0;
+        OFF2 = 0;
+        SENS2 = 0;
+    }
+
+    MS56XX_Temperature = MS56XX_Temperature - T2;
+    OFF = OFF - OFF2;
+    SENS = SENS - SENS2;
+    
+    
+    int32_t Tmp_Pressure = (D1_Value * SENS / (0x00000001 << 21) - OFF ) / (0x00000001 << 15); //��ʽ P = D1 * SENS - OFF = (D1 * SENS / 2^21 - OFF) / 2^15
+
+    *Temp = ((float)MS56XX_Temperature)/100;          //��λ  ��     
+    *Press = ((float)Tmp_Pressure)/100;           //��λ  mbar 
+    term_printf("%f", *Press);
+
+    if(*Temp<-60) 
+    {
+        *Temp=-60;
+        return 0;
+    }
+    if(*Temp>85)
+    {
+        *Temp=85;
+        return 0;
+    }
+    if(*Press<10)
+    {
+        *Press=10;
+        return 0;
+    }
+    if(*Press>1200)
+    {
+        *Press=1200;
+        return 0;
+    }
+    return 1;
+}
diff --git a/Drivers/MS5607/ms5607.h b/Drivers/MS5607/ms5607.h
new file mode 100644
index 0000000..6a96947
--- /dev/null
+++ b/Drivers/MS5607/ms5607.h
@@ -0,0 +1,21 @@
+#ifndef __MS5607_H__
+#define __MS5607_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "comm_types.h"
+    
+#define MS5607_ADDRESS  0x77<<1
+    
+void MS56XX_Init(void);
+uint8_t MS56XX_GetPressureTemp (float *Temp, float *Press);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /*__ __MS5607_H__ */
+
diff --git a/EWARM/micro_climate.ewp b/EWARM/micro_climate.ewp
index 6518386..bd28a1e 100644
--- a/EWARM/micro_climate.ewp
+++ b/EWARM/micro_climate.ewp
@@ -375,6 +375,7 @@
                     <state>$PROJ_DIR$\..\App\Inc</state>
                     <state>$PROJ_DIR$\..\Drivers\HP203B</state>
                     <state>$PROJ_DIR$\..\Drivers\Tmp117</state>
+                    <state>$PROJ_DIR$\..\Drivers\MS5607</state>
                 </option>
                 <option>
                     <name>CCStdIncCheck</name>
@@ -1487,6 +1488,7 @@
                     <state>$PROJ_DIR$\..\App\Inc</state>
                     <state>$PROJ_DIR$\..\Drivers\HP203B</state>
                     <state>$PROJ_DIR$\..\Drivers\Tmp117</state>
+                    <state>$PROJ_DIR$\..\Drivers\MS5607</state>
                 </option>
                 <option>
                     <name>CCStdIncCheck</name>
@@ -1814,7 +1816,7 @@
             <data>
                 <extensions></extensions>
                 <cmdline></cmdline>
-                <hasPrio>1</hasPrio>
+                <hasPrio>184</hasPrio>
                 <buildSequence>inputOutputBased</buildSequence>
             </data>
         </settings>
@@ -2367,6 +2369,15 @@
                 <name>$PROJ_DIR$\..\Drivers\HP203B\hp203b.h</name>
             </file>
         </group>
+        <group>
+            <name>MS5607</name>
+            <file>
+                <name>$PROJ_DIR$\..\Drivers\MS5607\ms5607.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\Drivers\MS5607\ms5607.h</name>
+            </file>
+        </group>
         <group>
             <name>RingQueue</name>
             <file>
diff --git a/EWARM/micro_climate.ewt b/EWARM/micro_climate.ewt
index ff7cd27..d06e082 100644
--- a/EWARM/micro_climate.ewt
+++ b/EWARM/micro_climate.ewt
@@ -2994,6 +2994,15 @@
                 <name>$PROJ_DIR$\..\Drivers\HP203B\hp203b.h</name>
             </file>
         </group>
+        <group>
+            <name>MS5607</name>
+            <file>
+                <name>$PROJ_DIR$\..\Drivers\MS5607\ms5607.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\Drivers\MS5607\ms5607.h</name>
+            </file>
+        </group>
         <group>
             <name>RingQueue</name>
             <file>

From 274a4086765b33df67fd2a377f48e0e3c116130c Mon Sep 17 00:00:00 2001
From: 95384 <664090429@qq.com>
Date: Wed, 5 Mar 2025 14:55:07 +0800
Subject: [PATCH 04/12] =?UTF-8?q?=E4=BF=AE=E5=A4=8DMS5607=E6=B8=A9?=
 =?UTF-8?q?=E5=BA=A6=E5=87=BA=E9=94=99=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App/Inc/anemometer_dev.h |   2 +-
 App/Src/anemometer_dev.c |   1 +
 Core/Src/freertos.c      |   2 +-
 Core/Src/main.c          |   1 -
 Drivers/MS5607/ms5607.c  | 119 +++++++++++++++++++++------------------
 Drivers/Sht3x/sht30.c    |   2 +-
 6 files changed, 67 insertions(+), 60 deletions(-)

diff --git a/App/Inc/anemometer_dev.h b/App/Inc/anemometer_dev.h
index a0d385a..13107e5 100644
--- a/App/Inc/anemometer_dev.h
+++ b/App/Inc/anemometer_dev.h
@@ -42,7 +42,7 @@
 // 温度探头版本，SHT30=1，TMP117=2
 #define SHT30_SENSOR    1
 #define TMP117_SENSOR   2
-#define TEMP_SENSOR     SHT30_SENSOR
+#define TEMP_SENSOR     TMP117_SENSOR
 
 
 ///已将DISTANCE写入配置文件，在结构体g_stConfigInfo.transducer_distace中
diff --git a/App/Src/anemometer_dev.c b/App/Src/anemometer_dev.c
index 96bbcbe..4665d22 100644
--- a/App/Src/anemometer_dev.c
+++ b/App/Src/anemometer_dev.c
@@ -1147,6 +1147,7 @@ void tem_hum_update_task(void const * argument)
         
     uint16_t time_s_temp_humi = 0;//1秒计时，温湿度更新
 //    开机先采集一次大气压温湿度
+    MS56XX_Init();
     if(tem_hun_check_flag)
     {
         //采集温湿度与大气压
diff --git a/Core/Src/freertos.c b/Core/Src/freertos.c
index 5ee9e32..24bb4f8 100644
--- a/Core/Src/freertos.c
+++ b/Core/Src/freertos.c
@@ -127,7 +127,7 @@ void MX_FREERTOS_Init(void) {
   osThreadDef(anemometer, wind_task, osPriorityHigh, 0, 2*1024);// ���ٷ���
   anemometerHandle = osThreadCreate(osThread(anemometer), NULL);
 
-  osThreadDef(temhum_update_task, tem_hum_update_task, osPriorityAboveNormal, 0, 512);//��ʪ�ȣ�����ѹ����
+  osThreadDef(temhum_update_task, tem_hum_update_task, osPriorityAboveNormal, 0, 1024);//��ʪ�ȣ�����ѹ����
   temhum_update_taskHandle = osThreadCreate(osThread(temhum_update_task), NULL);
   
 //  osThreadDef(sensorTask, SensorTask, osPriorityRealtime, 0, 128);
diff --git a/Core/Src/main.c b/Core/Src/main.c
index 90768f8..5089718 100644
--- a/Core/Src/main.c
+++ b/Core/Src/main.c
@@ -175,7 +175,6 @@ void Flash_EnableReadProtection(void)
   HAL_ADCEx_Calibration_Start(&hadc1,ADC_SINGLE_ENDED);
   sht30_init();
   TMP117_Init();
-  MS56XX_Init();
   /* USER CODE END 2 */
 
   /* Call init function for freertos objects (in cmsis_os2.c) */
diff --git a/Drivers/MS5607/ms5607.c b/Drivers/MS5607/ms5607.c
index 6c7ff5f..c3bde7f 100644
--- a/Drivers/MS5607/ms5607.c
+++ b/Drivers/MS5607/ms5607.c
@@ -8,7 +8,7 @@ static void MS56XX_Reset(void)
 {
     uint8_t _cmd[] = {0x1e};
     HAL_I2C_Master_Transmit(&hi2c3, MS5607_ADDRESS, _cmd, 1, 0xff);
-    HAL_Delay(5);
+    osDelay(5);
 }
 
 static void MS56XX_Read_PromData(uint16_t *VAL_C)
@@ -19,11 +19,11 @@ static void MS56XX_Read_PromData(uint16_t *VAL_C)
     {
         HAL_I2C_Master_Transmit(&hi2c3, MS5607_ADDRESS, _cmd, 1, 0xff);
         HAL_I2C_Master_Receive(&hi2c3, MS5607_ADDRESS, temp_buff, 2, 0xff);
-        *(VAL_C + i) = (temp_buff[0] << 8)|temp_buff[1];
-        _cmd[0] += 2;
-        osDelay(1000);
+        *(VAL_C + i) = temp_buff[0];
+        *(VAL_C + i) <<= 8;
+        *(VAL_C + i) += temp_buff[1];
+        _cmd[0] += 0x02;
     }
-    
 }
 
 static uint16_t MS56XX_C_Value[8] = {0};
@@ -39,7 +39,7 @@ static uint32_t MS56XX_ReadD1_Press(void)
     uint8_t _cmd[] = {0x48};
     uint8_t _addr[] = {0x00};
     HAL_I2C_Master_Transmit(&hi2c3, MS5607_ADDRESS, _cmd, 1, 0xff);
-    osDelay(10);
+    osDelay(20);
     HAL_I2C_Master_Transmit(&hi2c3, MS5607_ADDRESS, _addr, 1, 0xff);
     HAL_I2C_Master_Receive(&hi2c3, MS5607_ADDRESS, D1_Value_Buff, 3, 0xff);
     
@@ -49,7 +49,6 @@ static uint32_t MS56XX_ReadD1_Press(void)
     press += D1_Value_Buff[1];
     press <<= 8;
     press += D1_Value_Buff[2];
-    term_printf("%x",press);
     return press;
 }
 
@@ -59,7 +58,7 @@ static uint32_t MS56XX_ReadD2_Temp(void)
     uint8_t _cmd[] = {0x58};
     uint8_t _addr[] = {0x00};
     HAL_I2C_Master_Transmit(&hi2c3, MS5607_ADDRESS, _cmd, 1, 0xff);
-    osDelay(10);
+    osDelay(20);
     HAL_I2C_Master_Transmit(&hi2c3, MS5607_ADDRESS, _addr, 1, 0xff);
     HAL_I2C_Master_Receive(&hi2c3, MS5607_ADDRESS, D2_Value_Buff, 3, 0xff);
     
@@ -72,29 +71,23 @@ static uint32_t MS56XX_ReadD2_Temp(void)
     return Temp;
 }
 
-static void MS56XX_GetTemperature (int32_t *dT, int32_t *MS56XX_Temperature)     //�����¶�
+static void MS56XX_GetTemperature (int32_t *dT, int32_t *MS56XX_Temp)     //�����¶�
 {
     uint32_t D2_Value = MS56XX_ReadD2_Temp();      //ѭ����ȡ D2
     
-    if(D2_Value > ((uint32_t)MS56XX_C_Value[5] * (0x00000001 << 8) ))
+//    term_printf("D2:%d\r\n", D2_Value);
+    
+    if(D2_Value > (MS56XX_C_Value[5] * 256))
     {
-        *dT  = D2_Value - (( uint32_t )MS56XX_C_Value[5] * (0x00000001 << 8));  //��ʽ dT = D2 - TREF = D2 - C5 * 2^8
-    }
-    else
+        *dT = D2_Value - MS56XX_C_Value[5] * 256;  //��ʽ dT = D2 - TREF = D2 - C5 * 2^8
+    }else
     {
-        *dT  = (( uint32_t ) MS56XX_C_Value[5] * (0x00000001 << 8) ) - D2_Value;     
+        *dT = MS56XX_C_Value[5] * 256 - D2_Value;  //��ʽ dT = D2 - TREF = D2 - C5 * 2^8
         *dT *= -1;
     }
-    *MS56XX_Temperature = 2000 + ( *dT * MS56XX_C_Value[6] ) / (0x00000001 << 23); //����¶�ֵ��100����2001��ʾ20.01��  ��ʽTEMP =20��C + dT * TEMPSENS =2000 + dT * C6 / 2^23
-
-    if(*MS56XX_Temperature < -6000) 
-    {
-        *MS56XX_Temperature=-6000;
-    }
-    if(*MS56XX_Temperature > 8500) 
-    {
-        *MS56XX_Temperature=8500;
-    }
+    
+//    term_printf("dT:%d\r\n", *dT);
+    *MS56XX_Temp = 2000 + *dT * ((int32_t)MS56XX_C_Value[6]/8388608.0); //����¶�ֵ��100����2001��ʾ20.01��  ��ʽTEMP =20��C + dT * TEMPSENS =2000 + dT * C6 / 2^23
 }
 
 uint8_t MS56XX_GetPressureTemp (float *Temp, float *Press)  //�����¶Ȳ���ѹ��
@@ -104,62 +97,76 @@ uint8_t MS56XX_GetPressureTemp (float *Temp, float *Press)  //
     uint32_t D1_Value = MS56XX_ReadD1_Press();      //ѭ����ȡ D1
     
     MS56XX_GetTemperature(&dT, &MS56XX_Temperature);//��ȡdT��Temp
+//    term_printf("TEMP:%d\r\n", MS56XX_Temperature);
     
-    int64_t OFF =  ((int64_t)MS56XX_C_Value[2] * (0x00000001 << 17)) + ((int64_t)MS56XX_C_Value[4] * dT )/ 64.0;    //��ʽ OFF = OFFT1 + TCO *dT = C2 *2^17 +(C4 *dT )/ 2^6
-    int64_t SENS = ((int64_t)MS56XX_C_Value[1] * (0x00000001 << 16)) + ((int64_t)MS56XX_C_Value[3] * dT )/ 128.0; //��ʽSENS = SENST1 + TCS* dT= C1 * 2^16 + (C3 * dT )/ 2^7
+//    term_printf("dT:%d\r\n", dT);
+//    term_printf("TEMP:%d\r\n", MS56XX_Temperature);
+    
+    int64_t OFF =  ((int64_t)MS56XX_C_Value[2] * 131072) + ((int64_t)MS56XX_C_Value[4] * dT )/ 64.0;    //��ʽ OFF = OFFT1 + TCO *dT = C2 *2^17 +(C4 *dT )/ 2^6
+    int64_t SENS = ((int64_t)MS56XX_C_Value[1] * 65536) + ((int64_t)MS56XX_C_Value[3] * dT )/ 128.0; //��ʽSENS = SENST1 + TCS* dT= C1 * 2^16 + (C3 * dT )/ 2^7
 
-    //�¶Ȳ�������    �߼���оƬ�ֲ�   
-    int32_t T2;
-    int64_t OFF2;
-    int64_t SENS2;
+//    term_printf("OFF:%d\r\n", OFF);
+//    term_printf("SENS:%d\r\n", SENS);
+    
+    //�¶Ȳ�������    �߼���оƬ�ֲ�
+    int64_t T2 = 0;
+    int64_t OFF2 = 0;
+    int64_t SENS2 = 0;
     if (MS56XX_Temperature < 2000 ) // second order temperature compensation when under 20 degrees C
     {
-        T2 = ( dT * dT ) / (( uint64_t )0x0000000001 << 31);
-        OFF2 = 61 *  (( MS56XX_Temperature - 2000 ) * ( MS56XX_Temperature - 2000 )) / 16;
-        SENS2 = 2 * (( MS56XX_Temperature - 2000 ) * ( MS56XX_Temperature - 2000 )) ;
-        if ( MS56XX_Temperature < -1500 )
+        T2 = (dT * dT) / 2147483648.0;
+        OFF2 = 61 *  ((MS56XX_Temperature - 2000) * (MS56XX_Temperature - 2000)) / 16;
+        SENS2 = 2 * ((MS56XX_Temperature - 2000) * (MS56XX_Temperature - 2000)) ;
+        if (MS56XX_Temperature < -1500)
         {
-            OFF2 = OFF2 + 15 * (( MS56XX_Temperature + 1500 ) * ( MS56XX_Temperature + 1500 ));
-            SENS2 = SENS2 + 8 * (( MS56XX_Temperature + 1500 ) * ( MS56XX_Temperature + 1500 ));
+            OFF2 = OFF2 + 15 * ((MS56XX_Temperature + 1500) * (MS56XX_Temperature + 1500));
+            SENS2 = SENS2 + 8 * ((MS56XX_Temperature + 1500) * (MS56XX_Temperature + 1500));
         }
     }
-    else        //(Temperature > 2000)
-    {
-        T2 = 0;
-        OFF2 = 0;
-        SENS2 = 0;
-    }
-
+    
+//    term_printf("T2:%d\r\n", T2);
     MS56XX_Temperature = MS56XX_Temperature - T2;
     OFF = OFF - OFF2;
     SENS = SENS - SENS2;
     
     
-    int32_t Tmp_Pressure = (D1_Value * SENS / (0x00000001 << 21) - OFF ) / (0x00000001 << 15); //��ʽ P = D1 * SENS - OFF = (D1 * SENS / 2^21 - OFF) / 2^15
+    int32_t Tmp_Pressure = ((int32_t)D1_Value * SENS/2097152 - OFF) / 32768; //��ʽ P = D1 * SENS - OFF = (D1 * SENS / 2^21 - OFF) / 2^15
 
-    *Temp = ((float)MS56XX_Temperature)/100;          //��λ  ��     
-    *Press = ((float)Tmp_Pressure)/100;           //��λ  mbar 
-    term_printf("%f", *Press);
-
-    if(*Temp<-60) 
+//    term_printf("\r\nC1-C6:%d %d %d %d %d %d\r\n", MS56XX_C_Value[1], MS56XX_C_Value[2], MS56XX_C_Value[3], MS56XX_C_Value[4], MS56XX_C_Value[5], MS56XX_C_Value[6]);
+//    term_printf("D1:%d\r\n", D1_Value);
+//    
+//    term_printf("dT:%d\r\n", dT);
+//    
+//    term_printf("OFF:%d\r\n", OFF);
+//    term_printf("SENS:%d\r\n", SENS);
+//    term_printf("P:%d\r\n", Tmp_Pressure);
+//    term_printf("TEMP:%d\r\n", MS56XX_Temperature);
+//    term_printf("PRESS:%d\r\n", Tmp_Pressure);
+    if(MS56XX_Temperature<-6000) 
     {
-        *Temp=-60;
+        MS56XX_Temperature=-6000;
+        *Temp = ((float)MS56XX_Temperature)/100;
         return 0;
     }
-    if(*Temp>85)
+    if(MS56XX_Temperature>8500)
     {
-        *Temp=85;
+        MS56XX_Temperature=8500;
+        *Temp = ((float)MS56XX_Temperature)/100;
         return 0;
     }
-    if(*Press<10)
+    if(Tmp_Pressure<1000)
     {
-        *Press=10;
+        Tmp_Pressure=1000;
+        *Press = ((float)Tmp_Pressure)/100;
         return 0;
     }
-    if(*Press>1200)
+    if(Tmp_Pressure>120000)
     {
-        *Press=1200;
+        Tmp_Pressure=120000;
+        *Press = ((float)Tmp_Pressure)/100;
         return 0;
     }
+    *Temp = ((float)MS56XX_Temperature)/100;
+    *Press = ((float)Tmp_Pressure)/100;
     return 1;
 }
diff --git a/Drivers/Sht3x/sht30.c b/Drivers/Sht3x/sht30.c
index 23bd38a..1c3aa95 100644
--- a/Drivers/Sht3x/sht30.c
+++ b/Drivers/Sht3x/sht30.c
@@ -83,7 +83,7 @@ u_int8_t sht30_init()
     if(ret ==  TRUE)
       term_printf("Sensor Sht30 Check OK.\r\n Temp:%.2f,Humi:%.2f\r\n", temp,humi);
     else
-      term_printf("Sensor Sht30 Check Err.\r\n");
+//      term_printf("Sensor Sht30 Check Err.\r\n");
     return 0;
 }
 

From c6ec628b9fda7783f9aa1a5f0d1a7f9510eaf4d4 Mon Sep 17 00:00:00 2001
From: 95384 <664090429@qq.com>
Date: Thu, 6 Mar 2025 08:57:04 +0800
Subject: [PATCH 05/12] =?UTF-8?q?=E6=B7=BB=E5=8A=A0SHT45=E9=A9=B1=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App/Src/anemometer_dev.c | 25 ++++++------
 Drivers/Sht3x/sht30.c    | 85 ++++++++++++++++++++++++++++++++--------
 2 files changed, 81 insertions(+), 29 deletions(-)

diff --git a/App/Src/anemometer_dev.c b/App/Src/anemometer_dev.c
index 4665d22..e298739 100644
--- a/App/Src/anemometer_dev.c
+++ b/App/Src/anemometer_dev.c
@@ -1089,7 +1089,7 @@ static void getTempHumiPress(void)
         //置错误标志位
         g_error_log.temp_error_TMP117 = 1;
         //使用备用温度
-        g_stMcs_Para.temperature = backupTemperature1;
+        g_stMcs_Para.temperature = backupTemperature2;
     }
     else
     {
@@ -1105,20 +1105,20 @@ static void getTempHumiPress(void)
         //关电重启,第一次进入错误判断，此时此时错误标志位为0，关电并置位错误标志位；
         //再进入错误标志位检测到错误标志位后开电
         //下一次监测如果SHT30恢复，则正常运行，如果没有恢复，电继续开着，保证温度传感器正常运行
-        if(g_error_log.temp_error_SHT30 == 0)
-        {
-            HAL_GPIO_WritePin(GPIOB, GPIO_SHT_PWR_EN_Pin, GPIO_PIN_RESET);
-            HAL_I2C_DeInit(&hi2c1);
-        }else
-        {
-            HAL_GPIO_WritePin(GPIOB, GPIO_SHT_PWR_EN_Pin, GPIO_PIN_SET);
-            MX_I2C1_Init();
-            sht30_init();
-        }
+//        if(g_error_log.temp_error_SHT30 == 0)
+//        {
+//            HAL_GPIO_WritePin(GPIOB, GPIO_SHT_PWR_EN_Pin, GPIO_PIN_RESET);
+//            HAL_I2C_DeInit(&hi2c1);
+//        }else
+//        {
+//            HAL_GPIO_WritePin(GPIOB, GPIO_SHT_PWR_EN_Pin, GPIO_PIN_SET);
+//            MX_I2C1_Init();
+//            sht30_init();
+//        }
         //置错误标志位
         g_error_log.temp_error_SHT30 = 1;
 #if TEMP_SENSOR == SHT30_SENSOR
-        g_stMcs_Para.temperature = backupTemperature1;
+        g_stMcs_Para.temperature = 0;
 #endif /*TEMP_SENSOR == SHT30_SENSOR*/
     }
     else
@@ -1151,6 +1151,7 @@ void tem_hum_update_task(void const * argument)
     if(tem_hun_check_flag)
     {
         //采集温湿度与大气压
+        osDelay(10);//等待传感器初始化
         getTempHumiPress();
     }
             
diff --git a/Drivers/Sht3x/sht30.c b/Drivers/Sht3x/sht30.c
index 1c3aa95..f9e7e7b 100644
--- a/Drivers/Sht3x/sht30.c
+++ b/Drivers/Sht3x/sht30.c
@@ -119,6 +119,51 @@ u_int8_t sht30_collect_data(stTempHumiSensor stSensorDev, float *temp, float *hu
 }
 
 
+/**
+  * @brief  ��ʪ�����ݲɼ�
+  * @param  
+  * @retval 
+  */
+u_int8_t sht45_collect_data(stTempHumiSensor stSensorDev, float *temp, float *humi)
+{
+    u_int8_t read_buff[6] = {0};
+    uint8_t _cmd[] = {0xFD};
+
+    u_int16_t temp_value;
+    u_int16_t humi_value;
+
+    HAL_I2C_Master_Transmit(&hi2c1,stSensorDev.i2c_reg_addr,_cmd,1,0xff);
+    osDelay(15);
+
+    if(HAL_I2C_Master_Receive(&hi2c1,stSensorDev.i2c_reg_addr,read_buff,6,0xff) != HAL_OK){
+        return HAL_ERROR;
+    }
+       
+    if(CheckCrc8(read_buff, 0xFF) != read_buff[2] && CheckCrc8(&read_buff[3], 0xFF) != read_buff[5]){
+        return HAL_ERROR;
+    }
+
+     temp_value = ((u_int16_t)read_buff[0]<<8)|read_buff[1];
+     *temp = -45 + 175*((float)temp_value/65535);
+
+     humi_value = ((u_int16_t)read_buff[3]<<8)|read_buff[4];
+     *humi = -6 + 125*((float)humi_value / 65535);
+
+    return HAL_OK;
+}
+
+static float calculateAverage(float arr[], int avgLength) {
+    float sum = 0;
+    
+    // �������飨���10��Ԫ�أ����ռ�����ֱֵ���ﵽָ������
+    for (int i = 0; i < 10; ++i) {
+            sum += arr[i];
+    }
+    
+    // ����ƽ��ֵ���������ֵ
+    float average = sum / avgLength;
+    return average;
+}
 /**
   * @brief  ��ȡ��ʪ������
   * @param  
@@ -126,48 +171,54 @@ u_int8_t sht30_collect_data(stTempHumiSensor stSensorDev, float *temp, float *hu
   */
 #define COLLECT_DATA_NUM  10
 BOOL get_temp_humi_data(float* temdata, float* humidata)
-{   
-    U_DataType collect_temdata[COLLECT_DATA_NUM]={0x00};
-    U_DataType collect_humidata[COLLECT_DATA_NUM]={0x00};
-    U_DataType tmp_temdata,tmp_humidata;
-   
+{      
+    float collect_temdata[COLLECT_DATA_NUM] = {0};
+    float collect_humidata[COLLECT_DATA_NUM] = {0};
+    float tmp_temdata,tmp_humidata;
+    uint8_t ret_falt = 0;;
+    
     for(int i=0; i<COLLECT_DATA_NUM; i++){
-        int ret = sht30_collect_data(g_stTempHumiSensor,&collect_temdata[i].fValue, &collect_humidata[i].fValue);
+        int ret = sht45_collect_data(g_stTempHumiSensor,&collect_temdata[i], &collect_humidata[i]);
        // AssertError(ret == HAL_OK, return FALSE, "sht30����ʧ��");
         if(ret == HAL_ERROR) 
-//          return FALSE;
-            goto error_return;
+        {
+            ret_falt++;
+        }
         osDelay(1);
     }
+    if(ret_falt >= COLLECT_DATA_NUM)
+    {
+        goto error_return;
+    }
     
-    tmp_temdata = filter_middle(collect_temdata,COLLECT_DATA_NUM, FILTER_DATA_TYPE_FLOAT);
-    tmp_humidata = filter_middle(collect_humidata,COLLECT_DATA_NUM, FILTER_DATA_TYPE_FLOAT);
+    tmp_temdata = calculateAverage(collect_temdata,COLLECT_DATA_NUM - ret_falt);
+    tmp_humidata = calculateAverage(collect_humidata,COLLECT_DATA_NUM - ret_falt);
     
 //    ����������
 //    AssertError((tmp_temdata.fValue >= -40) && (tmp_temdata.fValue <= 85), return FALSE, "sht30�¶�ֵУ��ʧ��");
 //    AssertError((tmp_humidata.fValue >= 0) && (tmp_humidata.fValue <= 100), return FALSE, "sht30ʪ��ֵУ��ʧ��");
-    if(tmp_temdata.fValue < -50)
+    if(tmp_temdata < -50)
     {
 //        tmp_temdata.fValue = -40;
 //        term_printf("sht30�¶�ֵУ��ʧ��");
 //        return FALSE;
         goto error_return;
     }
-    if(tmp_temdata.fValue > 125)
+    if(tmp_temdata > 125)
     {
 //        tmp_temdata.fValue = 125;
 //        term_printf("sht30�¶�ֵУ��ʧ��");
-//        return FALSE;
+//        return FALSE; 
         goto error_return;
     }
-    if(tmp_humidata.fValue < 0)
+    if(tmp_humidata < 0)
     {
 //        tmp_humidata.fValue = 0;
 //        term_printf("sht30ʪ��ֵУ��ʧ��");
 //        return FALSE;
         goto error_return;
     }
-    if(tmp_humidata.fValue > 100)
+    if(tmp_humidata > 100)
     {
 //        tmp_humidata.fValue = 100;
 //        term_printf("sht3ʪ��ֵУ��ʧ��");
@@ -175,8 +226,8 @@ BOOL get_temp_humi_data(float* temdata, float* humidata)
         goto error_return;
     }
     
-    *temdata = tmp_temdata.fValue;
-    *humidata = tmp_humidata.fValue;
+    *temdata = tmp_temdata;
+    *humidata = tmp_humidata;
     
     //g_stTempHumiData.temp =  tmp_temdata.fValue;
     //g_stTempHumiData.humi =  tmp_humidata.fValue;

From 5bf6c8f9951cfdc28d7c0a9da503cc9d61394c5e Mon Sep 17 00:00:00 2001
From: 95384 <664090429@qq.com>
Date: Fri, 7 Mar 2025 17:09:42 +0800
Subject: [PATCH 06/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=A0=E6=84=9F?=
 =?UTF-8?q?=E5=99=A8=E9=94=99=E8=AF=AF=E6=9D=A1=E4=BB=B6=EF=BC=8C=E5=B0=86?=
 =?UTF-8?q?=E8=B6=85=E8=8C=83=E5=9B=B4=E6=95=B0=E6=8D=AE=E7=AE=97=E4=BD=9C?=
 =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E6=95=B0=E6=8D=AE=EF=BC=8C=E9=99=90=E5=88=B6?=
 =?UTF-8?q?=E8=8C=83=E5=9B=B4=EF=BC=8C=E6=AF=8F=E4=B8=AA=E4=BC=A0=E6=84=9F?=
 =?UTF-8?q?=E5=99=A8=E6=AF=8F=E6=AC=A1=E9=87=8710=E9=81=8D=E9=81=BF?=
 =?UTF-8?q?=E5=85=8D=E5=8D=95=E6=AC=A1=E9=87=87=E6=A0=B7=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E5=88=A4=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Drivers/MS5607/ms5607.c | 108 ++++++++++++++++++++++++++++++----------
 Drivers/MS5607/ms5607.h |   3 +-
 Drivers/Sht3x/sht30.c   |  47 ++++++-----------
 Drivers/Sht3x/sht30.h   |   3 +-
 Drivers/Tmp117/tmp117.c |  47 ++++++++++++++---
 5 files changed, 142 insertions(+), 66 deletions(-)

diff --git a/Drivers/MS5607/ms5607.c b/Drivers/MS5607/ms5607.c
index c3bde7f..4b30ff8 100644
--- a/Drivers/MS5607/ms5607.c
+++ b/Drivers/MS5607/ms5607.c
@@ -33,15 +33,24 @@ void MS56XX_Init(void)
     MS56XX_Read_PromData(MS56XX_C_Value);
 }
 
-static uint32_t MS56XX_ReadD1_Press(void)
+static HAL_StatusTypeDef MS56XX_ReadD1_Press(uint32_t *D1_Value)
 {
     uint8_t D1_Value_Buff[3] = {0xFF, 0xFF, 0xFF};
     uint8_t _cmd[] = {0x48};
     uint8_t _addr[] = {0x00};
-    HAL_I2C_Master_Transmit(&hi2c3, MS5607_ADDRESS, _cmd, 1, 0xff);
+    if(HAL_I2C_Master_Transmit(&hi2c3, MS5607_ADDRESS, _cmd, 1, 0xff) != HAL_OK)
+    {
+        return HAL_ERROR;
+    }
     osDelay(20);
-    HAL_I2C_Master_Transmit(&hi2c3, MS5607_ADDRESS, _addr, 1, 0xff);
-    HAL_I2C_Master_Receive(&hi2c3, MS5607_ADDRESS, D1_Value_Buff, 3, 0xff);
+    if(HAL_I2C_Master_Transmit(&hi2c3, MS5607_ADDRESS, _addr, 1, 0xff) != HAL_OK)
+    {
+        return HAL_ERROR;
+    }
+    if(HAL_I2C_Master_Receive(&hi2c3, MS5607_ADDRESS, D1_Value_Buff, 3, 0xff) != HAL_OK)
+    {
+        return HAL_ERROR;
+    }
     
     uint32_t press;
     press = D1_Value_Buff[0];
@@ -49,18 +58,28 @@ static uint32_t MS56XX_ReadD1_Press(void)
     press += D1_Value_Buff[1];
     press <<= 8;
     press += D1_Value_Buff[2];
-    return press;
+    *D1_Value = press;
+    return HAL_OK;
 }
 
-static uint32_t MS56XX_ReadD2_Temp(void)
+static HAL_StatusTypeDef MS56XX_ReadD2_Temp(uint32_t *D2_Value_)
 {
     uint8_t D2_Value_Buff[3] = {0x00, 0x00, 0x00};
     uint8_t _cmd[] = {0x58};
     uint8_t _addr[] = {0x00};
-    HAL_I2C_Master_Transmit(&hi2c3, MS5607_ADDRESS, _cmd, 1, 0xff);
+    if(HAL_I2C_Master_Transmit(&hi2c3, MS5607_ADDRESS, _cmd, 1, 0xff) != HAL_OK)
+    {
+        return HAL_ERROR;
+    }
     osDelay(20);
-    HAL_I2C_Master_Transmit(&hi2c3, MS5607_ADDRESS, _addr, 1, 0xff);
-    HAL_I2C_Master_Receive(&hi2c3, MS5607_ADDRESS, D2_Value_Buff, 3, 0xff);
+    if(HAL_I2C_Master_Transmit(&hi2c3, MS5607_ADDRESS, _addr, 1, 0xff) != HAL_OK)
+    {
+        return HAL_ERROR;
+    }
+    if(HAL_I2C_Master_Receive(&hi2c3, MS5607_ADDRESS, D2_Value_Buff, 3, 0xff) != HAL_OK)
+    {
+        return HAL_ERROR;
+    }
     
     uint32_t Temp;
     Temp = D2_Value_Buff[0];
@@ -68,13 +87,17 @@ static uint32_t MS56XX_ReadD2_Temp(void)
     Temp += D2_Value_Buff[1];
     Temp <<= 8;
     Temp += D2_Value_Buff[2];
-    return Temp;
+    *D2_Value_ = Temp;
+    return HAL_OK;
 }
 
-static void MS56XX_GetTemperature (int32_t *dT, int32_t *MS56XX_Temp)     //�����¶�
+static HAL_StatusTypeDef MS56XX_GetTemperature (int32_t *dT, int32_t *MS56XX_Temp)     //�����¶�
 {
-    uint32_t D2_Value = MS56XX_ReadD2_Temp();      //ѭ����ȡ D2
-    
+    uint32_t D2_Value;
+    if(MS56XX_ReadD2_Temp(&D2_Value) != HAL_OK)      //ѭ����ȡ D2
+    {
+        return HAL_ERROR;
+    }
 //    term_printf("D2:%d\r\n", D2_Value);
     
     if(D2_Value > (MS56XX_C_Value[5] * 256))
@@ -88,15 +111,23 @@ static void MS56XX_GetTemperature (int32_t *dT, int32_t *MS56XX_Temp)     //
     
 //    term_printf("dT:%d\r\n", *dT);
     *MS56XX_Temp = 2000 + *dT * ((int32_t)MS56XX_C_Value[6]/8388608.0); //����¶�ֵ��100����2001��ʾ20.01��  ��ʽTEMP =20��C + dT * TEMPSENS =2000 + dT * C6 / 2^23
+    return HAL_OK;
 }
 
-uint8_t MS56XX_GetPressureTemp (float *Temp, float *Press)  //�����¶Ȳ���ѹ��
+static HAL_StatusTypeDef MS56XX_GetPressureTemp(float *Temp, float *Press)  //�����¶Ȳ���ѹ��
 {
     int32_t dT;
     int32_t MS56XX_Temperature;
-    uint32_t D1_Value = MS56XX_ReadD1_Press();      //ѭ����ȡ D1
+    uint32_t D1_Value;
+    if(MS56XX_ReadD1_Press(&D1_Value) != HAL_OK)      //ѭ����ȡ D1
+    {
+        return HAL_ERROR;
+    }
     
-    MS56XX_GetTemperature(&dT, &MS56XX_Temperature);//��ȡdT��Temp
+    if(MS56XX_GetTemperature(&dT, &MS56XX_Temperature) != HAL_OK)//��ȡdT��Temp
+    {
+        return HAL_ERROR;
+    }
 //    term_printf("TEMP:%d\r\n", MS56XX_Temperature);
     
 //    term_printf("dT:%d\r\n", dT);
@@ -145,28 +176,55 @@ uint8_t MS56XX_GetPressureTemp (float *Temp, float *Press)  //
     if(MS56XX_Temperature<-6000) 
     {
         MS56XX_Temperature=-6000;
-        *Temp = ((float)MS56XX_Temperature)/100;
-        return 0;
     }
     if(MS56XX_Temperature>8500)
     {
         MS56XX_Temperature=8500;
-        *Temp = ((float)MS56XX_Temperature)/100;
-        return 0;
     }
     if(Tmp_Pressure<1000)
     {
         Tmp_Pressure=1000;
-        *Press = ((float)Tmp_Pressure)/100;
-        return 0;
     }
     if(Tmp_Pressure>120000)
     {
         Tmp_Pressure=120000;
-        *Press = ((float)Tmp_Pressure)/100;
-        return 0;
     }
     *Temp = ((float)MS56XX_Temperature)/100;
     *Press = ((float)Tmp_Pressure)/100;
-    return 1;
+    return HAL_OK;
 }
+
+static float calculateAverage(float arr[], int avgLength) {
+    float sum = 0;
+    
+    // �������飨���10��Ԫ�أ����ռ�����ֱֵ���ﵽָ������
+    for (int i = 0; i < 10; ++i) {
+            sum += arr[i];
+    }
+    
+    // ����ƽ��ֵ���������ֵ
+    float average = sum / avgLength;
+    return average;
+}
+
+#define COLLECT_DATA_NUM  10
+HAL_StatusTypeDef MS56XX_GetPressure(float *Press)
+{
+    float temp_buff;
+    float pressure_buff[COLLECT_DATA_NUM] = {0};
+    uint8_t ret_falt = 0;
+    for(uint8_t i = 0;i<COLLECT_DATA_NUM;i++)
+    {
+        if(MS56XX_GetPressureTemp(&temp_buff, &pressure_buff[i]) != HAL_OK)
+        {
+            ret_falt++;
+            pressure_buff[i] = 0;
+        }
+    }
+    if(ret_falt >= COLLECT_DATA_NUM)
+    {
+        return HAL_ERROR;
+    }
+    *Press = calculateAverage( pressure_buff,COLLECT_DATA_NUM - ret_falt);
+    return HAL_OK;
+}
\ No newline at end of file
diff --git a/Drivers/MS5607/ms5607.h b/Drivers/MS5607/ms5607.h
index 6a96947..1da2607 100644
--- a/Drivers/MS5607/ms5607.h
+++ b/Drivers/MS5607/ms5607.h
@@ -8,11 +8,12 @@ extern "C" {
 /* Includes ------------------------------------------------------------------*/
 #include "main.h"
 #include "comm_types.h"
+#include "cmsis_os.h"
     
 #define MS5607_ADDRESS  0x77<<1
     
 void MS56XX_Init(void);
-uint8_t MS56XX_GetPressureTemp (float *Temp, float *Press);
+HAL_StatusTypeDef MS56XX_GetPressure(float *Press);
 
 #ifdef __cplusplus
 }
diff --git a/Drivers/Sht3x/sht30.c b/Drivers/Sht3x/sht30.c
index f9e7e7b..ab746aa 100644
--- a/Drivers/Sht3x/sht30.c
+++ b/Drivers/Sht3x/sht30.c
@@ -170,19 +170,19 @@ static float calculateAverage(float arr[], int avgLength) {
   * @retval 
   */
 #define COLLECT_DATA_NUM  10
-BOOL get_temp_humi_data(float* temdata, float* humidata)
+HAL_StatusTypeDef get_temp_humi_data(float* temdata, float* humidata)
 {      
     float collect_temdata[COLLECT_DATA_NUM] = {0};
     float collect_humidata[COLLECT_DATA_NUM] = {0};
     float tmp_temdata,tmp_humidata;
-    uint8_t ret_falt = 0;;
+    uint8_t ret_falt = 0;
     
     for(int i=0; i<COLLECT_DATA_NUM; i++){
-        int ret = sht45_collect_data(g_stTempHumiSensor,&collect_temdata[i], &collect_humidata[i]);
-       // AssertError(ret == HAL_OK, return FALSE, "sht30����ʧ��");
-        if(ret == HAL_ERROR) 
+        if(sht45_collect_data(g_stTempHumiSensor,&collect_temdata[i], &collect_humidata[i]) == HAL_ERROR) 
         {
             ret_falt++;
+            collect_temdata[i] = 0;
+            collect_humidata[i] = 0;
         }
         osDelay(1);
     }
@@ -194,49 +194,32 @@ BOOL get_temp_humi_data(float* temdata, float* humidata)
     tmp_temdata = calculateAverage(collect_temdata,COLLECT_DATA_NUM - ret_falt);
     tmp_humidata = calculateAverage(collect_humidata,COLLECT_DATA_NUM - ret_falt);
     
-//    ����������
-//    AssertError((tmp_temdata.fValue >= -40) && (tmp_temdata.fValue <= 85), return FALSE, "sht30�¶�ֵУ��ʧ��");
-//    AssertError((tmp_humidata.fValue >= 0) && (tmp_humidata.fValue <= 100), return FALSE, "sht30ʪ��ֵУ��ʧ��");
-    if(tmp_temdata < -50)
+    if(tmp_temdata < -50.0)
     {
-//        tmp_temdata.fValue = -40;
-//        term_printf("sht30�¶�ֵУ��ʧ��");
-//        return FALSE;
-        goto error_return;
+        tmp_temdata = -50.0;
     }
-    if(tmp_temdata > 125)
+    if(tmp_temdata > 125.0)
     {
-//        tmp_temdata.fValue = 125;
-//        term_printf("sht30�¶�ֵУ��ʧ��");
-//        return FALSE; 
-        goto error_return;
+        tmp_temdata = 125.0;
     }
-    if(tmp_humidata < 0)
+    if(tmp_humidata < 0.0)
     {
-//        tmp_humidata.fValue = 0;
-//        term_printf("sht30ʪ��ֵУ��ʧ��");
-//        return FALSE;
-        goto error_return;
+        tmp_humidata = 0.0;
     }
-    if(tmp_humidata > 100)
+    if(tmp_humidata > 100.0)
     {
-//        tmp_humidata.fValue = 100;
-//        term_printf("sht3ʪ��ֵУ��ʧ��");
-//        return FALSE;
-        goto error_return;
+        tmp_humidata = 100.0;
     }
     
     *temdata = tmp_temdata;
     *humidata = tmp_humidata;
     
-    //g_stTempHumiData.temp =  tmp_temdata.fValue;
-    //g_stTempHumiData.humi =  tmp_humidata.fValue;
-    return TRUE;
+    return HAL_OK;
     
 error_return:
     *temdata = 0;
     *humidata = 0;
-    return FALSE;
+    return HAL_ERROR;
 }
 
 #if 0
diff --git a/Drivers/Sht3x/sht30.h b/Drivers/Sht3x/sht30.h
index c5fc1cd..15e7990 100644
--- a/Drivers/Sht3x/sht30.h
+++ b/Drivers/Sht3x/sht30.h
@@ -2,6 +2,7 @@
 #define __SHT30_H_
 
 #include "comm_types.h"
+#include "main.h"
 
 #define SHT30           "SHT30"
 
@@ -21,6 +22,6 @@ typedef struct _stTempHumiData{
 extern stTempHumiData g_stTempHumiData;
 
 u_int8_t sht30_init();
-BOOL get_temp_humi_data(float* temdata, float* humidata);
+HAL_StatusTypeDef get_temp_humi_data(float* temdata, float* humidata);
 //void TEST_read_sht30_value();
 #endif
diff --git a/Drivers/Tmp117/tmp117.c b/Drivers/Tmp117/tmp117.c
index d033ba0..03cd9c4 100644
--- a/Drivers/Tmp117/tmp117.c
+++ b/Drivers/Tmp117/tmp117.c
@@ -1,5 +1,6 @@
 #include "tmp117.h"
 #include "i2c.h"
+#include "cmsis_os.h"
 
 
 // ��ʼ���¶ȴ�����
@@ -17,28 +18,60 @@ HAL_StatusTypeDef TMP117_Read(uint8_t reg, uint8_t *buffer) {
                            I2C_MEMADD_SIZE_8BIT, buffer, 2, 100);
 }
 
+static float calculateAverage(float arr[], int avgLength) {
+    float sum = 0;
+    
+    // �������飨���10��Ԫ�أ����ռ�����ֱֵ���ﵽָ������
+    for (int i = 0; i < 10; ++i) {
+            sum += arr[i];
+    }
+    
+    // ����ƽ��ֵ���������ֵ
+    float average = sum / avgLength;
+    return average;
+}
 // ��ȡ�¶�ֵ����λ���棩
+#define COLLECT_DATA_NUM  10
 HAL_StatusTypeDef TMP117_Get_Temp(float *temp)
 {
     uint8_t raw_data[2] = {0};
     int16_t temp_raw;
+    uint8_t ret_falt = 0;
+    float ret_temp;
+    float temp_temp[COLLECT_DATA_NUM] = {0};
 
-    if (HAL_OK == TMP117_Read(TMP117_TEMP_REG, raw_data)) {
-        temp_raw = (raw_data[0] << 8) | raw_data[1];
-        *temp = temp_raw * 0.0078125f;
+    for(int i = 0; i<COLLECT_DATA_NUM; i++)
+    {
+        TMP117_Init();
+        osDelay(20);
+        if(TMP117_Read(TMP117_TEMP_REG, raw_data) != HAL_OK)
+        {
+            ret_falt++;
+            temp_temp[i] = 0;
+        }else
+        {
+            temp_raw = (raw_data[0] << 8) | raw_data[1];
+            temp_temp[i] = temp_raw * 0.0078125f;
+        }
+        
     }
-    else
+    if(ret_falt >= COLLECT_DATA_NUM)
     {
         *temp = 0;
         return HAL_ERROR;
     }
-    if(*temp <= -60)
+    
+    ret_temp = calculateAverage(temp_temp, COLLECT_DATA_NUM - ret_falt);
+    
+    if(ret_temp <= -60)
     {
         *temp = -60;
-    }
-    if(*temp >= 150)
+    }else if(ret_temp >= 150)
     {
         *temp = 150;
+    }else
+    {
+        *temp = ret_temp;
     }
     return HAL_OK;
 }

From dfc64ef786b075f08dc4526d5aaaeff700582a68 Mon Sep 17 00:00:00 2001
From: 95384 <664090429@qq.com>
Date: Fri, 7 Mar 2025 17:17:19 +0800
Subject: [PATCH 07/12] =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E6=B8=A9=E6=B9=BF=E5=BA=A6=E5=A4=A7=E6=B0=94=E5=8E=8B=E4=BC=A0?=
 =?UTF-8?q?=E6=84=9F=E5=99=A8=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App/Src/anemometer_dev.c | 87 +++++++++++++---------------------------
 1 file changed, 27 insertions(+), 60 deletions(-)

diff --git a/App/Src/anemometer_dev.c b/App/Src/anemometer_dev.c
index e298739..97059a8 100644
--- a/App/Src/anemometer_dev.c
+++ b/App/Src/anemometer_dev.c
@@ -1068,67 +1068,9 @@ void my_update_mcs_param(float new_wind_speed, float new_wind_dirction)
 //采集温度，湿度，大气压
 static void getTempHumiPress(void)
 {
-    //采集备用温度与大气压
     float backupTemperature1;
-    float backupTemperature2;
-//    uint8_t hp203_ret = get_HP203_data(&backupTemperature1, &g_stMcs_Para.pressure);
-    uint8_t hp203_ret = MS56XX_GetPressureTemp(&backupTemperature1, &g_stMcs_Para.pressure);
-    uint8_t sht30_ret = get_temp_humi_data(&backupTemperature2, &g_stMcs_Para.humidity);
-#if TEMP_SENSOR == SHT30_SENSOR
-    g_stMcs_Para.temperature = backupTemperature2;
-#endif /*TEMP_SENSOR == SHT30_SENSOR*/
-
-#if TEMP_SENSOR == TMP117_SENSOR
-    TMP117_Init();
-    osDelay(20);
-    uint8_t tmp117_ret = TMP117_Get_Temp(&g_stMcs_Para.temperature);
-    
-//    TMP117出问题
-    if(tmp117_ret != HAL_OK)
-    {
-        //置错误标志位
-        g_error_log.temp_error_TMP117 = 1;
-        //使用备用温度
-        g_stMcs_Para.temperature = backupTemperature2;
-    }
-    else
-    {
-        //恢复错误标志位
-        g_error_log.temp_error_TMP117 = 0;
-    }
-#endif /*TEMP_SENSOR == TMP117_SENSOR*/
-    
-    //    SHT30出问题
-    if(sht30_ret == FALSE)
-    {
-        //错误处理
-        //关电重启,第一次进入错误判断，此时此时错误标志位为0，关电并置位错误标志位；
-        //再进入错误标志位检测到错误标志位后开电
-        //下一次监测如果SHT30恢复，则正常运行，如果没有恢复，电继续开着，保证温度传感器正常运行
-//        if(g_error_log.temp_error_SHT30 == 0)
-//        {
-//            HAL_GPIO_WritePin(GPIOB, GPIO_SHT_PWR_EN_Pin, GPIO_PIN_RESET);
-//            HAL_I2C_DeInit(&hi2c1);
-//        }else
-//        {
-//            HAL_GPIO_WritePin(GPIOB, GPIO_SHT_PWR_EN_Pin, GPIO_PIN_SET);
-//            MX_I2C1_Init();
-//            sht30_init();
-//        }
-        //置错误标志位
-        g_error_log.temp_error_SHT30 = 1;
-#if TEMP_SENSOR == SHT30_SENSOR
-        g_stMcs_Para.temperature = 0;
-#endif /*TEMP_SENSOR == SHT30_SENSOR*/
-    }
-    else
-    {
-        //恢复错误标志位
-        g_error_log.temp_error_SHT30 = 0;
-    }
-    
-        //HP203B出问题
-    if(hp203_ret == FALSE)
+    //采集MS5607并判错
+    if(MS56XX_GetPressure(&g_stMcs_Para.pressure) != HAL_OK)
     {
         //置错误标志位
         g_error_log.temp_error_HP203B = 1;
@@ -1139,6 +1081,31 @@ static void getTempHumiPress(void)
         //恢复错误标志位
         g_error_log.temp_error_HP203B = 0;
     }
+    //采集SHT45并判错
+    if(get_temp_humi_data(&backupTemperature1, &g_stMcs_Para.humidity) != HAL_OK)
+    {
+        //错误处理
+        //置错误标志位
+        g_error_log.temp_error_SHT30 = 1;
+    }
+    else
+    {
+        //恢复错误标志位
+        g_error_log.temp_error_SHT30 = 0;
+    }
+    //采集TMP117并判错
+    if(TMP117_Get_Temp(&g_stMcs_Para.temperature) != HAL_OK)
+    {
+        //置错误标志位
+        g_error_log.temp_error_TMP117 = 1;
+        //使用备用温度
+        g_stMcs_Para.temperature = backupTemperature1;
+    }
+    else
+    {
+        //恢复错误标志位
+        g_error_log.temp_error_TMP117 = 0;
+    }
 }
 
 void tem_hum_update_task(void const * argument)

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 08/12] =?UTF-8?q?=E9=87=87=E9=9B=8610=E6=AC=A1=E6=B0=94?=
 =?UTF-8?q?=E5=8E=8B=EF=BC=8C=E8=B6=85=E8=BF=87=E8=8C=83=E5=9B=B4=E7=AE=97?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=EF=BC=8C=E4=B8=8D=E6=8A=A5=E9=94=99=E5=B9=B3?=
 =?UTF-8?q?=E5=9D=87=E5=80=BC=E8=BF=94=E5=9B=9E=E6=B0=94=E5=8E=8B=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=EF=BC=8C=E6=B0=94=E5=8E=8B=E4=BC=A0=E6=84=9F=E5=99=A8?=
 =?UTF-8?q?D1=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;

From bb5e52ff5208481ffa580043bb350c0ed5f9d6b7 Mon Sep 17 00:00:00 2001
From: 95384 <664090429@qq.com>
Date: Mon, 10 Mar 2025 09:13:25 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E5=BC=80=E6=9C=BA=E4=B8=A4=E7=A7=92?=
 =?UTF-8?q?=E5=90=8E=E5=BC=80=E5=90=AF=E9=80=9A=E8=AE=AF=EF=BC=8C=E9=81=BF?=
 =?UTF-8?q?=E5=85=8D=E6=8B=BF=E6=95=B0=E6=8D=AE=E6=97=B6=E4=BC=A0=E6=84=9F?=
 =?UTF-8?q?=E5=99=A8=E8=BF=98=E6=B2=A1=E8=BF=94=E6=95=B0=E6=8D=AE=E5=9B=9E?=
 =?UTF-8?q?=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Core/Src/freertos.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Core/Src/freertos.c b/Core/Src/freertos.c
index 24bb4f8..c4abf55 100644
--- a/Core/Src/freertos.c
+++ b/Core/Src/freertos.c
@@ -150,7 +150,7 @@ void MX_FREERTOS_Init(void) {
 void StartDefaultTask(void const * argument)
 {
   /* USER CODE BEGIN StartDefaultTask */
-
+    osDelay(2000);
   /* Infinite loop */
   for(;;)
   {

From 3d1d04b8099ac1144f25b823f25112d849a1627c Mon Sep 17 00:00:00 2001
From: 95384 <664090429@qq.com>
Date: Mon, 10 Mar 2025 10:35:45 +0800
Subject: [PATCH 10/12] =?UTF-8?q?=E6=B9=BF=E5=BA=A6=E4=BC=A0=E6=84=9F?=
 =?UTF-8?q?=E5=99=A8=E5=A4=B1=E6=95=88=E5=90=8E=E9=87=8D=E6=96=B0=E4=B8=8A?=
 =?UTF-8?q?=E7=94=B5=EF=BC=8C=E9=87=8D=E6=96=B0=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?IIC=EF=BC=8C=E5=8F=AA=E6=89=A7=E8=A1=8C=E4=B8=80=E6=AC=A1?=
 =?UTF-8?q?=EF=BC=8C=E9=81=BF=E5=85=8D=E6=B8=A9=E5=BA=A6=E4=BC=A0=E6=84=9F?=
 =?UTF-8?q?=E5=99=A8=E5=8F=97=E5=BD=B1=E5=93=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App/Src/anemometer_dev.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/App/Src/anemometer_dev.c b/App/Src/anemometer_dev.c
index ae96bb5..fec93d5 100644
--- a/App/Src/anemometer_dev.c
+++ b/App/Src/anemometer_dev.c
@@ -1065,6 +1065,8 @@ void my_update_mcs_param(float new_wind_speed, float new_wind_dirction)
         win_10min.index = (win_10min.index + 1) % g_usrConfigInfo.speed_average_time;//更新索引
 }
 
+
+uint8_t SHT45_ERR_NUM = 0;
 //采集温度，湿度，大气压
 static void getTempHumiPress(void)
 {
@@ -1085,6 +1087,24 @@ static void getTempHumiPress(void)
     if(get_temp_humi_data(&backupTemperature1, &g_stMcs_Para.humidity) != HAL_OK)
     {
         //错误处理
+        //断电重启，本次关电，下次上电，下下次返回正常数据
+        if(g_error_log.temp_error_SHT30 == 0)
+        {
+            HAL_GPIO_WritePin(GPIOB, GPIO_SHT_PWR_EN_Pin, GPIO_PIN_RESET);
+            HAL_I2C_DeInit(&hi2c1);
+            SHT45_ERR_NUM = 1;
+        }else
+        {
+            //确保只执行一次重新初始化程序
+            if(SHT45_ERR_NUM == 1)
+            {
+                HAL_GPIO_WritePin(GPIOB, GPIO_SHT_PWR_EN_Pin, GPIO_PIN_SET);
+                osDelay(1);
+                MX_I2C1_Init();
+                TMP117_Init();//TMP117是同一个电源，重新上电需要初始化
+                SHT45_ERR_NUM = 0;
+            }
+        }
         //置错误标志位
         g_error_log.temp_error_SHT30 = 1;
     }

From 0aa2ed31e41b2e6a3be9705e4ffb8a0c75636894 Mon Sep 17 00:00:00 2001
From: 95384 <664090429@qq.com>
Date: Tue, 11 Mar 2025 18:17:06 +0800
Subject: [PATCH 11/12] =?UTF-8?q?Flash=E6=B7=BB=E5=8A=A0=E6=8D=A2=E8=83=BD?=
 =?UTF-8?q?=E5=99=A8=E5=8C=B9=E9=85=8D=E5=B1=82=E5=BB=B6=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App/Inc/frt_protocol.h   | 53 ++++++++++++++++++++--------------------
 App/Inc/inflash.h        |  1 +
 App/Src/anemometer_dev.c |  8 +++---
 App/Src/frt_protocol.c   | 40 +++++++++++++++++++++++++++---
 App/Src/inflash.c        |  1 +
 5 files changed, 69 insertions(+), 34 deletions(-)

diff --git a/App/Inc/frt_protocol.h b/App/Inc/frt_protocol.h
index a0f6a57..152e34f 100644
--- a/App/Inc/frt_protocol.h
+++ b/App/Inc/frt_protocol.h
@@ -58,32 +58,33 @@ typedef enum
    FRT_REGISTER_COEFFICIENT                    = 34, /* ճ������ϵ��    */
    FRT_REGISTER_DISTANCE_NS                    = 35, /* �ϱ��������������  */
    FRT_REGISTER_DISTANCE_WE                    = 36, /* �����������������  */
-   FRT_REGISTER_ERROR_LOG                      = 37, /* ������־        */
-   FRT_REGISTER_WIND_C_NS                      = 38, /* ����õ����ϱ�����  */
-   FRT_REGISTER_WIND_C_WE                      = 39, /* ����õ��Ķ�������  */
-   FRT_REGISTER_LINEAR_POINT_X_1               = 40, /* ���Բ�ֵԭʼ��1 */
-   FRT_REGISTER_LINEAR_POINT_X_2               = 41, /* ���Բ�ֵԭʼ��2 */
-   FRT_REGISTER_LINEAR_POINT_X_3               = 42, /* ���Բ�ֵԭʼ��3 */
-   FRT_REGISTER_LINEAR_POINT_X_4               = 43, /* ���Բ�ֵԭʼ��4 */
-   FRT_REGISTER_LINEAR_POINT_X_5               = 44, /* ���Բ�ֵԭʼ��5 */
-   FRT_REGISTER_LINEAR_POINT_Y_1               = 45, /* ���Բ�ֵУ׼��1 */
-   FRT_REGISTER_LINEAR_POINT_Y_2               = 46, /* ���Բ�ֵУ׼��2 */
-   FRT_REGISTER_LINEAR_POINT_Y_3               = 47, /* ���Բ�ֵУ׼��3 */
-   FRT_REGISTER_LINEAR_POINT_Y_4               = 48, /* ���Բ�ֵУ׼��4 */
-   FRT_REGISTER_LINEAR_POINT_Y_5               = 49, /* ���Բ�ֵУ׼��5 */
-   FRT_REGISTER_LINEAR_ENABLE                  = 50, /* ���Բ�ֵʹ��    */
-   FRT_REGISTER_MAX_WAVE_1                     = 51, /* �����������  */
-   FRT_REGISTER_MAX_WAVE_2                     = 52, /* �����������  */
-   FRT_REGISTER_MAX_WAVE_3                     = 53, /* �����������  */
-   FRT_REGISTER_MAX_WAVE_4                     = 54, /* �����������  */
-   FRT_REGISTER_ID_1                           = 55, /* ID16  */
-   FRT_REGISTER_ID_2                           = 56, /* ID32  */
-   FRT_REGISTER_ID_3                           = 57, /* ID48  */
-   FRT_REGISTER_ID_4                           = 58, /* ID64  */
-   FRT_REGISTER_ENCRYPT_1                      = 59, /* ����16   */
-   FRT_REGISTER_ENCRYPT_2                      = 60, /* ����32   */
-   FRT_REGISTER_ENCRYPT_3                      = 61, /* ����48   */
-   FRT_REGISTER_ENCRYPT_4                      = 62, /* ����64   */
+   FRT_REGISTER_ANEMOMETER_DELAY               = 37, /* ������ƥ�����ʱ  */
+   FRT_REGISTER_ERROR_LOG                      = 38, /* ������־        */
+   FRT_REGISTER_WIND_C_NS                      = 39, /* ����õ����ϱ�����  */
+   FRT_REGISTER_WIND_C_WE                      = 40, /* ����õ��Ķ�������  */
+   FRT_REGISTER_LINEAR_POINT_X_1               = 41, /* ���Բ�ֵԭʼ��1 */
+   FRT_REGISTER_LINEAR_POINT_X_2               = 42, /* ���Բ�ֵԭʼ��2 */
+   FRT_REGISTER_LINEAR_POINT_X_3               = 43, /* ���Բ�ֵԭʼ��3 */
+   FRT_REGISTER_LINEAR_POINT_X_4               = 44, /* ���Բ�ֵԭʼ��4 */
+   FRT_REGISTER_LINEAR_POINT_X_5               = 45, /* ���Բ�ֵԭʼ��5 */
+   FRT_REGISTER_LINEAR_POINT_Y_1               = 46, /* ���Բ�ֵУ׼��1 */
+   FRT_REGISTER_LINEAR_POINT_Y_2               = 47, /* ���Բ�ֵУ׼��2 */
+   FRT_REGISTER_LINEAR_POINT_Y_3               = 48, /* ���Բ�ֵУ׼��3 */
+   FRT_REGISTER_LINEAR_POINT_Y_4               = 49, /* ���Բ�ֵУ׼��4 */
+   FRT_REGISTER_LINEAR_POINT_Y_5               = 50, /* ���Բ�ֵУ׼��5 */
+   FRT_REGISTER_LINEAR_ENABLE                  = 51, /* ���Բ�ֵʹ��    */
+   FRT_REGISTER_MAX_WAVE_1                     = 52, /* �����������  */
+   FRT_REGISTER_MAX_WAVE_2                     = 53, /* �����������  */
+   FRT_REGISTER_MAX_WAVE_3                     = 54, /* �����������  */
+   FRT_REGISTER_MAX_WAVE_4                     = 55, /* �����������  */
+   FRT_REGISTER_ID_1                           = 56, /* ID16  */
+   FRT_REGISTER_ID_2                           = 57, /* ID32  */
+   FRT_REGISTER_ID_3                           = 58, /* ID48  */
+   FRT_REGISTER_ID_4                           = 59, /* ID64  */
+   FRT_REGISTER_ENCRYPT_1                      = 60, /* ����16   */
+   FRT_REGISTER_ENCRYPT_2                      = 61, /* ����32   */
+   FRT_REGISTER_ENCRYPT_3                      = 62, /* ����48   */
+   FRT_REGISTER_ENCRYPT_4                      = 63, /* ����64   */
 }FRT_MsgRegister;
 
 #pragma pack(push,1)
diff --git a/App/Inc/inflash.h b/App/Inc/inflash.h
index db3c976..a6dcbe6 100644
--- a/App/Inc/inflash.h
+++ b/App/Inc/inflash.h
@@ -67,6 +67,7 @@ typedef struct _factory_config_info{
    u_int16_t linear_point_5_y;                      /* 线性插值点5Y 	  */
    u_int16_t linear_enable;                         /* 线性插值使能 	  */
    u_int32_t encrypt_1;                             /* 后32位密文         */
+   u_int16_t anemometerDelayTime;                   /* 换能器匹配层延时us */
    u_int16_t temp0;                                 /* 占位留待升级 	  */
    u_int16_t temp1;                                 /* 占位留待升级 	  */
    u_int16_t temp2;                                 /* 占位留待升级 	  */
diff --git a/App/Src/anemometer_dev.c b/App/Src/anemometer_dev.c
index fec93d5..5afae41 100644
--- a/App/Src/anemometer_dev.c
+++ b/App/Src/anemometer_dev.c
@@ -554,8 +554,8 @@ void wind_task(void const * argument)
       tof_error_log_NS = 0;
       g_error_log.tof_error_NS = 0;
       // 计算成us
-      tofx = ((tofx-FIR_PHASE_DELAY)/ADC_SAMP_RATE_MHz)+REV_MUTE_DELAY_US-1.0f/DRIVE_FREQ_MHz+0.0001f - 2.0f;
-      tofy = ((tofy-FIR_PHASE_DELAY)/ADC_SAMP_RATE_MHz)+REV_MUTE_DELAY_US-1.0f/DRIVE_FREQ_MHz+0.0001f - 2.0f;
+      tofx = ((tofx-FIR_PHASE_DELAY)/ADC_SAMP_RATE_MHz)+REV_MUTE_DELAY_US-1.0f/DRIVE_FREQ_MHz+0.0001f - g_stConfigInfo.anemometerDelayTime*1.0f;
+      tofy = ((tofy-FIR_PHASE_DELAY)/ADC_SAMP_RATE_MHz)+REV_MUTE_DELAY_US-1.0f/DRIVE_FREQ_MHz+0.0001f - g_stConfigInfo.anemometerDelayTime*1.0f;
       // 通过各通道渡越时间求时间差
       dtof = tofx-tofy;
       
@@ -623,8 +623,8 @@ void wind_task(void const * argument)
       tof_error_log_WE = 0;
       g_error_log.tof_error_WE = 0;
       // 计算成us
-      tofx = ((tofx-FIR_PHASE_DELAY)/ADC_SAMP_RATE_MHz)+REV_MUTE_DELAY_US-1.0f/DRIVE_FREQ_MHz+0.000001f - 2.0f;
-      tofy = ((tofy-FIR_PHASE_DELAY)/ADC_SAMP_RATE_MHz)+REV_MUTE_DELAY_US-1.0f/DRIVE_FREQ_MHz+0.000001f - 2.0f;
+      tofx = ((tofx-FIR_PHASE_DELAY)/ADC_SAMP_RATE_MHz)+REV_MUTE_DELAY_US-1.0f/DRIVE_FREQ_MHz+0.000001f - g_stConfigInfo.anemometerDelayTime*1.0f;
+      tofy = ((tofy-FIR_PHASE_DELAY)/ADC_SAMP_RATE_MHz)+REV_MUTE_DELAY_US-1.0f/DRIVE_FREQ_MHz+0.000001f - g_stConfigInfo.anemometerDelayTime*1.0f;
       // 通过各通道渡越时间求时间差
       dtof = tofx-tofy;
       
diff --git a/App/Src/frt_protocol.c b/App/Src/frt_protocol.c
index f23016b..b974baa 100644
--- a/App/Src/frt_protocol.c
+++ b/App/Src/frt_protocol.c
@@ -54,6 +54,7 @@ static u_int16_t FRT_ReadRegRSSIRange(void *pMsg);
 static u_int16_t FRT_ReadRegCoefficient(void *pMsg);
 static u_int16_t FRT_ReadRegDISTANCE_NS(void *pMsg);
 static u_int16_t FRT_ReadRegDISTANCE_WE(void *pMsg);
+static u_int16_t FRT_ReadRegANEMOMETER_Delay(void *pMsg);
 static u_int16_t FRT_ReadRegErrorData(void *pMsg);
 static u_int16_t FRT_ReadRegWindC_NS(void *pMsg);
 static u_int16_t FRT_ReadRegWindC_WE(void *pMsg);
@@ -85,6 +86,7 @@ static u_int16_t FRT_WriteRegRSSIRange(void *pMsg);
 static u_int16_t FRT_WriteRegCoefficient(void *pMsg);
 static u_int16_t FRT_WriteRegDISTANCE_NS(void *pMsg);
 static u_int16_t FRT_WriteRegDISTANCE_WE(void *pMsg);
+static u_int16_t FRT_WriteRegANEMOMETER_Delay(void *pMsg);
 static u_int16_t FRT_WriteRegPoint_1Y(void *pMsg);
 static u_int16_t FRT_WriteRegPoint_2Y(void *pMsg);
 static u_int16_t FRT_WriteRegPoint_3Y(void *pMsg);
@@ -141,6 +143,7 @@ FRT_RegProcTable_s g_RegTbl[] =
     { FRT_REGISTER_COEFFICIENT,                    FRT_ReadRegCoefficient                }, /* 读粘度修正系数             */
 	{ FRT_REGISTER_DISTANCE_NS,                    FRT_ReadRegDISTANCE_NS                }, /* 读南北探头表面有效距离      */
     { FRT_REGISTER_DISTANCE_WE,                    FRT_ReadRegDISTANCE_WE                }, /* 读东西探头表面有效距离      */
+    { FRT_REGISTER_ANEMOMETER_DELAY,               FRT_ReadRegANEMOMETER_Delay           }, /* 读换能器匹配层延时      */
     { FRT_REGISTER_ERROR_LOG,                      FRT_ReadRegErrorData                  }, /* 读错误日志                 */
 	{ FRT_REGISTER_WIND_C_NS,                      FRT_ReadRegWindC_NS                   }, /* 读计算得到的南北风速        */
     { FRT_REGISTER_WIND_C_WE,                      FRT_ReadRegWindC_WE                   }, /* 读计算得到的东西风速       */
@@ -181,6 +184,7 @@ FRT_RegProcTable_s g_Write_RegTbl[] =
     { FRT_REGISTER_COEFFICIENT,          FRT_WriteRegCoefficient            }, /* 写粘度修正系数           */
   	{ FRT_REGISTER_DISTANCE_NS,          FRT_WriteRegDISTANCE_NS            }, /* 写南北探头表面有效距离      */
     { FRT_REGISTER_DISTANCE_WE,          FRT_WriteRegDISTANCE_WE            }, /* 写东西探头表面有效距离      */
+    { FRT_REGISTER_ANEMOMETER_DELAY,     FRT_WriteRegANEMOMETER_Delay       }, /* 写换能器匹配层延时      */
     { FRT_REGISTER_LINEAR_POINT_Y_1,     FRT_WriteRegPoint_1Y               }, /* 线性插值校准点1         */
     { FRT_REGISTER_LINEAR_POINT_Y_2,     FRT_WriteRegPoint_2Y               }, /* 线性插值校准点2         */
     { FRT_REGISTER_LINEAR_POINT_Y_3,     FRT_WriteRegPoint_3Y               }, /* 线性插值校准点3         */
@@ -691,6 +695,18 @@ static u_int16_t FRT_ReadRegDISTANCE_WE(void *pMsg)
       return FRT_swap_endian_16(value);
 }
 
+/**
+  * @brief  读换能器匹配延时
+  * @param  
+  * @retval 
+  */
+static u_int16_t FRT_ReadRegANEMOMETER_Delay(void *pMsg)
+{
+	    read_config_info();
+      u_int16_t value=g_stConfigInfo.anemometerDelayTime;
+      return FRT_swap_endian_16(value);
+}
+
 /**
   * @brief  读错误日志
   * @param  
@@ -1053,6 +1069,22 @@ static u_int16_t FRT_WriteRegDISTANCE_WE(void *pMsg)
     return 0;
 }
 
+/**
+  * @brief  写换能器匹配延时
+  * @param  
+  * @retval 
+  */
+static u_int16_t FRT_WriteRegANEMOMETER_Delay(void *pMsg)
+{   
+    uint16_t *pMsgAddr = (uint16_t *)pMsg;
+    uint16_t data = *pMsgAddr;
+    
+    g_stConfigInfo.anemometerDelayTime = data;
+    save_factory_config_info(g_stConfigInfo);
+    
+    return 0;
+}
+
 /**
   * @brief  写线性插值矫正点1
   * @param  
@@ -1379,8 +1411,8 @@ void FRT_MsgProc_WriteRegister(device_handle device, void *pMsg)
     // 校验
     if (start_reg_addr < FRT_REGISTER_DEVICE_ADDR                                                               ||\
        (start_reg_addr > FRT_REGISTER_REST_DEFAULT_SETTING && start_reg_addr < FRT_REGISTER_TRANSDUCER_CFG_1R5) ||\
-       (start_reg_addr > FRT_REGISTER_DISTANCE_WE && start_reg_addr < FRT_REGISTER_LINEAR_POINT_Y_1)               ||\
-       (start_reg_addr > FRT_REGISTER_LINEAR_POINT_Y_5) && (start_reg_addr < FRT_REGISTER_ENCRYPT_1)              ||\
+       (start_reg_addr > FRT_REGISTER_ANEMOMETER_DELAY && start_reg_addr < FRT_REGISTER_LINEAR_POINT_Y_1)               ||\
+       (start_reg_addr > FRT_REGISTER_LINEAR_ENABLE) && (start_reg_addr < FRT_REGISTER_ENCRYPT_1)              ||\
        (start_reg_addr > FRT_REGISTER_ENCRYPT_4)   
        )
     {
@@ -1390,8 +1422,8 @@ void FRT_MsgProc_WriteRegister(device_handle device, void *pMsg)
     if (reg_num < 0x01                                                                                                                              ||\
        ((reg_num +  start_reg_addr - 1) < FRT_REGISTER_DEVICE_ADDR)                                                                                 ||\
        (((reg_num +  start_reg_addr -1) > FRT_REGISTER_REST_DEFAULT_SETTING) && ((reg_num +  start_reg_addr -1) < FRT_REGISTER_TRANSDUCER_CFG_1R5)) ||\
-       (((reg_num +  start_reg_addr -1) > FRT_REGISTER_DISTANCE_WE) && ((reg_num +  start_reg_addr -1) < FRT_REGISTER_LINEAR_POINT_Y_1))            ||\
-       (((reg_num +  start_reg_addr -1) > FRT_REGISTER_LINEAR_POINT_Y_5) && ((reg_num +  start_reg_addr -1) < FRT_REGISTER_ENCRYPT_1))              ||\
+       (((reg_num +  start_reg_addr -1) > FRT_REGISTER_ANEMOMETER_DELAY) && ((reg_num +  start_reg_addr -1) < FRT_REGISTER_LINEAR_POINT_Y_1))            ||\
+       (((reg_num +  start_reg_addr -1) > FRT_REGISTER_LINEAR_ENABLE) && ((reg_num +  start_reg_addr -1) < FRT_REGISTER_ENCRYPT_1))              ||\
        ((reg_num +  start_reg_addr -1) > FRT_REGISTER_ENCRYPT_4)
        )
     {
diff --git a/App/Src/inflash.c b/App/Src/inflash.c
index 4393da6..3287419 100644
--- a/App/Src/inflash.c
+++ b/App/Src/inflash.c
@@ -43,6 +43,7 @@ factory_config_info g_stConfigInfo={
     .linear_enable          = 0,                            /* ���Բ�ֵʹ�� */
     .encrypt_0              = 0,                            /* ����         */
     .encrypt_1              = 0,                            /* ����         */
+    .anemometerDelayTime    = 2,                            /* ������ƥ�����ʱus *//*����3����������2*/
     .flag_end             = FLAG_SAVE_INFLASH_END,
 };
 

From cc668ea47828c8f3177c972e4cd0f3da37478665 Mon Sep 17 00:00:00 2001
From: 95384 <664090429@qq.com>
Date: Tue, 25 Mar 2025 17:35:19 +0800
Subject: [PATCH 12/12] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=B0=94?=
 =?UTF-8?q?=E5=8E=8B=E4=BC=A0=E6=84=9F=E5=99=A8BUG=EF=BC=9A=E6=B0=94?=
 =?UTF-8?q?=E5=8E=8B=E4=BC=A0=E6=84=9F=E5=99=A8=E7=9A=84=E6=B8=A9=E5=BA=A6?=
 =?UTF-8?q?=E5=80=BC=E5=BC=95=E8=B5=B7=E7=9A=84=E6=B0=94=E5=8E=8B=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=EF=BC=9B=E5=B0=86=E6=B8=A9=E5=BA=A6=E7=BA=B3=E5=85=A5?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E5=88=A4=E6=96=AD=E8=A7=84=E5=88=99=EF=BC=8C?=
 =?UTF-8?q?=E6=B8=A9=E5=BA=A6=E8=B6=85=E8=8C=83=E5=9B=B4=E7=AE=97=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Core/Src/main.c         | 2 +-
 Drivers/MS5607/ms5607.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Core/Src/main.c b/Core/Src/main.c
index 5089718..58d61b2 100644
--- a/Core/Src/main.c
+++ b/Core/Src/main.c
@@ -128,7 +128,7 @@ void Flash_EnableReadProtection(void)
 
   /* USER CODE BEGIN 1 */
     ///Զ������ʱ������
-  ///Flash_EnableReadProtection();//������
+//  Flash_EnableReadProtection();//������
   /* USER CODE END 1 */
 
   /* MCU Configuration--------------------------------------------------------*/
diff --git a/Drivers/MS5607/ms5607.c b/Drivers/MS5607/ms5607.c
index 80190e6..fb90034 100644
--- a/Drivers/MS5607/ms5607.c
+++ b/Drivers/MS5607/ms5607.c
@@ -176,10 +176,12 @@ static HAL_StatusTypeDef MS56XX_GetPressureTemp(float *Temp, float *Press)  //
     if(MS56XX_Temperature<-6000) 
     {
         MS56XX_Temperature=-6000;
+        return HAL_ERROR;
     }
     if(MS56XX_Temperature>8500)
     {
         MS56XX_Temperature=8500;
+        return HAL_ERROR;
     }
     if(Tmp_Pressure<1000)
     {