From 955baa47c2e1a27befe2860e04a302c7f0257e37 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Fri, 8 Jun 2018 16:22:43 +1000 Subject: [PATCH] Copter: move handling of MAV_CMD_DO_GRIPPER up --- ArduCopter/GCS_Mavlink.cpp | 23 ----------------------- ArduCopter/make.inc | 1 - ArduCopter/wscript | 1 - 3 files changed, 25 deletions(-) diff --git a/ArduCopter/GCS_Mavlink.cpp b/ArduCopter/GCS_Mavlink.cpp index 8d4799a219..5ddf688cf8 100644 --- a/ArduCopter/GCS_Mavlink.cpp +++ b/ArduCopter/GCS_Mavlink.cpp @@ -1039,29 +1039,6 @@ void GCS_MAVLINK_Copter::handleMessage(mavlink_message_t* msg) packet.param4, (uint8_t)packet.param5); break; -#if GRIPPER_ENABLED == ENABLED - case MAV_CMD_DO_GRIPPER: - // param1 : gripper number (ignored) - // param2 : action (0=release, 1=grab). See GRIPPER_ACTIONS enum. - if(!copter.g2.gripper.enabled()) { - result = MAV_RESULT_FAILED; - } else { - result = MAV_RESULT_ACCEPTED; - switch ((uint8_t)packet.param2) { - case GRIPPER_ACTION_RELEASE: - copter.g2.gripper.release(); - break; - case GRIPPER_ACTION_GRAB: - copter.g2.gripper.grab(); - break; - default: - result = MAV_RESULT_FAILED; - break; - } - } - break; -#endif - #if WINCH_ENABLED == ENABLED case MAV_CMD_DO_WINCH: // param1 : winch number (ignored) diff --git a/ArduCopter/make.inc b/ArduCopter/make.inc index 0d121d6cd6..86fed0f9dd 100644 --- a/ArduCopter/make.inc +++ b/ArduCopter/make.inc @@ -58,7 +58,6 @@ LIBRARIES += AC_InputManager LIBRARIES += AP_ADSB LIBRARIES += AP_Avoidance LIBRARIES += AP_Stats -LIBRARIES += AP_Gripper LIBRARIES += AP_Beacon LIBRARIES += AP_Arming LIBRARIES += AP_SmartRTL diff --git a/ArduCopter/wscript b/ArduCopter/wscript index 780788a773..8663b477e4 100644 --- a/ArduCopter/wscript +++ b/ArduCopter/wscript @@ -28,7 +28,6 @@ def build(bld): 'AP_AdvancedFailsafe', 'AP_SmartRTL', 'AP_Stats', - 'AP_Gripper', 'AP_Beacon', 'AP_Arming', 'AP_WheelEncoder',