diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-01-06 02:40:41 -0800 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-01-06 02:40:41 -0800 |
| commit | 309980cd4d773e5c2bd6bab2f1c181243f8acd8f (patch) | |
| tree | 8cf77215fb1b37105a4c1b1a136992820c064359 /apps/drivers/boards/px4fmu/px4fmu_init.c | |
| parent | 58309fd6a863805e16602f4bec82eb35e0a14262 (diff) | |
| parent | 34d078b556bdd5f82bfcfbe8ce13d4c3b333e458 (diff) | |
| download | px4-firmware-309980cd4d773e5c2bd6bab2f1c181243f8acd8f.tar.gz px4-firmware-309980cd4d773e5c2bd6bab2f1c181243f8acd8f.tar.bz2 px4-firmware-309980cd4d773e5c2bd6bab2f1c181243f8acd8f.zip | |
Merge pull request #130 from PX4/px4io-adc-integration-battery-msg
Enables the PX4IO ADC (from px4io-adc-integration branch)
Diffstat (limited to 'apps/drivers/boards/px4fmu/px4fmu_init.c')
| -rw-r--r-- | apps/drivers/boards/px4fmu/px4fmu_init.c | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/apps/drivers/boards/px4fmu/px4fmu_init.c b/apps/drivers/boards/px4fmu/px4fmu_init.c index 57ffb77d3..c2aed9b54 100644 --- a/apps/drivers/boards/px4fmu/px4fmu_init.c +++ b/apps/drivers/boards/px4fmu/px4fmu_init.c @@ -95,8 +95,6 @@ * Protected Functions ****************************************************************************/ -extern int adc_devinit(void); - /**************************************************************************** * Public Functions ****************************************************************************/ @@ -209,8 +207,7 @@ __EXPORT int nsh_archinitialize(void) message("[boot] Successfully initialized SPI port 1\r\n"); -#if defined(CONFIG_STM32_SPI3) - /* Get the SPI port */ + /* Get the SPI port for the microSD slot */ message("[boot] Initializing SPI port 3\n"); spi3 = up_spiinitialize(3); @@ -233,23 +230,11 @@ __EXPORT int nsh_archinitialize(void) } message("[boot] Successfully bound SPI port 3 to the MMCSD driver\n"); -#endif /* SPI3 */ - -#ifdef CONFIG_ADC - int adc_state = adc_devinit(); - - if (adc_state != OK) { - /* Try again */ - adc_state = adc_devinit(); - if (adc_state != OK) { - /* Give up */ - message("[boot] FAILED adc_devinit: %d\n", adc_state); - return -ENODEV; - } - } - -#endif + stm32_configgpio(GPIO_ADC1_IN10); + stm32_configgpio(GPIO_ADC1_IN11); + //stm32_configgpio(GPIO_ADC1_IN12); // XXX is this available? + //stm32_configgpio(GPIO_ADC1_IN13); // jumperable to MPU6000 DRDY on some boards return OK; } |