sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

stm32/stm32_adc.c: move maximum number of samples cfg to Kconfig.

Browse Source 
The maximum number of samples which can be handled without overrun depends on various factors.
This is the user's responsibility to correctly select this value.
Since the interfece to update the sampling time is available for all supported devices,
the user can change the default vaules in the board initialization logic and avoid ADC overrun.
This commit is contained in:
raiden00pl 2021-03-01 21:58:11 +01:00 committed by Alan Carvalho de Assis
parent 88753afb75
commit 94ff4564b4
2 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm/src/stm32/Kconfig
View File

@ -8151,6 +8151,17 @@ config STM32_ADC5_RESOLUTION
---help---
ADC5 resolution. 0 - 12 bit, 1 - 10 bit, 2 - 8 bit, 3 - 6 bit
config STM32_ADC_MAX_SAMPLES
int "The maximum number of channels that can be sampled"
default 16
---help---
The maximum number of samples which can be handled without
overrun depends on various factors. This is the user's
responsibility to correctly select this value.
Since the interfece to update the sampling time is available
for all supported devices, the user can change the default
vaules in the board initialization logic and avoid ADC overrun.
config STM32_ADC_NO_STARTUP_CONV
bool "Do not start conversion when opening ADC device"
default n

28
arch/arm/src/stm32/stm32_adc.c
View File

@ -148,26 +148,6 @@
/* ADC Channels/DMA *********************************************************/
/* The maximum number of channels that can be sampled. If DMA support is
* not enabled, then only a single channel can be sampled. Otherwise,
* data overruns would occur.
*/
#define ADC_MAX_CHANNELS_DMA 16
#define ADC_MAX_CHANNELS_NODMA 1
#ifdef ADC_HAVE_DMA
# define ADC_MAX_SAMPLES ADC_MAX_CHANNELS_DMA
#else
# if defined(CONFIG_STM32_STM32F30XX) || defined(CONFIG_STM32_STM32F33XX)
# define ADC_MAX_SAMPLES ADC_MAX_CHANNELS_DMA /* Works without DMA should sampling frequency be reduced */
# elif defined(CONFIG_STM32_STM32L15XX)
# define ADC_MAX_SAMPLES ADC_MAX_CHANNELS_DMA /* Works without DMA as IO_START_CONV can switch channels on the fly */
# else
# define ADC_MAX_SAMPLES ADC_MAX_CHANNELS_NODMA
# endif
#endif
/* DMA values differs according to STM32 DMA IP core version */
#if defined(HAVE_IP_DMA_V2)
@ -210,7 +190,7 @@
(ADC_SMPR_DEFAULT << ADC_SMPR2_SMP8_SHIFT) | \
(ADC_SMPR_DEFAULT << ADC_SMPR2_SMP9_SHIFT))
#elif defined(CONFIG_STM32_STM32F30XX) || defined(CONFIG_STM32_STM32F33XX)
# if defined(ADC_HAVE_DMA) || (ADC_MAX_SAMPLES == 1)
# if defined(ADC_HAVE_DMA) || (CONFIG_STM32_ADC_MAX_SAMPLES == 1)
# define ADC_SMPR_DEFAULT ADC_SMPR_61p5
# else /* Slow down sampling frequency */
# define ADC_SMPR_DEFAULT ADC_SMPR_601p5
@ -466,12 +446,12 @@ struct stm32_dev_s
/* DMA transfer buffer */
uint16_t r_dmabuffer[ADC_MAX_SAMPLES];
uint16_t r_dmabuffer[CONFIG_STM32_ADC_MAX_SAMPLES];
#endif
/* List of selected ADC channels to sample */
uint8_t r_chanlist[ADC_MAX_SAMPLES];
uint8_t r_chanlist[CONFIG_STM32_ADC_MAX_SAMPLES];
#ifdef ADC_HAVE_INJECTED
/* List of selected ADC injected channels to sample */
@ -4760,7 +4740,7 @@ struct adc_dev_s *stm32_adcinitialize(int intf, FAR const uint8_t *chanlist,
/* Configure regular channels */
DEBUGASSERT(cr_channels <= ADC_MAX_SAMPLES);
DEBUGASSERT(cr_channels <= CONFIG_STM32_ADC_MAX_SAMPLES);
priv->cr_channels = cr_channels;
memcpy(priv->r_chanlist, chanlist, cr_channels);