From 9f97172cce13663283006efa9717d8b90145f648 Mon Sep 17 00:00:00 2001 From: Kevin Lopez Alvarez Date: Fri, 24 Aug 2018 17:28:10 +0200 Subject: [PATCH] AP_BoardConfig: add ChibiOS FMUv4pro defines --- libraries/AP_BoardConfig/AP_BoardConfig.h | 2 +- libraries/AP_BoardConfig/board_drivers.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/AP_BoardConfig/AP_BoardConfig.h b/libraries/AP_BoardConfig/AP_BoardConfig.h index dccdab17f2..b67f53f543 100644 --- a/libraries/AP_BoardConfig/AP_BoardConfig.h +++ b/libraries/AP_BoardConfig/AP_BoardConfig.h @@ -9,7 +9,7 @@ #include #endif -#if CONFIG_HAL_BOARD == HAL_BOARD_PX4 || CONFIG_HAL_BOARD == HAL_BOARD_VRBRAIN || defined(HAL_CHIBIOS_ARCH_FMUV3) || defined(HAL_CHIBIOS_ARCH_FMUV4) || defined(HAL_CHIBIOS_ARCH_FMUV5) || defined(HAL_CHIBIOS_ARCH_MINDPXV2) +#if CONFIG_HAL_BOARD == HAL_BOARD_PX4 || CONFIG_HAL_BOARD == HAL_BOARD_VRBRAIN || defined(HAL_CHIBIOS_ARCH_FMUV3) || defined(HAL_CHIBIOS_ARCH_FMUV4) || defined(HAL_CHIBIOS_ARCH_FMUV5) || defined(HAL_CHIBIOS_ARCH_MINDPXV2) || defined(HAL_CHIBIOS_ARCH_FMUV4PRO) #define AP_FEATURE_BOARD_DETECT 1 #else #define AP_FEATURE_BOARD_DETECT 0 diff --git a/libraries/AP_BoardConfig/board_drivers.cpp b/libraries/AP_BoardConfig/board_drivers.cpp index 6e4f6b6499..2ba82e6bd2 100644 --- a/libraries/AP_BoardConfig/board_drivers.cpp +++ b/libraries/AP_BoardConfig/board_drivers.cpp @@ -241,7 +241,7 @@ void AP_BoardConfig::board_autodetect(void) // only one choice state.board_type.set_and_notify(PX4_BOARD_MINDPXV2); hal.console->printf("Detected MindPX-V2\n"); -#elif defined(CONFIG_ARCH_BOARD_PX4FMU_V4PRO) +#elif defined(CONFIG_ARCH_BOARD_PX4FMU_V4PRO) || defined(HAL_CHIBIOS_ARCH_FMUV4PRO) // only one choice state.board_type.set_and_notify(PX4_BOARD_PIXHAWK_PRO); hal.console->printf("Detected Pixhawk Pro\n");