From 6426ceec27d6a5c22abf16525e65cd60e81c1d2d Mon Sep 17 00:00:00 2001
From: Jacob Walser <jwalser90@gmail.com>
Date: Fri, 25 Nov 2016 18:26:28 -0500
Subject: [PATCH] Sub: Disable RCMAP

---
 ArduSub/Parameters.cpp | 2 ++
 ArduSub/Sub.h          | 4 ++++
 ArduSub/config.h       | 8 ++++++++
 3 files changed, 14 insertions(+)

diff --git a/ArduSub/Parameters.cpp b/ArduSub/Parameters.cpp
index 9fd906129c..a6beb4a27b 100644
--- a/ArduSub/Parameters.cpp
+++ b/ArduSub/Parameters.cpp
@@ -962,9 +962,11 @@ const AP_Param::Info Sub::var_info[] = {
 //    GOBJECT(motors, "MOT_",         AP_MotorsMulticopter),
 //#endif
 
+#if RCMAP_ENABLED == ENABLED
     // @Group: RCMAP_
     // @Path: ../libraries/AP_RCMapper/AP_RCMapper.cpp
     GOBJECT(rcmap, "RCMAP_",        RCMapper),
+#endif
 
     // @Group: EKF_
     // @Path: ../libraries/AP_NavEKF/AP_NavEKF.cpp
diff --git a/ArduSub/Sub.h b/ArduSub/Sub.h
index c83933f329..fcd7f99ff1 100644
--- a/ArduSub/Sub.h
+++ b/ArduSub/Sub.h
@@ -81,7 +81,9 @@
 #include <AC_Fence/AC_Fence.h>           // ArduCopter Fence library
 #include <AC_Avoidance/AC_Avoid.h>           // Arducopter stop at fence library
 #include <AP_Scheduler/AP_Scheduler.h>       // main loop scheduler
+#if RCMAP_ENABLED == ENABLED
 #include <AP_RCMapper/AP_RCMapper.h>        // RC input mapping library
+#endif
 #include <AP_Notify/AP_Notify.h>          // Notify library
 #include <AP_BattMonitor/AP_BattMonitor.h>     // Battery monitor library
 #include <AP_BoardConfig/AP_BoardConfig.h>     // board configuration library
@@ -255,7 +257,9 @@ private:
     control_mode_t prev_control_mode;
     mode_reason_t prev_control_mode_reason = MODE_REASON_UNKNOWN;
 
+#if RCMAP_ENABLED == ENABLED
     RCMapper rcmap;
+#endif
 
     // board specific config
     AP_BoardConfig BoardConfig;
diff --git a/ArduSub/config.h b/ArduSub/config.h
index 84e3a50775..bd02ec5ec6 100644
--- a/ArduSub/config.h
+++ b/ArduSub/config.h
@@ -94,6 +94,14 @@
 # define RPM_ENABLED DISABLED
 #endif
 
+//////////////////////////////////////////////////////////////////////////////
+// RCMAP
+//
+
+#ifndef RCMAP_ENABLED
+# define RCMAP_ENABLED DISABLED
+#endif
+
 //////////////////////////////////////////////////////////////////////////////
 // Rangefinder
 //