diff options
| author | px4dev <px4@purgatory.org> | 2012-12-31 01:26:58 -0800 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2012-12-31 01:26:58 -0800 |
| commit | 476db468697089895c15ab151e58b71c5b3a2c95 (patch) | |
| tree | 5ca1343c361c373a0f4ba2cddd94243d09e47e9c /nuttx/configs/px4fmu | |
| parent | c08135ffefcb171fd518e210b88e7e993361fd81 (diff) | |
| download | px4-firmware-476db468697089895c15ab151e58b71c5b3a2c95.tar.gz px4-firmware-476db468697089895c15ab151e58b71c5b3a2c95.tar.bz2 px4-firmware-476db468697089895c15ab151e58b71c5b3a2c95.zip | |
kill off the NuttX ADC driver config; we're not going to use it
Diffstat (limited to 'nuttx/configs/px4fmu')
| -rw-r--r-- | nuttx/configs/px4fmu/nsh/appconfig | 1 | ||||
| -rwxr-xr-x | nuttx/configs/px4fmu/nsh/defconfig | 26 |
2 files changed, 4 insertions, 23 deletions
diff --git a/nuttx/configs/px4fmu/nsh/appconfig b/nuttx/configs/px4fmu/nsh/appconfig index 0959687de..7f1a93df9 100644 --- a/nuttx/configs/px4fmu/nsh/appconfig +++ b/nuttx/configs/px4fmu/nsh/appconfig @@ -100,6 +100,7 @@ CONFIGURED_APPS += drivers/stm32 CONFIGURED_APPS += drivers/led CONFIGURED_APPS += drivers/blinkm CONFIGURED_APPS += drivers/stm32/tone_alarm +CONFIGURED_APPS += drivers/stm32/adc CONFIGURED_APPS += drivers/px4fmu CONFIGURED_APPS += drivers/hil diff --git a/nuttx/configs/px4fmu/nsh/defconfig b/nuttx/configs/px4fmu/nsh/defconfig index bc724c006..d9a48f2c8 100755 --- a/nuttx/configs/px4fmu/nsh/defconfig +++ b/nuttx/configs/px4fmu/nsh/defconfig @@ -189,9 +189,10 @@ CONFIG_STM32_TIM1=n CONFIG_STM32_TIM8=n CONFIG_STM32_USART1=y CONFIG_STM32_USART6=y -CONFIG_STM32_ADC1=n +# We use our own driver, but leave this on. +CONFIG_STM32_ADC1=y CONFIG_STM32_ADC2=n -CONFIG_STM32_ADC3=y +CONFIG_STM32_ADC3=n CONFIG_STM32_SDIO=n CONFIG_STM32_SPI1=y CONFIG_STM32_SYSCFG=y @@ -359,27 +360,6 @@ CONFIG_STM32_I2CTIMEOUS_START_STOP=700 CONFIG_I2C_WRITEREAD=y # -# ADC configuration -# -# Enable ADC driver support. -# -# CONFIG_ADC=y : Enable the generic ADC infrastructure -# CONFIG_STM32_TIM1_ADC=y : Indicate that timer 1 will be used to trigger an ADC -# CONFIG_STM32_TIM1_ADC3=y : Assign timer 1 to drive ADC3 sampling -# CONFIG_STM32_ADC3_SAMPLE_FREQUENCY=100 : Select a sampling frequency -# -CONFIG_ADC=y -CONFIG_STM32_TIM4_ADC3=y -# select sample frequency 1^=1.5Msamples/second -# 65535^=10samples/second 16bit-timer runs at 84/128 MHz -CONFIG_STM32_ADC3_SAMPLE_FREQUENCY=6000 -# select timer channel 0=CC1,...,3=CC4 -CONFIG_STM32_ADC3_TIMTRIG=3 -CONFIG_ADC_DMA=y -# only 4 places usable! -CONFIG_ADC_FIFOSIZE=5 - -# # General build options # # CONFIG_RRLOAD_BINARY - make the rrload binary format used with |