|
@@ -429,7 +429,7 @@ static void MX_ADC1_Init(void)
|
|
hadc1.Init.ClockPrescaler = ADC_CLOCK_ASYNC_DIV1;
|
|
hadc1.Init.ClockPrescaler = ADC_CLOCK_ASYNC_DIV1;
|
|
hadc1.Init.Resolution = ADC_RESOLUTION_16B;
|
|
hadc1.Init.Resolution = ADC_RESOLUTION_16B;
|
|
hadc1.Init.ScanConvMode = ADC_SCAN_ENABLE;
|
|
hadc1.Init.ScanConvMode = ADC_SCAN_ENABLE;
|
|
- hadc1.Init.EOCSelection = ADC_EOC_SEQ_CONV;
|
|
+ hadc1.Init.EOCSelection = ADC_EOC_SINGLE_CONV;
|
|
hadc1.Init.LowPowerAutoWait = DISABLE;
|
|
hadc1.Init.LowPowerAutoWait = DISABLE;
|
|
hadc1.Init.ContinuousConvMode = ENABLE;
|
|
hadc1.Init.ContinuousConvMode = ENABLE;
|
|
hadc1.Init.NbrOfConversion = 7;
|
|
hadc1.Init.NbrOfConversion = 7;
|
|
@@ -555,7 +555,7 @@ static void MX_ADC2_Init(void)
|
|
hadc2.Init.ClockPrescaler = ADC_CLOCK_ASYNC_DIV1;
|
|
hadc2.Init.ClockPrescaler = ADC_CLOCK_ASYNC_DIV1;
|
|
hadc2.Init.Resolution = ADC_RESOLUTION_16B;
|
|
hadc2.Init.Resolution = ADC_RESOLUTION_16B;
|
|
hadc2.Init.ScanConvMode = ADC_SCAN_ENABLE;
|
|
hadc2.Init.ScanConvMode = ADC_SCAN_ENABLE;
|
|
- hadc2.Init.EOCSelection = ADC_EOC_SEQ_CONV;
|
|
+ hadc2.Init.EOCSelection = ADC_EOC_SINGLE_CONV;
|
|
hadc2.Init.LowPowerAutoWait = DISABLE;
|
|
hadc2.Init.LowPowerAutoWait = DISABLE;
|
|
hadc2.Init.ContinuousConvMode = ENABLE;
|
|
hadc2.Init.ContinuousConvMode = ENABLE;
|
|
hadc2.Init.NbrOfConversion = 3;
|
|
hadc2.Init.NbrOfConversion = 3;
|
|
@@ -1263,7 +1263,7 @@ void HAL_ADC_ConvCpltCallback(ADC_HandleTypeDef *hadc)
|
|
{
|
|
{
|
|
osMessageQueuePut(adc1MeasDataQueue, &adc1Data, 0, 0);
|
|
osMessageQueuePut(adc1MeasDataQueue, &adc1Data, 0, 0);
|
|
}
|
|
}
|
|
- if(HAL_ADCEx_MultiModeStart_DMA(&hadc1, (uint32_t *)adc1Data.adcDataBuffer, ADC1LastData*sizeof(uint16_t)) != HAL_OK)
|
|
+ if(HAL_ADCEx_MultiModeStart_DMA(&hadc1, (uint32_t *)adc1Data.adcDataBuffer, ADC1LastData*sizeof(uint32_t)) != HAL_OK)
|
|
{
|
|
{
|
|
Error_Handler();
|
|
Error_Handler();
|
|
}
|
|
}
|
|
@@ -1310,7 +1310,7 @@ void StartDefaultTask(void *argument)
|
|
{
|
|
{
|
|
Error_Handler();
|
|
Error_Handler();
|
|
}
|
|
}
|
|
- if(HAL_ADCEx_MultiModeStart_DMA(&hadc1, (uint32_t *)adc1Data.adcDataBuffer, ADC1LastData*sizeof(uint16_t)) != HAL_OK)
|
|
+ if(HAL_ADCEx_MultiModeStart_DMA(&hadc1, (uint32_t *)adc1Data.adcDataBuffer, ADC1LastData*sizeof(uint32_t)) != HAL_OK)
|
|
{
|
|
{
|
|
Error_Handler();
|
|
Error_Handler();
|
|
}
|
|
}
|