AP_HAL: fixed setting of HAL_MINIMIZE_FEATURES for FMUv3

8 years ago · 6a01494d4a
1 changed files with 6 additions and 5 deletions
--- a/libraries/AP_HAL/board/px4.h
+++ b/libraries/AP_HAL/board/px4.h
@ -13,19 +13,20 @@
				@@ -13,19 +13,20 @@
 #ifdef CONFIG_ARCH_BOARD_PX4FMU_V1
 #define CONFIG_HAL_BOARD_SUBTYPE HAL_BOARD_SUBTYPE_PX4_V1
 #define HAL_STORAGE_SIZE            8192
-#elif defined(CONFIG_ARCH_BOARD_PX4FMU_V2)
-#define CONFIG_HAL_BOARD_SUBTYPE HAL_BOARD_SUBTYPE_PX4_V2
+#elif defined(CONFIG_ARCH_BOARD_PX4FMU_V3)
+// check for V3 before V2 as V3 also defines V2
+#define CONFIG_HAL_BOARD_SUBTYPE HAL_BOARD_SUBTYPE_PX4_V3
 #define HAL_STORAGE_SIZE            16384
 #define HAL_HAVE_IMU_HEATER         1 // for Pixhawk2
 #define HAL_IMU_TEMP_DEFAULT       -1 // disabled
 #define HAL_WITH_UAVCAN             1
-#define HAL_MINIMIZE_FEATURES       1
-#elif defined(CONFIG_ARCH_BOARD_PX4FMU_V3)
-#define CONFIG_HAL_BOARD_SUBTYPE HAL_BOARD_SUBTYPE_PX4_V3
+#elif defined(CONFIG_ARCH_BOARD_PX4FMU_V2)
+#define CONFIG_HAL_BOARD_SUBTYPE HAL_BOARD_SUBTYPE_PX4_V2
 #define HAL_STORAGE_SIZE            16384
 #define HAL_HAVE_IMU_HEATER         1 // for Pixhawk2
 #define HAL_IMU_TEMP_DEFAULT       -1 // disabled
 #define HAL_WITH_UAVCAN             1
+#define HAL_MINIMIZE_FEATURES       1
 #elif defined(CONFIG_ARCH_BOARD_PX4FMU_V4)
 #define CONFIG_HAL_BOARD_SUBTYPE HAL_BOARD_SUBTYPE_PX4_V4
 #define HAL_STORAGE_SIZE            16384