From 1adf247a608ea2b90f00150d78a5bc4ae80b2185 Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Wed, 12 Apr 2017 11:39:38 -0700 Subject: [PATCH] AP_BoardConfig: fix board type number for aerofc Types 7-12 are being used by vrbrain boards. Even if they are inside another ifdef, they can't be the same because it's used by the BRD_TYPE parameter. Use 13 for aerofc since it was already the one being used in the parameter description. Thanks to Michael du Breuil for noticing it. --- libraries/AP_BoardConfig/AP_BoardConfig.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/AP_BoardConfig/AP_BoardConfig.h b/libraries/AP_BoardConfig/AP_BoardConfig.h index 5719e90d74..24eb761333 100644 --- a/libraries/AP_BoardConfig/AP_BoardConfig.h +++ b/libraries/AP_BoardConfig/AP_BoardConfig.h @@ -56,7 +56,8 @@ public: static bool px4_start_driver(main_fn_t main_function, const char *name, const char *arguments); static void px4_sensor_error(const char *reason); - // valid types for BRD_TYPE + // valid types for BRD_TYPE: these values need to be in sync with the + // values from the param description enum px4_board_type { #if CONFIG_HAL_BOARD == HAL_BOARD_PX4 PX4_BOARD_AUTO = 0, @@ -66,7 +67,7 @@ public: PX4_BOARD_PIXRACER = 4, PX4_BOARD_PHMINI = 5, PX4_BOARD_PH2SLIM = 6, - PX4_BOARD_AEROFC = 7, + PX4_BOARD_AEROFC = 13, PX4_BOARD_AUAV21 = 20, PX4_BOARD_OLDDRIVERS = 100, #endif