From 5db65cdb6def021b3d97b7628238c9a99b8c306c Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <andrew@tridgell.net>
Date: Thu, 3 Nov 2016 09:34:36 +1100
Subject: [PATCH] AP_HAL: added subtype for PX4 FMUv4

---
 libraries/AP_HAL/AP_HAL_Boards.h | 1 +
 libraries/AP_HAL/board/px4.h     | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/libraries/AP_HAL/AP_HAL_Boards.h b/libraries/AP_HAL/AP_HAL_Boards.h
index ddfc1e8141..8dd860f754 100644
--- a/libraries/AP_HAL/AP_HAL_Boards.h
+++ b/libraries/AP_HAL/AP_HAL_Boards.h
@@ -40,6 +40,7 @@
 /* HAL PX4 sub-types, starting at 2000 */
 #define HAL_BOARD_SUBTYPE_PX4_V1           2000
 #define HAL_BOARD_SUBTYPE_PX4_V2           2001
+#define HAL_BOARD_SUBTYPE_PX4_V4           2002
 
 /* HAL VRBRAIN sub-types, starting at 4000 */
 #define HAL_BOARD_SUBTYPE_VRBRAIN_V45      4000
diff --git a/libraries/AP_HAL/board/px4.h b/libraries/AP_HAL/board/px4.h
index b81e0ecfdf..abd6774a2c 100644
--- a/libraries/AP_HAL/board/px4.h
+++ b/libraries/AP_HAL/board/px4.h
@@ -14,11 +14,16 @@
 #ifdef CONFIG_ARCH_BOARD_PX4FMU_V1
 #define CONFIG_HAL_BOARD_SUBTYPE HAL_BOARD_SUBTYPE_PX4_V1
 #define HAL_STORAGE_SIZE            8192
-#else
+#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
+#elif defined(CONFIG_ARCH_BOARD_PX4FMU_V4)
+#define CONFIG_HAL_BOARD_SUBTYPE HAL_BOARD_SUBTYPE_PX4_V4
+#define HAL_STORAGE_SIZE            16384
+#else
+#error "Unknown PX4 board type"
 #endif
 
 #define HAL_GPIO_A_LED_PIN        27