dengcy
/
micro_climate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加了粘度校准系数，将ADC采样率改为4M，ADC BUFF长度改为2048，ADC启动延时改为110

This commit is contained in:
95384 2024-12-03 16:01:00 +08:00
parent 9fb4753f5e
commit 61d662a441
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
App/Inc/anemometer_dev.h
View File

@ -24,12 +24,15 @@
// 延时REV_MUTE_DELAY us启动ADC采集数据 // 延时REV_MUTE_DELAY us启动ADC采集数据
// 最大风速30m/s 2.5M 采样率 延时260uS // 最大风速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 采样率 // adc 采样率
// 5 5M // 5 5M
// 4 4M // 4 4M
// 3 3M // 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) #define DRIVE_FREQ_MHz ((float32_t)0.2)
@ -56,7 +59,7 @@
#define WIND_DIRECTION_Y 0x01 #define WIND_DIRECTION_Y 0x01
// adc 采集buf长度 // adc 采集buf长度
#define ADC_VAL_LEN 1024 #define ADC_VAL_LEN 2048
extern int16_t adc_val[ADC_VAL_LEN]; extern int16_t adc_val[ADC_VAL_LEN];
extern int16_t adc_val1[ADC_VAL_LEN]; extern int16_t adc_val1[ADC_VAL_LEN];

4
App/Src/anemometer_dev.c
View File

@ -541,6 +541,10 @@ void wind_task(void const * argument)
// 360一圈 // 360一圈
if(av_speedy<0) if(av_speedy<0)
av_angle = 360-av_angle; av_angle = 360-av_angle;
//针对粘度进行校准
av_speed = av_speed * 1.1201f;
// 速度太小视为0风速 // 速度太小视为0风速
if(fabs(av_speed)<0.1) if(fabs(av_speed)<0.1)
{ {