PX4FMUV5 **corrected** and moved GPIO defines to px4fmu-v5/board_config.h

This commit is contained in:
David Sidrane
2017-01-18 11:26:37 -10:00
committed by Lorenz Meier
parent 62dee7d096
commit 0b89088065
2 changed files with 41 additions and 32 deletions
+41 -8
View File
@@ -381,14 +381,47 @@ __BEGIN_DECLS
#define BOARD_HAS_PWM DIRECT_PWM_OUTPUT_CHANNELS
#define BOARD_FMU_GPIO_TAB { \
{GPIO_GPIO0_INPUT, GPIO_GPIO0_OUTPUT, 0}, \
{GPIO_GPIO1_INPUT, GPIO_GPIO1_OUTPUT, 0}, \
{GPIO_GPIO2_INPUT, GPIO_GPIO2_OUTPUT, 0}, \
{GPIO_GPIO3_INPUT, GPIO_GPIO3_OUTPUT, 0}, \
{GPIO_GPIO4_INPUT, GPIO_GPIO4_OUTPUT, 0}, \
{GPIO_GPIO5_INPUT, GPIO_GPIO5_OUTPUT, 0}, \
{0, GPIO_VDD_3V3_SENSORS_EN, 0}, \
{GPIO_VDD_BRICK_VALID, 0, 0}, }
{GPIO_GPIO0_INPUT, GPIO_GPIO0_OUTPUT, 0}, \
{GPIO_GPIO1_INPUT, GPIO_GPIO1_OUTPUT, 0}, \
{GPIO_GPIO2_INPUT, GPIO_GPIO2_OUTPUT, 0}, \
{GPIO_GPIO3_INPUT, GPIO_GPIO3_OUTPUT, 0}, \
{GPIO_GPIO4_INPUT, GPIO_GPIO4_OUTPUT, 0}, \
{GPIO_GPIO5_INPUT, GPIO_GPIO5_OUTPUT, 0}, \
{GPIO_POWER_IN_A, 0, 0}, \
{GPIO_POWER_IN_B, 0, 0}, \
{GPIO_POWER_IN_C, 0, 0}, \
{0, GPIO_VDD_3V3_SENSORS_EN, 0}, \
{GPIO_VDD_BRICK_VALID, 0, 0}, \
{0, GPIO_SPEKTRUM_POWER_EN, 0}, \
{0, GPIO_PERIPH_5V_EN, 0}, \
{0, GPIO_VDD_5V_RC_EN, 0}, \
{0, GPIO_VDD_5V_WIFI_EN, 0}, \
{0, GPIO_VDD_3V3V_SD_CARD_EN, 0}, }
/*
* GPIO numbers.
*
* There are no alternate functions on this board.
*/
#define GPIO_SERVO_1 (1<<0) /**< servo 1 output */
#define GPIO_SERVO_2 (1<<1) /**< servo 2 output */
#define GPIO_SERVO_3 (1<<2) /**< servo 3 output */
#define GPIO_SERVO_4 (1<<3) /**< servo 4 output */
#define GPIO_SERVO_5 (1<<4) /**< servo 5 output */
#define GPIO_SERVO_6 (1<<5) /**< servo 6 output */
#define GPIO_POWER_INPUT_A (1<<6) /**<PG1 GPIO_POWER_IN_A */
#define GPIO_POWER_INPUT_B (1<<7) /**<PG2 GPIO_POWER_IN_B */
#define GPIO_POWER_INPUT_C (1<<8) /**<PG3 GPIO_POWER_IN_C */
#define GPIO_3V3_SENSORS_EN (1<<9) /**< PE3 - VDD_3V3_SENSORS_EN */
#define GPIO_BRICK_VALID (1<<10) /**< PB10 - !VDD_BRICK_VALID */
#define GPIO_SPEKTRUM_POWER (1<<11) /**< PE4 - GPIO_SPEKTRUM_POWER_EN */
#define GPIO_PERIPH_5V_POWER_EN (1<<12) /**< PG4 - GPIO_PERIPH_5V_EN */
#define GPIO_RC_POWER_EN (1<<13) /**< PG5 - GPIO_VDD_5V_RC_EN */
#define GPIO_WIFI_POWER_EN (1<<14) /**< PG6 - GPIO_VDD_5V_WIFI_EN */
#define GPIO_SD_CARD_POWER_EN (1<<15) /**< PG7 - GPIO_VDD_3V3V_SD_CARD_EN */
/* This board provides a DMA pool and APIs */
-24
View File
@@ -75,29 +75,6 @@
#endif
#ifdef CONFIG_ARCH_BOARD_PX4FMU_V5
/*
* PX4FMUv5 GPIO numbers.
*
* There are no alternate functions on this board.
*/
# define GPIO_SERVO_1 (1<<0) /**< servo 1 output */
# define GPIO_SERVO_2 (1<<1) /**< servo 2 output */
# define GPIO_SERVO_3 (1<<2) /**< servo 3 output */
# define GPIO_SERVO_4 (1<<3) /**< servo 4 output */
# define GPIO_SERVO_5 (1<<4) /**< servo 5 output */
# define GPIO_SERVO_6 (1<<5) /**< servo 6 output */
# define GPIO_3V3_SENSORS_EN (1<<7) /**< PE3 - VDD_3V3_SENSORS_EN */
# define GPIO_BRICK_VALID (1<<8) /**< PB5 - !VDD_BRICK_VALID */
/**
* Device paths for things that support the GPIO ioctl protocol.
*/
# define PX4FMU_DEVICE_PATH "/dev/px4fmu"
#endif
#ifdef CONFIG_ARCH_BOARD_PX4NUCLEOF767ZI_V1
/*
* PX4FMUv3 GPIO numbers.
@@ -264,7 +241,6 @@
!defined(CONFIG_ARCH_BOARD_PX4FMU_V1) && \
!defined(CONFIG_ARCH_BOARD_PX4FMU_V4) && \
!defined(CONFIG_ARCH_BOARD_PX4FMU_V4PRO) && \
!defined(CONFIG_ARCH_BOARD_PX4FMU_V5) && \
!defined(CONFIG_ARCH_BOARD_PX4IO_V1) && \
!defined(CONFIG_ARCH_BOARD_PX4IO_V2) && \
!defined(CONFIG_ARCH_BOARD_PX4NUCLEOF767ZI_V1) && \