Browse Source

Copter: fix compilation when gripper disabled

master
Peter Barker 8 years ago committed by Randy Mackay
parent
commit
8033e0c315
  1. 6
      ArduCopter/commands_logic.cpp

6
ArduCopter/commands_logic.cpp

@ -797,6 +797,7 @@ bool Copter::verify_payload_place()
nav_payload_place.state = PayloadPlaceStateType_Releasing_Start; nav_payload_place.state = PayloadPlaceStateType_Releasing_Start;
// no break // no break
case PayloadPlaceStateType_Releasing_Start: case PayloadPlaceStateType_Releasing_Start:
#if GRIPPER_ENABLED == ENABLED
if (g2.gripper.valid()) { if (g2.gripper.valid()) {
gcs_send_text_fmt(MAV_SEVERITY_INFO, "Releasing the gripper"); gcs_send_text_fmt(MAV_SEVERITY_INFO, "Releasing the gripper");
g2.gripper.release(); g2.gripper.release();
@ -805,12 +806,17 @@ bool Copter::verify_payload_place()
nav_payload_place.state = PayloadPlaceStateType_Ascending_Start; nav_payload_place.state = PayloadPlaceStateType_Ascending_Start;
break; break;
} }
#else
gcs_send_text_fmt(MAV_SEVERITY_INFO, "Gripper code disabled");
#endif
nav_payload_place.state = PayloadPlaceStateType_Releasing; nav_payload_place.state = PayloadPlaceStateType_Releasing;
// no break // no break
case PayloadPlaceStateType_Releasing: case PayloadPlaceStateType_Releasing:
#if GRIPPER_ENABLED == ENABLED
if (g2.gripper.valid() && !g2.gripper.released()) { if (g2.gripper.valid() && !g2.gripper.released()) {
return false; return false;
} }
#endif
nav_payload_place.state = PayloadPlaceStateType_Released; nav_payload_place.state = PayloadPlaceStateType_Released;
// no break // no break
case PayloadPlaceStateType_Released: { case PayloadPlaceStateType_Released: {

Loading…
Cancel
Save