From 61d662a441757a92eecfeb2459f7930919ce553a Mon Sep 17 00:00:00 2001
From: 95384 <664090429@qq.com>
Date: Tue, 3 Dec 2024 16:01:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E7=B2=98=E5=BA=A6?=
 =?UTF-8?q?=E6=A0=A1=E5=87=86=E7=B3=BB=E6=95=B0=EF=BC=8C=E5=B0=86ADC?=
 =?UTF-8?q?=E9=87=87=E6=A0=B7=E7=8E=87=E6=94=B9=E4=B8=BA4M=EF=BC=8CADC=20B?=
 =?UTF-8?q?UFF=E9=95=BF=E5=BA=A6=E6=94=B9=E4=B8=BA2048=EF=BC=8CADC?=
 =?UTF-8?q?=E5=90=AF=E5=8A=A8=E5=BB=B6=E6=97=B6=E6=94=B9=E4=B8=BA110?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/App/Inc/anemometer_dev.h b/App/Inc/anemometer_dev.h
index 04ea94b..c22e84d 100644
--- a/App/Inc/anemometer_dev.h
+++ b/App/Inc/anemometer_dev.h
@@ -24,12 +24,15 @@
 
 // 延时REV_MUTE_DELAY us启动ADC采集数据
 // 最大风速30m/s 2.5M 采样率  延时260uS
-#define REV_MUTE_DELAY_US 260
+//#define REV_MUTE_DELAY_US 260
+// 最大风速60m/s 4M 采样率  延时110uS
+#define REV_MUTE_DELAY_US 110
 // adc 采样率 
 //       5  5M
 //       4  4M
 //       3  3M
-#define ADC_SAMP_RATE_MHz  ((float32_t)2.5)
+//#define ADC_SAMP_RATE_MHz  ((float32_t)2.5)
+#define ADC_SAMP_RATE_MHz  ((float32_t)4.0)
 
 // 驱动方波频率
 #define DRIVE_FREQ_MHz   ((float32_t)0.2)
@@ -56,7 +59,7 @@
 #define WIND_DIRECTION_Y 0x01
 
 // adc 采集buf长度
-#define  ADC_VAL_LEN 1024
+#define  ADC_VAL_LEN 2048
 
 extern int16_t adc_val[ADC_VAL_LEN];
 extern int16_t adc_val1[ADC_VAL_LEN];
diff --git a/App/Src/anemometer_dev.c b/App/Src/anemometer_dev.c
index 2dfe407..08a8aa9 100644
--- a/App/Src/anemometer_dev.c
+++ b/App/Src/anemometer_dev.c
@@ -541,6 +541,10 @@ void wind_task(void const * argument)
 	  // 360一圈
       if(av_speedy<0)
         av_angle = 360-av_angle;
+      
+      //针对粘度进行校准
+      av_speed = av_speed * 1.1201f;
+      
 	  // 速度太小视为0风速
       if(fabs(av_speed)<0.1)
       {