diff options
| author | px4dev <px4@purgatory.org> | 2013-07-10 23:50:37 -0700 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-07-10 23:50:37 -0700 |
| commit | f5b91e109df755a6171264b59e92099b3ab20dbe (patch) | |
| tree | 39c86e935fd2db204c6584871886168a65fe6641 /src/drivers/stm32/adc | |
| parent | f27491d2e575f4a421fc957786e424c34f8488b4 (diff) | |
| download | px4-firmware-f5b91e109df755a6171264b59e92099b3ab20dbe.tar.gz px4-firmware-f5b91e109df755a6171264b59e92099b3ab20dbe.tar.bz2 px4-firmware-f5b91e109df755a6171264b59e92099b3ab20dbe.zip | |
More GPIO and general pin assignment fixes.
Diffstat (limited to 'src/drivers/stm32/adc')
| -rw-r--r-- | src/drivers/stm32/adc/adc.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/drivers/stm32/adc/adc.cpp b/src/drivers/stm32/adc/adc.cpp index 1020eb946..48c95b3dd 100644 --- a/src/drivers/stm32/adc/adc.cpp +++ b/src/drivers/stm32/adc/adc.cpp @@ -227,7 +227,6 @@ ADC::init() if ((hrt_absolute_time() - now) > 500) { log("sample timeout"); return -1; - return 0xffff; } } @@ -282,7 +281,7 @@ ADC::close_last(struct file *filp) void ADC::_tick_trampoline(void *arg) { - ((ADC *)arg)->_tick(); + (reinterpret_cast<ADC *>(arg))->_tick(); } void @@ -366,8 +365,15 @@ int adc_main(int argc, char *argv[]) { if (g_adc == nullptr) { - /* XXX this hardcodes the default channel set for PX4FMU - should be configurable */ +#ifdef CONFIG_ARCH_BOARD_PX4FMU_V1 + /* XXX this hardcodes the default channel set for PX4FMUv1 - should be configurable */ g_adc = new ADC((1 << 10) | (1 << 11) | (1 << 12) | (1 << 13)); +#endif +#ifdef CONFIG_ARCH_BOARD_PX4FMU_V2 + /* XXX this hardcodes the default channel set for PX4FMUv2 - should be configurable */ + g_adc = new ADC((1 << 2) | (1 << 3) | (1 << 4) | + (1 << 10) | (1 << 11) | (1 << 12) | (1 << 13) | (1 << 14) | (1 << 15)); +#endif if (g_adc == nullptr) errx(1, "couldn't allocate the ADC driver"); |