Browse Source

Put back guided mode takeoff

QGC4.4
Don Gagne 8 years ago
parent
commit
747bdce34e
  1. 3
      src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.cc
  2. 3
      src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.h

3
src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.cc

@ -133,8 +133,6 @@ void ArduCopterFirmwarePlugin::guidedModeLand(Vehicle* vehicle)
vehicle->setFlightMode("Land"); vehicle->setFlightMode("Land");
} }
#if 0
// WIP
void ArduCopterFirmwarePlugin::guidedModeTakeoff(Vehicle* vehicle) void ArduCopterFirmwarePlugin::guidedModeTakeoff(Vehicle* vehicle)
{ {
if (!_armVehicle(vehicle)) { if (!_armVehicle(vehicle)) {
@ -148,7 +146,6 @@ void ArduCopterFirmwarePlugin::guidedModeTakeoff(Vehicle* vehicle)
0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f,
2.5); 2.5);
} }
#endif
void ArduCopterFirmwarePlugin::guidedModeGotoLocation(Vehicle* vehicle, const QGeoCoordinate& gotoCoord) void ArduCopterFirmwarePlugin::guidedModeGotoLocation(Vehicle* vehicle, const QGeoCoordinate& gotoCoord)
{ {

3
src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.h

@ -58,10 +58,7 @@ public:
void pauseVehicle(Vehicle* vehicle) final; void pauseVehicle(Vehicle* vehicle) final;
void guidedModeRTL(Vehicle* vehicle) final; void guidedModeRTL(Vehicle* vehicle) final;
void guidedModeLand(Vehicle* vehicle) final; void guidedModeLand(Vehicle* vehicle) final;
#if 0
// WIP
void guidedModeTakeoff(Vehicle* vehicle) final; void guidedModeTakeoff(Vehicle* vehicle) final;
#endif
void guidedModeGotoLocation(Vehicle* vehicle, const QGeoCoordinate& gotoCoord) final; void guidedModeGotoLocation(Vehicle* vehicle, const QGeoCoordinate& gotoCoord) final;
void guidedModeChangeAltitude(Vehicle* vehicle, double altitudeChange) final; void guidedModeChangeAltitude(Vehicle* vehicle, double altitudeChange) final;
const FirmwarePlugin::remapParamNameMajorVersionMap_t& paramNameRemapMajorVersionMap(void) const final { return _remapParamName; } const FirmwarePlugin::remapParamNameMajorVersionMap_t& paramNameRemapMajorVersionMap(void) const final { return _remapParamName; }

Loading…
Cancel
Save