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/px4io-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/px4io-v1')
| -rwxr-xr-x | nuttx-configs/px4io-v1/include/board.h | 12 | ||||
| -rwxr-xr-x | nuttx-configs/px4io-v1/nsh/defconfig | 22 |
2 files changed, 4 insertions, 30 deletions
diff --git a/nuttx-configs/px4io-v1/include/board.h b/nuttx-configs/px4io-v1/include/board.h index 668602ea8..6503a94cd 100755 --- a/nuttx-configs/px4io-v1/include/board.h +++ b/nuttx-configs/px4io-v1/include/board.h @@ -118,10 +118,8 @@ /* * High-resolution timer */ -#ifdef CONFIG_HRT_TIMER -# define HRT_TIMER 1 /* use timer1 for the HRT */ -# define HRT_TIMER_CHANNEL 2 /* use capture/compare channel 2 */ -#endif +#define HRT_TIMER 1 /* use timer1 for the HRT */ +#define HRT_TIMER_CHANNEL 2 /* use capture/compare channel 2 */ /* * PPM @@ -130,10 +128,8 @@ * * Pin is PA8, timer 1, channel 1 */ -#if defined(CONFIG_HRT_TIMER) && defined (CONFIG_HRT_PPM) -# define HRT_PPM_CHANNEL 1 /* use capture/compare channel 1 */ -# define GPIO_PPM_IN GPIO_TIM1_CH1IN -#endif +#define HRT_PPM_CHANNEL 1 /* use capture/compare channel 1 */ +#define GPIO_PPM_IN GPIO_TIM1_CH1IN /************************************************************************************ * Public Data diff --git a/nuttx-configs/px4io-v1/nsh/defconfig b/nuttx-configs/px4io-v1/nsh/defconfig index 525672233..3785e0367 100755 --- a/nuttx-configs/px4io-v1/nsh/defconfig +++ b/nuttx-configs/px4io-v1/nsh/defconfig @@ -201,28 +201,6 @@ CONFIG_USART2_RXDMA=n CONFIG_USART3_RXDMA=y # -# PX4IO specific driver settings -# -# CONFIG_HRT_TIMER -# Enables the high-resolution timer. The board definition must -# set HRT_TIMER and HRT_TIMER_CHANNEL to the timer and capture/ -# compare channels to be used. -# CONFIG_HRT_PPM -# Enables R/C PPM input using the HRT. The board definition must -# set HRT_PPM_CHANNEL to the timer capture/compare channel to be -# used, and define GPIO_PPM_IN to configure the appropriate timer -# GPIO. -# CONFIG_PWM_SERVO -# Enables the PWM servo driver. The driver configuration must be -# supplied by the board support at initialisation time. -# Note that USART2 must be disabled on the PX4 board for this to -# be available. -# -# -CONFIG_HRT_TIMER=y -CONFIG_HRT_PPM=y - -# # General build options # # CONFIG_RRLOAD_BINARY - make the rrload binary format used with |