dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

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.
This commit is contained in:
Lucas De Marchi 2016-12-09 16:57:49 -08:00 committed by Lorenz Meier
parent 9468e7779a
commit 03be988ebe
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nuttx-configs/aerofc-v1/nsh/defconfig
View File

@ -377,7 +377,7 @@ CONFIG_BOOT_RUNFROMFLASH=y
# #
# Board Selection # Board Selection
# #
CONFIG_ARCH_BOARD_PX4FMU_V4=y CONFIG_ARCH_BOARD_AEROFC_V1=y
CONFIG_ARCH_BOARD_CUSTOM=y CONFIG_ARCH_BOARD_CUSTOM=y
CONFIG_ARCH_BOARD="" CONFIG_ARCH_BOARD=""

5
src/drivers/drv_gpio.h
View File

@ -185,6 +185,10 @@
#endif #endif
#ifdef CONFIG_ARCH_BOARD_AEROFC_V1
# define PX4FMU_DEVICE_PATH "/dev/px4fmu"
#endif
#ifdef CONFIG_ARCH_BOARD_AEROCORE #ifdef CONFIG_ARCH_BOARD_AEROCORE
/* /*
* AeroCore GPIO numbers and configuration. * AeroCore GPIO numbers and configuration.
@ -238,7 +242,6 @@
!defined(CONFIG_ARCH_BOARD_PX4FMU_V4) && \ !defined(CONFIG_ARCH_BOARD_PX4FMU_V4) && \
!defined(CONFIG_ARCH_BOARD_SITL) && \ !defined(CONFIG_ARCH_BOARD_SITL) && \
!defined(CONFIG_ARCH_BOARD_TAP_V1) && \ !defined(CONFIG_ARCH_BOARD_TAP_V1) && \
!defined(CONFIG_ARCH_BOARD_ASC_V1) && \
!defined(CONFIG_ARCH_BOARD_AEROFC_V1) && \ !defined(CONFIG_ARCH_BOARD_AEROFC_V1) && \
!defined(CONFIG_ARCH_BOARD_CRAZYFLIE) !defined(CONFIG_ARCH_BOARD_CRAZYFLIE)
# error No CONFIG_ARCH_BOARD_xxxx set # error No CONFIG_ARCH_BOARD_xxxx set