From de749a3602423f5ee6ca56f3cf2dfff04e31ec6d Mon Sep 17 00:00:00 2001
From: px4dev <px4@purgatory.org>
Date: Tue, 13 Aug 2013 00:34:41 -0700
Subject: Stop expecting CONFIG_HRT_anything since we aren't baking it into the
 NuttX config anymore.

---
 nuttx-configs/px4io-v1/include/board.h | 12 ++++--------
 nuttx-configs/px4io-v1/nsh/defconfig   | 22 ----------------------
 2 files changed, 4 insertions(+), 30 deletions(-)

(limited to 'nuttx-configs/px4io-v1')

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
@@ -200,28 +200,6 @@ SERIAL_HAVE_CONSOLE_DMA=y
 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
 #
-- 
cgit v1.2.3