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

Add CONFIG_ADC_NO_STARTUP support for STM32 F1 (untested)

Browse Source
This commit is contained in:
Juha Niskanen 2015-07-30 07:42:31 -06:00 committed by Gregory Nutt
parent f795e386d7
commit 7407e41569
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/Kconfig
View File

@ -226,7 +226,6 @@ config ARCH_CHIP_STR71X
config ARCH_CHIP_MOXART config ARCH_CHIP_MOXART
bool "MoxART" bool "MoxART"
select ARCH_ARM7TDMI select ARCH_ARM7TDMI
select ARCH_HAVE_RAMVECTORS
select ARCH_HAVE_RESET select ARCH_HAVE_RESET
---help--- ---help---
MoxART family MoxART family

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

@ -1511,7 +1511,7 @@ static void adc_reset(FAR struct adc_dev_s *dev)
{ {
adbg("Error initializing the timers\n"); adbg("Error initializing the timers\n");
} }
#else #elif !defined(CONFIG_ADC_NO_STARTUP_CONV)
#ifdef CONFIG_STM32_STM32F10XX #ifdef CONFIG_STM32_STM32F10XX
/* Set ADON (Again) to start the conversion. Only if Timers are not /* Set ADON (Again) to start the conversion. Only if Timers are not
@ -1519,10 +1519,10 @@ static void adc_reset(FAR struct adc_dev_s *dev)
*/ */
adc_enable(priv, true); adc_enable(priv, true);
#else
#elif !defined(CONFIG_ADC_NO_STARTUP_CONV)
adc_startconv(priv, true); adc_startconv(priv, true);
#endif /* CONFIG_STM32_STM32F10XX */ #endif /* CONFIG_STM32_STM32F10XX */
#endif /* ADC_HAVE_TIMER */ #endif /* ADC_HAVE_TIMER */
irqrestore(flags); irqrestore(flags);
@ -2085,10 +2085,10 @@ static int adc_set_ch_idx(FAR struct adc_dev_s *dev, uint8_t idx)
} }
/**************************************************************************** /****************************************************************************
* Name: adc_set_channel * Name: adc_set_ch
* *
* Description: * Description:
* All ioctl calls will be routed through this method. * Sets the ADC channel.
* *
* Input Parameters: * Input Parameters:
* dev - pointer to device structure used by the driver * dev - pointer to device structure used by the driver