diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-01-05 15:19:39 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-01-05 15:19:39 +0100 |
| commit | 018e42733a568f5545864520866c891ed104d783 (patch) | |
| tree | 5780ea6645b3fd6342199ae95c2b1618da874672 /src/drivers/boards/px4io-v2/board_config.h | |
| parent | a65de1e0b9412708c862fbe87d459250a7a3d5fd (diff) | |
| parent | ba4f881f807e75edc75d2ad2084dd1ebbbec3802 (diff) | |
| download | px4-firmware-018e42733a568f5545864520866c891ed104d783.tar.gz px4-firmware-018e42733a568f5545864520866c891ed104d783.tar.bz2 px4-firmware-018e42733a568f5545864520866c891ed104d783.zip | |
Merge branch 'master' of github.com:PX4/Firmware into navigator_new
Diffstat (limited to 'src/drivers/boards/px4io-v2/board_config.h')
| -rw-r--r-- | src/drivers/boards/px4io-v2/board_config.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/drivers/boards/px4io-v2/board_config.h b/src/drivers/boards/px4io-v2/board_config.h index 4d41d0d07..8da555211 100644 --- a/src/drivers/boards/px4io-v2/board_config.h +++ b/src/drivers/boards/px4io-v2/board_config.h @@ -1,6 +1,6 @@ /**************************************************************************** * - * Copyright (C) 2012 PX4 Development Team. All rights reserved. + * Copyright (c) 2013, 2014 PX4 Development Team. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -32,7 +32,7 @@ ****************************************************************************/ /** - * @file px4iov2_internal.h + * @file board_config.h * * PX4IOV2 internal definitions */ @@ -122,7 +122,7 @@ #define HRT_TIMER 1 /* use timer1 for the HRT */ #define HRT_TIMER_CHANNEL 2 /* use capture/compare channel 2 */ #define HRT_PPM_CHANNEL 1 /* use capture/compare channel 1 */ -#define GPIO_PPM_IN GPIO_TIM1_CH1IN +#define GPIO_PPM_IN (GPIO_ALT|GPIO_CNF_INPULLUP|GPIO_PORTE|GPIO_PIN9) /* LED definitions ******************************************************************/ /* PX4 has two LEDs that we will encode as: */ |