diff options
| author | Alexey Luchko <luch@airdog.com> | 2014-11-27 00:20:47 +0200 |
|---|---|---|
| committer | Alexey Luchko <luch@airdog.com> | 2014-11-27 00:20:47 +0200 |
| commit | 91163f3d8e9eb7ff99084715e4c11ae8d295b4e3 (patch) | |
| tree | 4a2444383cb1519c011c2062733b4487a924559d | |
| parent | 2808c8848795b7ebca02211aa9f66a65005f4669 (diff) | |
| download | px4-firmware-91163f3d8e9eb7ff99084715e4c11ae8d295b4e3.tar.gz px4-firmware-91163f3d8e9eb7ff99084715e4c11ae8d295b4e3.tar.bz2 px4-firmware-91163f3d8e9eb7ff99084715e4c11ae8d295b4e3.zip | |
[AirDogFMU] removed ADC channel number duplication from ADC config.
| -rw-r--r-- | src/drivers/boards/AirDogFMU/board_config.h | 4 | ||||
| -rw-r--r-- | src/drivers/boards/AirDogFMU/init.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/drivers/boards/AirDogFMU/board_config.h b/src/drivers/boards/AirDogFMU/board_config.h index e9a4831be..f088d006a 100644 --- a/src/drivers/boards/AirDogFMU/board_config.h +++ b/src/drivers/boards/AirDogFMU/board_config.h @@ -146,10 +146,6 @@ __BEGIN_DECLS #define GPIO_VDD_BRICK_VALID (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTB|GPIO_PIN5) // PX4 uses GPIO_OTGFS_VBUS in place of GPIO_VDD_VBUS_VALID. -#define GPIO_ADC_BATT_CURRENT GPIO_ADC1_IN13 -#define GPIO_ADC_BATT_VOLTAGE GPIO_ADC1_IN11 -#define GPIO_ADC_SENS_VOLTAGE GPIO_ADC1_IN14 - #define N_ADC_CHANNELS 3 #define ADC_BATTERY_CURRENT_CHANNEL 13 #define ADC_BATTERY_VOLTAGE_CHANNEL 11 diff --git a/src/drivers/boards/AirDogFMU/init.c b/src/drivers/boards/AirDogFMU/init.c index c265b1fca..ef3e42ebd 100644 --- a/src/drivers/boards/AirDogFMU/init.c +++ b/src/drivers/boards/AirDogFMU/init.c @@ -207,11 +207,15 @@ static struct spi_dev_s *spi1; static struct spi_dev_s *spi4; static struct sdio_dev_s *sdio; +static void adc_init(); + __EXPORT int nsh_archinitialize(void) { /* configure debug button pin */ stm32_configgpio(GPIO_DEBUG_BTN); + adc_init(); + /* configure the high-resolution time/callout interface */ hrt_init(); |