From 7d50caa5b2b4cc8470016f5afae07ee75d302c22 Mon Sep 17 00:00:00 2001 From: 95384 <664090429@qq.com> Date: Mon, 7 Apr 2025 10:07:34 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0MS5607=E6=AF=8F=E6=AC=A1?= =?UTF-8?q?=E9=87=87=E9=9B=86=E7=9A=84=E9=97=B4=E9=9A=94=EF=BC=88=E9=87=87?= =?UTF-8?q?=E6=A0=B7=E6=97=B6=E9=97=B4=EF=BC=89=EF=BC=8C=E5=87=8F=E5=B0=8F?= =?UTF-8?q?=E5=87=BA=E9=94=99=E6=A6=82=E7=8E=87=EF=BC=8C=E6=B0=94=E5=8E=8B?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E5=90=8E=E5=BD=92=E9=9B=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App/Src/anemometer_dev.c | 1 + Drivers/MS5607/ms5607.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/App/Src/anemometer_dev.c b/App/Src/anemometer_dev.c index 5afae41..3ee6932 100644 --- a/App/Src/anemometer_dev.c +++ b/App/Src/anemometer_dev.c @@ -1077,6 +1077,7 @@ static void getTempHumiPress(void) //置错误标志位 g_error_log.temp_error_HP203B = 1; //错误处理 + g_stMcs_Para.pressure = 0; } else { diff --git a/Drivers/MS5607/ms5607.c b/Drivers/MS5607/ms5607.c index fb90034..366f3ff 100644 --- a/Drivers/MS5607/ms5607.c +++ b/Drivers/MS5607/ms5607.c @@ -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 From b021471f5ba62701306507d1350f1e31479a3b47 Mon Sep 17 00:00:00 2001 From: 95384 <664090429@qq.com> Date: Mon, 7 Apr 2025 10:22:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=80=9A=E8=AE=AF?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E5=BB=B6=E6=97=B6=E4=B8=BA5s?= 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 c4abf55..51af263 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); + osDelay(5000); /* Infinite loop */ for(;;) { From 3d800becda383ca130eb61c22f0b7efac4e832cb Mon Sep 17 00:00:00 2001 From: 95384 <664090429@qq.com> Date: Wed, 9 Apr 2025 08:49:49 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B0=94=E5=8E=8B=E4=BC=A0=E6=84=9F?= =?UTF-8?q?=E5=99=A8=E9=94=99=E8=AF=AF=E6=B8=A9=E5=BA=A6=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=94=B9=E4=B8=BA90=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Drivers/MS5607/ms5607.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Drivers/MS5607/ms5607.c b/Drivers/MS5607/ms5607.c index 366f3ff..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)