wxsmart-test
/
actuator
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加校准

This commit is contained in:
承诺 2025-04-15 08:26:52 +08:00
parent 609e3b2c87
commit 60cd89dda4
2 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
users/Src/adcs.c
View File

@ -1,8 +1,8 @@
#include "adcs.h" #include "adcs.h"
uint32_t ADC_ConvertedValue[10] = {0};//ADCÊý¾Ý uint32_t ADC_ConvertedValue[50] = {0};//ADCÊý¾Ý
uint32_t adc_sum = 0; uint32_t adc_sum = 0,ao_adc_data = 0;
int adc_cnt = 0; int adc_cnt = 0;
@ -20,17 +20,21 @@ void adcs_data(void)
// } // }
HAL_ADC_Start(&hadc1); HAL_ADC_Start(&hadc1);
ADC_ConvertedValue[adc_cnt] = HAL_ADC_GetValue(&hadc1); ADC_ConvertedValue[adc_cnt] = HAL_ADC_GetValue(&hadc1);
// adc_cnt++; adc_cnt++;
//
// if(adc_cnt > 4) adc_cnt = 0;
//
// for(int i = 0;i < 5;i++)
// {
// adc_sum += ADC_ConvertedValue[i];
// }
// ADC_ConvertedValue[5] = adc_sum / 5;
// adc_sum = 0;
InputReg[12] = (uint16_t)(((float)(ADC_ConvertedValue[0]) * 3300 / 4095) / 0.082f); if(adc_cnt > 49)
{
adc_cnt = 0;
for(int i = 0;i < 50;i++)
{
adc_sum += ADC_ConvertedValue[i];
}
ao_adc_data = adc_sum / 50;
adc_sum = 0;
}
InputReg[12] = (uint16_t)(((float)(ao_adc_data) * 3300 / 4095.0f) / 0.082f);
InputReg[12] = InputReg[12] * 1.0004f - 19.5f;
//adc_sum = 0; //adc_sum = 0;
} }

10
users/Src/gpios.c
View File

@ -37,25 +37,17 @@ void digital_ctrl()
{ {
led_ctrl(); led_ctrl();
//全开全关ESD控制信号互斥 //全开全关控制信号互斥
if(((CoilState[0]>>0)&0x01) && !position_on) if(((CoilState[0]>>0)&0x01) && !position_on)
{ {
CoilState[0] = CoilState[0] & 0xfd; CoilState[0] = CoilState[0] & 0xfd;
CoilState[0] = CoilState[0] & 0xfb;
} }
if(((CoilState[0]>>1)&0x01) && !position_off) if(((CoilState[0]>>1)&0x01) && !position_off)
{ {
CoilState[0] = CoilState[0] & 0xfe; CoilState[0] = CoilState[0] & 0xfe;
CoilState[0] = CoilState[0] & 0xfb;
}
if(((CoilState[0]>>2)&0x01) && !position_esd)
{
CoilState[0] = CoilState[0] & 0xfe;
CoilState[0] = CoilState[0] & 0xfd;
} }
position_on = (CoilState[0]>>0)&0x01; position_on = (CoilState[0]>>0)&0x01;
position_off = (CoilState[0]>>1)&0x01; position_off = (CoilState[0]>>1)&0x01;
position_esd = (CoilState[0]>>2)&0x01;
//八位DO输出控制 //八位DO输出控制
PE2_DO1((GPIO_PinState)((CoilState[0]>>0)&0x01)); PE2_DO1((GPIO_PinState)((CoilState[0]>>0)&0x01));