Browse Source

Copter: move handling of MAV_CMD_DO_GRIPPER up

master
Peter Barker 7 years ago committed by Francisco Ferreira
parent
commit
955baa47c2
  1. 23
      ArduCopter/GCS_Mavlink.cpp
  2. 1
      ArduCopter/make.inc
  3. 1
      ArduCopter/wscript

23
ArduCopter/GCS_Mavlink.cpp

@ -1039,29 +1039,6 @@ void GCS_MAVLINK_Copter::handleMessage(mavlink_message_t* msg) @@ -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)

1
ArduCopter/make.inc

@ -58,7 +58,6 @@ LIBRARIES += AC_InputManager @@ -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

1
ArduCopter/wscript

@ -28,7 +28,6 @@ def build(bld): @@ -28,7 +28,6 @@ def build(bld):
'AP_AdvancedFailsafe',
'AP_SmartRTL',
'AP_Stats',
'AP_Gripper',
'AP_Beacon',
'AP_Arming',
'AP_WheelEncoder',

Loading…
Cancel
Save