From 1263e20a0dd2f1f374b60c4c3a3a52eaa63eba3c Mon Sep 17 00:00:00 2001
From: Lucas De Marchi <lucas.demarchi@intel.com>
Date: Tue, 29 Aug 2017 17:18:40 -0700
Subject: [PATCH] ArduCopter: use static method to construct AC_InputManager

---
 ArduCopter/Copter.cpp | 4 ----
 ArduCopter/Copter.h   | 5 ++---
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/ArduCopter/Copter.cpp b/ArduCopter/Copter.cpp
index 98f490e45e..5664feb46c 100644
--- a/ArduCopter/Copter.cpp
+++ b/ArduCopter/Copter.cpp
@@ -66,10 +66,6 @@ Copter::Copter(void)
     mainLoop_count(0),
     rtl_loiter_start_time(0),
     auto_trim_counter(0),
-#if FRAME_CONFIG == HELI_FRAME
-    // ToDo: Input Manager is only used by Heli for 3.3, but will be used by all frames for 3.4
-    input_manager(),
-#endif
     in_mavlink_delay(false),
     param_loader(var_info)
 {
diff --git a/ArduCopter/Copter.h b/ArduCopter/Copter.h
index 87c4349aed..486b81cbec 100644
--- a/ArduCopter/Copter.h
+++ b/ArduCopter/Copter.h
@@ -593,10 +593,9 @@ private:
 #endif
 
     // Pilot Input Management Library
-    // Only used for Helicopter for AC3.3, to be expanded to include Multirotor
-    // child class for AC3.4
+    // Only used for Helicopter for now
 #if FRAME_CONFIG == HELI_FRAME
-    AC_InputManager_Heli input_manager;
+    AC_InputManager_Heli input_manager = AC_InputManager_Heli::create();
 #endif
 
     AP_ADSB adsb {ahrs};