From 27e4953ad8c24efb77893869e7749d81f41c0332 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 3 Mar 2018 13:13:40 +1100 Subject: [PATCH] Plane: disable HIL on px4-v2 this saves enough flash for px4-v2 to fit again --- ArduPlane/Plane.h | 1 - ArduPlane/config.h | 8 +++++++- ArduPlane/make.inc | 1 - ArduPlane/wscript | 1 - 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ArduPlane/Plane.h b/ArduPlane/Plane.h index a3ba33d38f..518d5313ff 100644 --- a/ArduPlane/Plane.h +++ b/ArduPlane/Plane.h @@ -31,7 +31,6 @@ #include #include -#include #include #include #include // ArduPilot GPS library diff --git a/ArduPlane/config.h b/ArduPlane/config.h index ef858ca7c6..508b06d5d1 100644 --- a/ArduPlane/config.h +++ b/ArduPlane/config.h @@ -332,7 +332,13 @@ # define RESET_SWITCH_CHAN_PWM 1750 #endif -#define HIL_SUPPORT ENABLED +#ifndef HIL_SUPPORT +#if HAL_MINIMIZE_FEATURES +# define HIL_SUPPORT DISABLED +#else +# define HIL_SUPPORT ENABLED +#endif +#endif ////////////////////////////////////////////////////////////////////////////// // Parachute release diff --git a/ArduPlane/make.inc b/ArduPlane/make.inc index 5fd6cc3675..aaf6887679 100644 --- a/ArduPlane/make.inc +++ b/ArduPlane/make.inc @@ -1,5 +1,4 @@ LIBRARIES += AP_Common -LIBRARIES += AP_Menu LIBRARIES += AP_Param LIBRARIES += StorageManager LIBRARIES += AP_GPS diff --git a/ArduPlane/wscript b/ArduPlane/wscript index 5b4354d532..2aa8e70358 100644 --- a/ArduPlane/wscript +++ b/ArduPlane/wscript @@ -14,7 +14,6 @@ def build(bld): 'AP_Arming', 'AP_Camera', 'AP_L1_Control', - 'AP_Menu', 'AP_Navigation', 'AP_Parachute', 'AP_RCMapper',