diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-01-12 00:38:49 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-01-12 00:38:49 +0100 |
| commit | dad7f9f436e38fa1cae185156bb13c7920ae29da (patch) | |
| tree | 34224ee6c5a323233f2611b17f3652749ea38cea /apps/drivers | |
| parent | 2f94a7a2b71b569361bf4772638fc2c6aa7faef0 (diff) | |
| download | px4-firmware-dad7f9f436e38fa1cae185156bb13c7920ae29da.tar.gz px4-firmware-dad7f9f436e38fa1cae185156bb13c7920ae29da.tar.bz2 px4-firmware-dad7f9f436e38fa1cae185156bb13c7920ae29da.zip | |
Selected adjustments / fixes to make old apps compatible with new-style ADC driver
Diffstat (limited to 'apps/drivers')
| -rw-r--r-- | apps/drivers/boards/px4fmu/px4fmu_init.c | 2 | ||||
| -rw-r--r-- | apps/drivers/stm32/adc/adc.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/drivers/boards/px4fmu/px4fmu_init.c b/apps/drivers/boards/px4fmu/px4fmu_init.c index 2a7bfe3d7..e88d2861e 100644 --- a/apps/drivers/boards/px4fmu/px4fmu_init.c +++ b/apps/drivers/boards/px4fmu/px4fmu_init.c @@ -226,7 +226,7 @@ __EXPORT int nsh_archinitialize(void) stm32_configgpio(GPIO_ADC1_IN10); stm32_configgpio(GPIO_ADC1_IN11); stm32_configgpio(GPIO_ADC1_IN12); - //stm32_configgpio(GPIO_ADC1_IN13); // jumperable to MPU6000 DRDY on some boards + stm32_configgpio(GPIO_ADC1_IN13); // jumperable to MPU6000 DRDY on some boards return OK; } diff --git a/apps/drivers/stm32/adc/adc.cpp b/apps/drivers/stm32/adc/adc.cpp index 87dac1ef9..911def943 100644 --- a/apps/drivers/stm32/adc/adc.cpp +++ b/apps/drivers/stm32/adc/adc.cpp @@ -366,8 +366,8 @@ int adc_main(int argc, char *argv[]) { if (g_adc == nullptr) { - /* XXX this hardcodes the minimum channel set for PX4FMU - should be configurable */ - g_adc = new ADC((1 << 10) | (1 << 11)); + /* XXX this hardcodes the default channel set for PX4FMU - should be configurable */ + g_adc = new ADC((1 << 10) | (1 << 11) | (1 << 12) | (1 << 13)); if (g_adc == nullptr) errx(1, "couldn't allocate the ADC driver"); |