Posted on March 12, 2016 at 10:34
Uploaded some photos to my previous post.
A little comments. I started TIM3 timer inside code to generate square pulses with 5 us width:....
pwm.TIM_Prescaler = 36 - 1;
pwm.TIM_Period = 19;
....
pwmOC.TIM_Pulse = 10;
Posted on March 12, 2016 at 18:39
The time of one transfer if about 400 us so 1 sampling is 400 us / 1000 = 0.4 us. The code is here:
800 us / 1000 samples = 0.8 us that is close to 1Msps. So USB settings change something to increase ADC? Or maybe here is something that I missed?
Thanks clive to reply!
Here is my test with toggle pin after cyclic DMA transfer of 1000 bytes fron ADC
The time of one transfer if about 400 us so 1 sampling is 400 us / 1000 = 0.4 us. The code is here:
// test for 1000 ADC sampling via DMA, after TC toggle Pin
#include ''hw_config.h''
#include ''usb_lib.h''
#include ''usb_desc.h''
#include ''usb_pwr.h''
#define ADC1_DR_Address ((uint32_t)0x4001244C)
uint32_t packet_sent=1;
uint32_t packet_receive=1;
extern
__IO uint8_t Receive_Buffer[64];
extern
__IO uint32_t Receive_length ;
uint16_t ADC_Buffer[1000];
GPIO_InitTypeDef GPIO_InitStructure;
ADC_InitTypeDef ADC_InitStructure;
DMA_InitTypeDef DMA_InitStructure;
NVIC_InitTypeDef NVIC_InitStructure;
void
ADC_DMA_GPIO_NVIC_settings(
void
);
void
TogglePin(
void
);
void
parser(
void
);
// need to declare
int
main()
{
Set_System();
Set_USBClock();
USB_Interrupts_Config();
USB_Init();
ADC_DMA_GPIO_NVIC_settings();
while
(1) {}
}
void
DMA1_Channel1_IRQHandler(
void
)
{
if
(DMA_GetITStatus(DMA1_IT_TC1))
//Test on DMA1 Channel1 Transfer Complete interrupt
{
TogglePin();
DMA_ClearITPendingBit(DMA1_IT_GL1);
}
}
void
TogglePin(
void
) {
if
(!GPIO_ReadOutputDataBit(GPIOA, GPIO_Pin_7)) {
GPIO_SetBits(GPIOA, GPIO_Pin_7); }
else
{
GPIO_ResetBits(GPIOA, GPIO_Pin_7); }
}
void
ADC_DMA_GPIO_NVIC_settings(
void
) {
/* ADCCLK = PCLK2/4 */
RCC_ADCCLKConfig(RCC_PCLK2_Div4);
/* Enable DMA1 clock */
RCC_AHBPeriphClockCmd(RCC_AHBPeriph_DMA1, ENABLE);
/* Enable ADC1 and GPIOA clock */
RCC_APB2PeriphClockCmd(RCC_APB2Periph_ADC1 | RCC_APB2Periph_GPIOA, ENABLE);
/* Configure PA.01 (ADC Channel_1) as analog input -------------------------*/
GPIO_InitStructure.GPIO_Pin = GPIO_Pin_1;
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AIN;
GPIO_Init(GPIOA, &GPIO_InitStructure);
/* Configure PA.07 as GPIO output of maple mini clone D4 as a test pin for DSO -*/
GPIO_InitStructure.GPIO_Pin = GPIO_Pin_7;
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_Out_PP;
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
GPIO_Init(GPIOA, &GPIO_InitStructure);
/* DMA1 channel1 configuration ----------------------------------------------*/
DMA_DeInit(DMA1_Channel1);
DMA_InitStructure.DMA_PeripheralBaseAddr = ADC1_DR_Address;
DMA_InitStructure.DMA_MemoryBaseAddr = (uint32_t)&ADC_Buffer[0];
DMA_InitStructure.DMA_DIR = DMA_DIR_PeripheralSRC;
DMA_InitStructure.DMA_BufferSize = 1000;
DMA_InitStructure.DMA_PeripheralInc = DMA_PeripheralInc_Disable;
DMA_InitStructure.DMA_MemoryInc = DMA_MemoryInc_Enable;
DMA_InitStructure.DMA_PeripheralDataSize = DMA_PeripheralDataSize_HalfWord;
DMA_InitStructure.DMA_MemoryDataSize = DMA_MemoryDataSize_HalfWord;
DMA_InitStructure.DMA_Mode = DMA_Mode_Circular;
DMA_InitStructure.DMA_Priority = DMA_Priority_High;
DMA_InitStructure.DMA_M2M = DMA_M2M_Disable;
DMA_Init(DMA1_Channel1, &DMA_InitStructure);
// Enable DMA1 Channel Transfer Complete interrupt
DMA_ITConfig(DMA1_Channel1, DMA_IT_TC, ENABLE);
//Enable DMA1 channel IRQ Channel */
NVIC_InitStructure.NVIC_IRQChannel = DMA1_Channel1_IRQn;
NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = 0;
NVIC_InitStructure.NVIC_IRQChannelSubPriority = 0;
NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE;
NVIC_Init(&NVIC_InitStructure);
/* Enable DMA1 channel1 */
DMA_Cmd(DMA1_Channel1, ENABLE);
/* ADC1 configuration ------------------------------------------------------*/
ADC_InitStructure.ADC_Mode = ADC_Mode_Independent;
ADC_InitStructure.ADC_ScanConvMode = ENABLE;
ADC_InitStructure.ADC_ContinuousConvMode = ENABLE;
ADC_InitStructure.ADC_ExternalTrigConv = ADC_ExternalTrigConv_None;
ADC_InitStructure.ADC_DataAlign = ADC_DataAlign_Right;
ADC_InitStructure.ADC_NbrOfChannel = 1;
ADC_Init(ADC1, &ADC_InitStructure);
/* ADC1 regular channel1 configuration */
//- PIN10 Mapple Mini
ADC_RegularChannelConfig(ADC1, ADC_Channel_1, 1, ADC_SampleTime_1Cycles5);
/* Enable ADC1 DMA */
ADC_DMACmd(ADC1, ENABLE);
/* Enable ADC1 */
ADC_Cmd(ADC1, ENABLE);
ADC_ResetCalibration(ADC1);
while
(ADC_GetResetCalibrationStatus(ADC1));
ADC_StartCalibration(ADC1);
while
(ADC_GetCalibrationStatus(ADC1));
ADC1->CR2 |= ((uint32_t)0x00500000);
// start ADC
}
void
parser() {}Set_System();
Set_USBClock();
USB_Interrupts_Config();
USB_Init();
