From 410e822775aa4fabd39fe3431a44aae1914b548b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beat=20K=C3=BCng?= Date: Mon, 19 Jun 2017 14:26:47 +0200 Subject: [PATCH] px4fmu-v4pro board_config: swap BRICK1 with BRICK2 problem: previously when connecting power to Power 1, commander refused to arm (no power source error), and when connecting to Power 2, arming works, but power consumption was not measured (& shown in QGC). Swapping Brick1 with Brick2 makes sure both works when connecting to power 1. Ideally we will have support for both power sources (including fail-over) --- src/drivers/boards/px4fmu-v4pro/board_config.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/drivers/boards/px4fmu-v4pro/board_config.h b/src/drivers/boards/px4fmu-v4pro/board_config.h index 431bffd4cd..dcc3cd65e3 100644 --- a/src/drivers/boards/px4fmu-v4pro/board_config.h +++ b/src/drivers/boards/px4fmu-v4pro/board_config.h @@ -233,8 +233,8 @@ __BEGIN_DECLS #define GPIO_GPIO5_OUTPUT (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTD|GPIO_PIN14) /* Power supply control and monitoring GPIOs */ -#define GPIO_VDD_BRICK_VALID (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTB|GPIO_PIN5) -#define GPIO_VDD_BRICK2_VALID (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTG|GPIO_PIN5) +#define GPIO_VDD_BRICK_VALID (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTG|GPIO_PIN5) +#define GPIO_VDD_BRICK2_VALID (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTB|GPIO_PIN5) #define GPIO_VDD_3V3_SENSORS_EN (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTE|GPIO_PIN3) #define GPIO_VDD_3V3_PERIPH_EN (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTC|GPIO_PIN5) #define GPIO_VDD_5V_PERIPH_EN (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTG|GPIO_PIN10) @@ -355,8 +355,8 @@ __BEGIN_DECLS #define GPIO_3V3_SENSORS_EN (1<<6) /**< PE3 - GPIO_VDD_3V3_SENSORS_EN */ #define GPIO_3V3_PERIPH_EN (1<<7) /**< PC5 - GPIO_VDD_3V3_PERIPH_EN */ -#define GPIO_BRICK_VALID (1<<8) /**< PB5 - !GPIO_VDD_BRICK_VALID */ -#define GPIO_BRICK2_VALID (1<<9) /**< PG5 - !GPIO_VDD_BRICK2_VALID */ +#define GPIO_BRICK_VALID (1<<8) /**< PG5 - !GPIO_VDD_BRICK_VALID */ +#define GPIO_BRICK2_VALID (1<<9) /**< PB5 - !GPIO_VDD_BRICK2_VALID */ #define GPIO_USB_VBUS_VALID (1<<10) /**< PC0 - !GPIO_VBUS_VALID */ #define GPIO_5V_HIPOWER_OC (1<<11) /**< PF3 - !GPIO_VDD_5V_RC_OC */