Merge pull request #8134 from jeromecoutant/PR_L1_ADC

STM32L1 ADC update for internal channels
pull/8298/head
Martin Kojtal 2018-10-01 11:48:44 +02:00 committed by GitHub
commit 6ec90d1224
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions

View File

@ -105,6 +105,9 @@ uint16_t adc_read(analogin_t *obj)
ADC_ChannelConfTypeDef sConfig = {0};
// Configure ADC channel
sConfig.Rank = ADC_REGULAR_RANK_1;
sConfig.SamplingTime = ADC_SAMPLETIME_48CYCLES;
switch (obj->channel) {
case 0:
sConfig.Channel = ADC_CHANNEL_0;
@ -156,9 +159,11 @@ uint16_t adc_read(analogin_t *obj)
break;
case 16:
sConfig.Channel = ADC_CHANNEL_TEMPSENSOR;
sConfig.SamplingTime = ADC_SAMPLETIME_384CYCLES;
break;
case 17:
sConfig.Channel = ADC_CHANNEL_VREFINT;
sConfig.SamplingTime = ADC_SAMPLETIME_384CYCLES;
break;
case 18:
sConfig.Channel = ADC_CHANNEL_18;
@ -216,9 +221,6 @@ uint16_t adc_read(analogin_t *obj)
return 0;
}
sConfig.Rank = ADC_REGULAR_RANK_1;
sConfig.SamplingTime = ADC_SAMPLETIME_16CYCLES;
HAL_ADC_ConfigChannel(&obj->handle, &sConfig);
HAL_ADC_Start(&obj->handle); // Start conversion