adc读取正常

This commit is contained in:
2023-07-01 19:53:45 +08:00
parent c2b9721d4b
commit 5b87198936
31 changed files with 21522 additions and 20638 deletions
+78 -34
View File
@@ -11,24 +11,25 @@
void ADC1_2_IRQHandler(void) __attribute__((interrupt("WCH-Interrupt-fast")));
void DMA1_Channel1_IRQHandler(void) __attribute__((interrupt("WCH-Interrupt-fast")));
uint32_t adc_raw[4] = {0};
_adc voltage;
void adc_covert(uint32_t *data)
void adc_covert(void)
{
float Vref = 0;
float Vin = 0;
float V3 = 0;
float Bat = 0;
for(int i = 0;i < ADC_NUM; i++)
{
voltage.Voltage[i] = voltage.raw[i] / 4096.0 * 3.3 * voltage.Scale[i];//2.5V参考电压
}
Vref = data[0] / 4096.0 * 3.3;//2.5V参考电压
Vin = data[1] / 4096.0 * 3.3 * 2.0;
V3 = data[2] / 4096.0 * 3.3 * 2.0;
Bat = data[3] / 4096.0 * 3.3 * 11.0;
voltage.Vref = voltage.Voltage[0];
voltage.Vin = voltage.Voltage[1];
voltage.V3 = voltage.Voltage[2];
voltage.Bat = voltage.Voltage[3];
printf("adc-f: %4.2f, %4.2f, %4.2f, %4.2f\n", Vref,Vin,V3,Bat);
//printf("adc-f: %4.2f, %4.2f, %4.2f, %4.2f\n", voltage.Vref,voltage.Vin,voltage.V3,voltage.Bat);
}
@@ -40,23 +41,32 @@ void adc_init(void)
GPIO_InitTypeDef GPIO_InitStructure = {0};
DMA_InitTypeDef DMA_InitStructure = {0};
voltage.Scale[0] = 1.0;
voltage.Scale[1] = 2.0;
voltage.Scale[2] = 2.0;
voltage.Scale[3] = 11.0;
voltage.isUpdate = 0x00;
RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOC, ENABLE);
RCC_APB2PeriphClockCmd(RCC_APB2Periph_ADC1, ENABLE);
RCC_AHBPeriphClockCmd(RCC_AHBPeriph_DMA1, ENABLE);
RCC_APB2PeriphClockCmd( RCC_APB2Periph_AFIO, ENABLE );
GPIO_InitStructure.GPIO_Pin = GPIO_Pin_0 | GPIO_Pin_1 |GPIO_Pin_2 | GPIO_Pin_3;
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AIN;
GPIO_Init(GPIOC, &GPIO_InitStructure);
DMA_DeInit(DMA1_Channel1);
DMA_InitStructure.DMA_PeripheralBaseAddr = (uint32_t)&ADC1->RDATAR;//ADC地址
DMA_InitStructure.DMA_MemoryBaseAddr = (uint32_t)adc_raw; //内存地址
DMA_InitStructure.DMA_PeripheralBaseAddr = (uint32_t)(&(ADC1->RDATAR));//ADC地址 (u32)(&(ADC1->DR));
DMA_InitStructure.DMA_MemoryBaseAddr = (uint32_t)voltage.raw; //内存地址
DMA_InitStructure.DMA_DIR = DMA_DIR_PeripheralSRC; //方向(从外设到内存)
DMA_InitStructure.DMA_BufferSize = 4; //传输内容的大小
DMA_InitStructure.DMA_BufferSize = ADC_NUM; //传输内容的大小
DMA_InitStructure.DMA_PeripheralInc = DMA_PeripheralInc_Disable; //外设地址固定
DMA_InitStructure.DMA_MemoryInc = DMA_MemoryInc_Enable; //内存地址增加
DMA_InitStructure.DMA_PeripheralDataSize = DMA_PeripheralDataSize_Word ; //外设数据单位
DMA_InitStructure.DMA_MemoryDataSize = DMA_MemoryDataSize_Word ; //内存数据单位
DMA_InitStructure.DMA_PeripheralDataSize = DMA_PeripheralDataSize_HalfWord ; //外设数据单位
DMA_InitStructure.DMA_MemoryDataSize = DMA_MemoryDataSize_HalfWord ; //内存数据单位
DMA_InitStructure.DMA_Mode = DMA_Mode_Normal ; //DMA模式:循环传输
DMA_InitStructure.DMA_Priority = DMA_Priority_Low ; //优先级:高
DMA_InitStructure.DMA_M2M = DMA_M2M_Disable; //禁止内存到内存的传输
@@ -80,7 +90,7 @@ void adc_init(void)
ADC_InitStructure.ADC_ContinuousConvMode = ENABLE;
ADC_InitStructure.ADC_ExternalTrigConv = ADC_ExternalTrigConv_None;
ADC_InitStructure.ADC_DataAlign = ADC_DataAlign_Right;
ADC_InitStructure.ADC_NbrOfChannel = 4;
ADC_InitStructure.ADC_NbrOfChannel = ADC_NUM;
ADC_Init(ADC1, &ADC_InitStructure);
RCC_ADCCLKConfig(RCC_PCLK2_Div8);// adc_clock = 96/8 = 12Mhz
@@ -95,7 +105,7 @@ void adc_init(void)
ADC_Cmd(ADC1, ENABLE);
ADC_BufferCmd(ADC1, DISABLE); //disable buffer
//ADC_BufferCmd(ADC1, DISABLE); //disable buffer
ADC_ResetCalibration(ADC1);
while(ADC_GetResetCalibrationStatus(ADC1));
ADC_StartCalibration(ADC1);
@@ -105,7 +115,7 @@ void adc_init(void)
NVIC_InitStructure.NVIC_IRQChannel = ADC_IRQn;
NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority=1;
NVIC_InitStructure.NVIC_IRQChannelSubPriority=1;
NVIC_InitStructure.NVIC_IRQChannelSubPriority=0;
NVIC_InitStructure.NVIC_IRQChannelCmd=ENABLE;
NVIC_Init(&NVIC_InitStructure);
@@ -115,6 +125,49 @@ void adc_init(void)
}
void adc_thread(uint32_t tick)
{
static uint32_t lasttick = 0;
uint8_t isTimeOut = 0x00;
if(tick > lasttick)
{
if((tick - lasttick) >= 1000000)
{
isTimeOut = 0x01;
lasttick = tick;
}
}
else
{
if((0xFFFFFFFF - lasttick + tick) >= 1000000)
{
isTimeOut = 0x01;
lasttick = tick;
}
}
if(isTimeOut != 0x00)
{
if(!voltage.isUpdate)
{
/* 如果DMA设置的是normal模式,需要手动重装计数器 */
DMA1_Channel1->CNTR = ADC_NUM;
//DMA1_Channel1->MADDR = (uint32_t)voltage.raw;
//DMA_ITConfig(DMA1_Channel1, DMA_IT_TC, ENABLE);
DMA_Cmd(DMA1_Channel1,ENABLE);
ADC_Cmd(ADC1, ENABLE);
ADC_SoftwareStartConvCmd(ADC1, ENABLE);
voltage.isUpdate = 0x01;
}
}
}
void ADC1_2_IRQHandler (void)//在启动头文件中找到
@@ -122,8 +175,6 @@ void ADC1_2_IRQHandler (void)//
//判断中断是否真的来了(初始化函数使能的便是ADC_IT_EOC中断))
if(ADC_GetITStatus( ADC1, ADC_IT_EOC)!=RESET)
{
//中断真的来了就要读取转换值了
//printf("adc-interrupt");
ADC_ClearITPendingBit(ADC1, ADC_IT_EOC);//清除中断
}
@@ -136,24 +187,18 @@ void DMA1_Channel1_IRQHandler(void)
if(DMA_GetFlagStatus(DMA1_IT_TC1))
{
/* 失能DMA1通道1,以防在中断过程中发生DMA传输 */
DMA_Cmd(DMA1_Channel1, DISABLE);
ADC_SoftwareStartConvCmd(ADC1, DISABLE);
ADC_Cmd(ADC1, DISABLE);
//DMA_Cmd(DMA1_Channel1, DISABLE);
adc_covert();
//printf("adc-dma: %4d, %4d, %4d, %4d\n", adc_raw[0],adc_raw[1],adc_raw[2],adc_raw[3]);
adc_covert(adc_raw);
/* 如果DMA设置的是normal模式,需要手动重装计数器 */
DMA1_Channel1->CNTR = 4;
/* 清除中断标志位 */
DMA_ClearITPendingBit(DMA1_IT_TC1);
// DMA_ClearFlag(DMA1_FLAG_TC1);
/* 重新使能DMA1通道1,开始工作 */
voltage.isUpdate = 0x00;
DMA_ITConfig(DMA1_Channel1, DMA_IT_TC, ENABLE);
DMA_Cmd(DMA1_Channel1,ENABLE);
}
}
@@ -176,6 +221,5 @@ void DMA1_Channel1_IRQHandler(void)