fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-03 15:38:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Stop expecting CONFIG_HRT_anything since we aren't baking it into the NuttX config anymore.

Browse Source
This commit is contained in:
px4dev
2013-08-13 00:34:41 -07:00
parent 56d355414c
commit de749a3602
6 changed files with 19 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nuttx-configs/px4fmu-v1/include/board.h
+4 -8
View File
@@ -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
nuttx-configs/px4io-v1/include/board.h
+4 -8
View File
@@ -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
nuttx-configs/px4io-v1/nsh/defconfig
-22
View File
@@ -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
#