From 03be988ebee54bd6eba4c04deb96a1c150076ffd Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Fri, 9 Dec 2016 16:57:49 -0800 Subject: [PATCH] aerofc: fix defining PX4FMU_V4 macro We were defining both macros. Fix it by using changing to AEROFC_V1. Also remove a leftover from board rename. --- nuttx-configs/aerofc-v1/nsh/defconfig | 2 +- src/drivers/drv_gpio.h | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/nuttx-configs/aerofc-v1/nsh/defconfig b/nuttx-configs/aerofc-v1/nsh/defconfig index 8c63579cb1..b15d8d150a 100644 --- a/nuttx-configs/aerofc-v1/nsh/defconfig +++ b/nuttx-configs/aerofc-v1/nsh/defconfig @@ -377,7 +377,7 @@ CONFIG_BOOT_RUNFROMFLASH=y # # Board Selection # -CONFIG_ARCH_BOARD_PX4FMU_V4=y +CONFIG_ARCH_BOARD_AEROFC_V1=y CONFIG_ARCH_BOARD_CUSTOM=y CONFIG_ARCH_BOARD="" diff --git a/src/drivers/drv_gpio.h b/src/drivers/drv_gpio.h index 114c2a2d3a..1a57477010 100644 --- a/src/drivers/drv_gpio.h +++ b/src/drivers/drv_gpio.h @@ -185,6 +185,10 @@ #endif +#ifdef CONFIG_ARCH_BOARD_AEROFC_V1 +# define PX4FMU_DEVICE_PATH "/dev/px4fmu" +#endif + #ifdef CONFIG_ARCH_BOARD_AEROCORE /* * AeroCore GPIO numbers and configuration. @@ -238,7 +242,6 @@ !defined(CONFIG_ARCH_BOARD_PX4FMU_V4) && \ !defined(CONFIG_ARCH_BOARD_SITL) && \ !defined(CONFIG_ARCH_BOARD_TAP_V1) && \ - !defined(CONFIG_ARCH_BOARD_ASC_V1) && \ !defined(CONFIG_ARCH_BOARD_AEROFC_V1) && \ !defined(CONFIG_ARCH_BOARD_CRAZYFLIE) # error No CONFIG_ARCH_BOARD_xxxx set