diff --git a/src/drivers/boards/px4fmu-v4/board_config.h b/src/drivers/boards/px4fmu-v4/board_config.h index 2d689f4e13..433f3024bc 100644 --- a/src/drivers/boards/px4fmu-v4/board_config.h +++ b/src/drivers/boards/px4fmu-v4/board_config.h @@ -291,6 +291,21 @@ {0, GPIO_VDD_3V3_SENSORS_EN, 0}, \ {GPIO_VDD_BRICK_VALID, 0, 0}, } +/* + * PX4FMUv4 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 */ + /* This board provides a DMA pool and APIs */ #define BOARD_DMA_ALLOC_POOL_SIZE 5120 diff --git a/src/drivers/drv_gpio.h b/src/drivers/drv_gpio.h index 3e001cc2e4..66565de59b 100644 --- a/src/drivers/drv_gpio.h +++ b/src/drivers/drv_gpio.h @@ -74,29 +74,6 @@ #endif -#ifdef CONFIG_ARCH_BOARD_PX4FMU_V4 -/* - * PX4FMUv4 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 - #if defined(CONFIG_ARCH_BOARD_MINDPX_V2) /* * MindPXv2 GPIO numbers. @@ -215,7 +192,6 @@ !defined(CONFIG_ARCH_BOARD_MINDPX_V2) && \ !defined(CONFIG_ARCH_BOARD_PX4_STM32F4DISCOVERY) && \ !defined(CONFIG_ARCH_BOARD_PX4FMU_V1) && \ - !defined(CONFIG_ARCH_BOARD_PX4FMU_V4) && \ !defined(CONFIG_ARCH_BOARD_PX4FMU_V4PRO) && \ !defined(CONFIG_ARCH_BOARD_PX4IO_V1) && \ !defined(CONFIG_ARCH_BOARD_PX4IO_V2) && \