diff options
author | px4dev <px4@purgatory.org> | 2013-08-13 00:34:41 -0700 |
---|---|---|
committer | px4dev <px4@purgatory.org> | 2013-08-13 00:34:41 -0700 |
commit | de749a3602423f5ee6ca56f3cf2dfff04e31ec6d (patch) | |
tree | c2fa4a07fabc79007fa052a1bf50673b5692fcc0 /nuttx-configs/px4fmu-v1 | |
parent | 56d355414cbfef92b39af6830932e7f1487b03b9 (diff) | |
download | px4-firmware-de749a3602423f5ee6ca56f3cf2dfff04e31ec6d.tar.gz px4-firmware-de749a3602423f5ee6ca56f3cf2dfff04e31ec6d.tar.bz2 px4-firmware-de749a3602423f5ee6ca56f3cf2dfff04e31ec6d.zip |
Stop expecting CONFIG_HRT_anything since we aren't baking it into the NuttX config anymore.
Diffstat (limited to 'nuttx-configs/px4fmu-v1')
-rw-r--r-- | nuttx-configs/px4fmu-v1/include/board.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/nuttx-configs/px4fmu-v1/include/board.h b/nuttx-configs/px4fmu-v1/include/board.h index 5529d5097..839631b3a 100644 --- a/nuttx-configs/px4fmu-v1/include/board.h +++ b/nuttx-configs/px4fmu-v1/include/board.h @@ -158,10 +158,8 @@ /* High-resolution timer */ -#ifdef CONFIG_HRT_TIMER -# define HRT_TIMER 1 /* use timer1 for the HRT */ -# define HRT_TIMER_CHANNEL 1 /* use capture/compare channel */ -#endif +#define HRT_TIMER 1 /* use timer1 for the HRT */ +#define HRT_TIMER_CHANNEL 1 /* use capture/compare channel */ /* LED definitions ******************************************************************/ /* If CONFIG_ARCH_LEDS is not defined, then the user can control the LEDs in any @@ -241,10 +239,8 @@ * * PPM input is handled by the HRT timer. */ -#if defined(CONFIG_HRT_TIMER) && defined (CONFIG_HRT_PPM) -# define HRT_PPM_CHANNEL 3 /* use capture/compare channel 3 */ -# define GPIO_PPM_IN (GPIO_ALT|GPIO_AF1|GPIO_SPEED_50MHz|GPIO_PULLUP|GPIO_PORTA|GPIO_PIN10) -#endif +#define HRT_PPM_CHANNEL 3 /* use capture/compare channel 3 */ +#define GPIO_PPM_IN (GPIO_ALT|GPIO_AF1|GPIO_SPEED_50MHz|GPIO_PULLUP|GPIO_PORTA|GPIO_PIN10) /* * CAN |