From c63e035ef2f589260d348a0de6dc1922d68f9b83 Mon Sep 17 00:00:00 2001 From: 95384 <664090429@qq.com> Date: Thu, 5 Dec 2024 11:21:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E5=A4=A7=E5=B9=85=E5=80=BC=E5=88=86?= =?UTF-8?q?=E6=94=AF=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App/Inc/anemometer_dev.h | 8 +++---- App/Inc/frt_protocol.h | 8 +++---- App/Src/anemometer_dev.c | 16 +++++++------- App/Src/frt_protocol.c | 45 ++++++++++++++++++++-------------------- 4 files changed, 38 insertions(+), 39 deletions(-) diff --git a/App/Inc/anemometer_dev.h b/App/Inc/anemometer_dev.h index 52843a1..8042238 100644 --- a/App/Inc/anemometer_dev.h +++ b/App/Inc/anemometer_dev.h @@ -162,10 +162,10 @@ typedef struct { uint16_t currentIndex; uint16_t ave; } AverageCalculator; -extern AverageCalculator Test1; -extern AverageCalculator Test2; -extern AverageCalculator Test3; -extern AverageCalculator Test4; +extern AverageCalculator wave_max_val_1; +extern AverageCalculator wave_max_val_2; +extern AverageCalculator wave_max_val_3; +extern AverageCalculator wave_max_val_4; // 切换通道 void change_channel(uint32_t channel); diff --git a/App/Inc/frt_protocol.h b/App/Inc/frt_protocol.h index 15a6d68..5c54207 100644 --- a/App/Inc/frt_protocol.h +++ b/App/Inc/frt_protocol.h @@ -71,10 +71,10 @@ typedef enum FRT_REGISTER_LINEAR_POINT_Y_4 = 48, /* ԲֵУ׼4 */ FRT_REGISTER_LINEAR_POINT_Y_5 = 49, /* ԲֵУ׼5 */ FRT_REGISTER_LINEAR_ENABLE = 50, /* Բֵʹ */ - FRT_REGISTER_TEST1 = 51, /* ԼĴ */ - FRT_REGISTER_TEST2 = 52, /* ԼĴ */ - FRT_REGISTER_TEST3 = 53, /* ԼĴ */ - FRT_REGISTER_TEST4 = 54, /* ԼĴ */ + 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_MsgRegister; #pragma pack(push,1) diff --git a/App/Src/anemometer_dev.c b/App/Src/anemometer_dev.c index 572f567..ebe2f5a 100644 --- a/App/Src/anemometer_dev.c +++ b/App/Src/anemometer_dev.c @@ -36,10 +36,10 @@ void addValue(AverageCalculator *calc, uint16_t value) { } calc->ave = sum / calc->count; } -AverageCalculator Test1; -AverageCalculator Test2; -AverageCalculator Test3; -AverageCalculator Test4; +AverageCalculator wave_max_val_1; +AverageCalculator wave_max_val_2; +AverageCalculator wave_max_val_3; +AverageCalculator wave_max_val_4; uint16_t wave_max_val1; uint16_t wave_max_val2; uint16_t wave_max_val3; @@ -427,8 +427,8 @@ void wind_task(void const * argument) play_one_measure(adc_val1,ADC_VAL_LEN); - tofx = cal_tof(adc_val,ADC_VAL_LEN, &wave_max_val1);addValue(&Test1, wave_max_val1); - tofy = cal_tof(adc_val1,ADC_VAL_LEN, &wave_max_val2);addValue(&Test2, wave_max_val2); + tofx = cal_tof(adc_val,ADC_VAL_LEN, &wave_max_val1);addValue(&wave_max_val_1, wave_max_val1); + tofy = cal_tof(adc_val1,ADC_VAL_LEN, &wave_max_val2);addValue(&wave_max_val_2, wave_max_val2); // 接受信号很小 @@ -486,8 +486,8 @@ void wind_task(void const * argument) play_one_measure(adc_val1,ADC_VAL_LEN); - tofx = cal_tof(adc_val,ADC_VAL_LEN, &wave_max_val3);addValue(&Test3, wave_max_val3); - tofy = cal_tof(adc_val1,ADC_VAL_LEN, &wave_max_val4);addValue(&Test4, wave_max_val4); + tofx = cal_tof(adc_val,ADC_VAL_LEN, &wave_max_val3);addValue(&wave_max_val_3, wave_max_val3); + tofy = cal_tof(adc_val1,ADC_VAL_LEN, &wave_max_val4);addValue(&wave_max_val_4, wave_max_val4); // 如果测量的信号幅值过小。 if(tofx<0||tofy<0) diff --git a/App/Src/frt_protocol.c b/App/Src/frt_protocol.c index cbeadf9..bbb478b 100644 --- a/App/Src/frt_protocol.c +++ b/App/Src/frt_protocol.c @@ -67,6 +67,10 @@ static u_int16_t FRT_ReadRegPoint_3Y(void *pMsg); static u_int16_t FRT_ReadRegPoint_4Y(void *pMsg); static u_int16_t FRT_ReadRegPoint_5Y(void *pMsg); static u_int16_t FRT_ReadRegLinearEnable(void *pMsg); +static u_int16_t FRT_ReadReg_MaxWave_1(void *pMsg); +static u_int16_t FRT_ReadReg_MaxWave_2(void *pMsg); +static u_int16_t FRT_ReadReg_MaxWave_3(void *pMsg); +static u_int16_t FRT_ReadReg_MaxWave_4(void *pMsg); /* 写配置 */ static u_int16_t FRT_WriteRegTransducerCFG1R5(void *pMsg); static u_int16_t FRT_WriteRegTransducerCFG4R5(void *pMsg); @@ -81,11 +85,6 @@ static u_int16_t FRT_WriteRegPoint_3Y(void *pMsg); static u_int16_t FRT_WriteRegPoint_4Y(void *pMsg); static u_int16_t FRT_WriteRegPoint_5Y(void *pMsg); static u_int16_t FRT_WriteRegLinearEnable(void *pMsg); -/* 测试 */ -static u_int16_t FRT_ReadRegTest1(void *pMsg); -static u_int16_t FRT_ReadRegTest2(void *pMsg); -static u_int16_t FRT_ReadRegTest3(void *pMsg); -static u_int16_t FRT_ReadRegTest4(void *pMsg); static void pdebug_mcs_info(); @@ -142,10 +141,10 @@ FRT_RegProcTable_s g_RegTbl[] = { FRT_REGISTER_LINEAR_POINT_Y_4, FRT_ReadRegPoint_4Y }, /* 线性插值校准点4 */ { FRT_REGISTER_LINEAR_POINT_Y_5, FRT_ReadRegPoint_5Y }, /* 线性插值校准点5 */ { FRT_REGISTER_LINEAR_ENABLE, FRT_ReadRegLinearEnable }, /* 线性插值使能 */ - { FRT_REGISTER_TEST1, FRT_ReadRegTest1 }, /* 测试寄存器 */ - { FRT_REGISTER_TEST2, FRT_ReadRegTest2 }, /* 测试寄存器 */ - { FRT_REGISTER_TEST3, FRT_ReadRegTest3 }, /* 测试寄存器 */ - { FRT_REGISTER_TEST4, FRT_ReadRegTest4 }, /* 测试寄存器 */ + { FRT_REGISTER_MAX_WAVE_1, FRT_ReadReg_MaxWave_1 }, /* 波形最大幅值 */ + { FRT_REGISTER_MAX_WAVE_2, FRT_ReadReg_MaxWave_2 }, /* 波形最大幅值 */ + { FRT_REGISTER_MAX_WAVE_3, FRT_ReadReg_MaxWave_3 }, /* 波形最大幅值 */ + { FRT_REGISTER_MAX_WAVE_4, FRT_ReadReg_MaxWave_4 }, /* 波形最大幅值 */ }; /* 写寄存器处理表 */ @@ -807,43 +806,43 @@ static u_int16_t FRT_ReadRegLinearEnable(void *pMsg) } /** - * @brief 111111111111111 + * @brief 波形最大幅值S * @param * @retval */ -static u_int16_t FRT_ReadRegTest1(void *pMsg) +static u_int16_t FRT_ReadReg_MaxWave_1(void *pMsg) { - u_int16_t value=(u_int16_t)(Test1.ave); + u_int16_t value=(u_int16_t)(wave_max_val_1.ave); return FRT_swap_endian_16(value); } /** - * @brief 111111111111111 + * @brief 波形最大幅值N * @param * @retval */ -static u_int16_t FRT_ReadRegTest2(void *pMsg) +static u_int16_t FRT_ReadReg_MaxWave_2(void *pMsg) { - u_int16_t value=(u_int16_t)(Test2.ave); + u_int16_t value=(u_int16_t)(wave_max_val_2.ave); return FRT_swap_endian_16(value); } /** - * @brief 111111111111111 + * @brief 波形最大幅值E * @param * @retval */ -static u_int16_t FRT_ReadRegTest3(void *pMsg) +static u_int16_t FRT_ReadReg_MaxWave_3(void *pMsg) { - u_int16_t value=(u_int16_t)(Test3.ave); + u_int16_t value=(u_int16_t)(wave_max_val_3.ave); return FRT_swap_endian_16(value); } /** - * @brief 111111111111111 + * @brief 波形最大幅值W * @param * @retval */ -static u_int16_t FRT_ReadRegTest4(void *pMsg) +static u_int16_t FRT_ReadReg_MaxWave_4(void *pMsg) { - u_int16_t value=(u_int16_t)(Test4.ave); + u_int16_t value=(u_int16_t)(wave_max_val_4.ave); return FRT_swap_endian_16(value); } @@ -1156,7 +1155,7 @@ void FRT_MsgProc_ReadRegister(device_handle device, void *pMsg) start_reg_addr < 0x00 ||\ (start_reg_addr > FRT_REGISTER_PRESSURE && start_reg_addr < FRT_REGISTER_DEVICE_ADDR) ||\ (start_reg_addr > FRT_REGISTER_TEMPHUM_UPDATE_TIME && start_reg_addr < FRT_REGISTER_TRANSDUCER_CFG_1R5) ||\ - start_reg_addr > FRT_REGISTER_TEST4 \ + start_reg_addr > FRT_REGISTER_MAX_WAVE_4 \ ) { @@ -1168,7 +1167,7 @@ void FRT_MsgProc_ReadRegister(device_handle device, void *pMsg) reg_num < 0x01 ||\ (((reg_num + start_reg_addr - 1) > FRT_REGISTER_PRESSURE) && ((reg_num + start_reg_addr - 1) < FRT_REGISTER_DEVICE_ADDR)) ||\ (((reg_num + start_reg_addr -1) > FRT_REGISTER_TEMPHUM_UPDATE_TIME) && ((reg_num + start_reg_addr -1) < FRT_REGISTER_TRANSDUCER_CFG_1R5)) ||\ - ((reg_num + start_reg_addr -1) > FRT_REGISTER_TEST4) \ + ((reg_num + start_reg_addr -1) > FRT_REGISTER_MAX_WAVE_4) \ ) {