From e52176e23b4aaa7088c9ec80f905ce8a94af77af Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 12 Jul 2018 11:26:58 +1000 Subject: [PATCH] AP_BoardConfig: allow hwdef.dat override of BRD_TYPE --- libraries/AP_BoardConfig/AP_BoardConfig.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libraries/AP_BoardConfig/AP_BoardConfig.cpp b/libraries/AP_BoardConfig/AP_BoardConfig.cpp index de1987a0a0..e9db344d13 100644 --- a/libraries/AP_BoardConfig/AP_BoardConfig.cpp +++ b/libraries/AP_BoardConfig/AP_BoardConfig.cpp @@ -47,7 +47,9 @@ #define BOARD_PWM_COUNT_DEFAULT 4 #define BOARD_SER1_RTSCTS_DEFAULT 2 #endif +#ifndef BOARD_TYPE_DEFAULT #define BOARD_TYPE_DEFAULT PX4_BOARD_AUTO +#endif #elif CONFIG_HAL_BOARD == HAL_BOARD_VRBRAIN # define BOARD_SAFETY_ENABLE_DEFAULT 0 @@ -76,8 +78,10 @@ #ifndef BOARD_SER1_RTSCTS_DEFAULT # define BOARD_SER1_RTSCTS_DEFAULT 2 #endif +#ifndef BOARD_TYPE_DEFAULT # define BOARD_TYPE_DEFAULT PX4_BOARD_AUTO #endif +#endif #ifndef HAL_IMU_TEMP_DEFAULT #define HAL_IMU_TEMP_DEFAULT -1 // disabled