Browse Source

Merge pull request #3065 from DonLakeFlyer/QuadPlaneModes

Add new QuadPlane flight modes
QGC4.4
Don Gagne 9 years ago
parent
commit
26a94703d7
  1. 8
      src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.cc
  2. 8
      src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h

8
src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.cc

@ -44,6 +44,10 @@ APMPlaneMode::APMPlaneMode(uint32_t mode, bool settable) @@ -44,6 +44,10 @@ APMPlaneMode::APMPlaneMode(uint32_t mode, bool settable)
enumToString.insert(LOITER, "Loiter");
enumToString.insert(GUIDED, "Guided");
enumToString.insert(INITIALIZING, "Initializing");
enumToString.insert(QSTABILIZE, "QuadPlane Stabilize");
enumToString.insert(QHOVER, "QuadPlane Hover");
enumToString.insert(QLOITER, "QuadPlane Loiter");
enumToString.insert(QLAND, "QuadPlane Land");
setEnumToStringMapping(enumToString);
}
@ -65,5 +69,9 @@ ArduPlaneFirmwarePlugin::ArduPlaneFirmwarePlugin(void) @@ -65,5 +69,9 @@ ArduPlaneFirmwarePlugin::ArduPlaneFirmwarePlugin(void)
supportedFlightModes << APMPlaneMode(APMPlaneMode::LOITER ,true);
supportedFlightModes << APMPlaneMode(APMPlaneMode::GUIDED ,true);
supportedFlightModes << APMPlaneMode(APMPlaneMode::INITIALIZING ,false);
supportedFlightModes << APMPlaneMode(APMPlaneMode::QSTABILIZE ,true);
supportedFlightModes << APMPlaneMode(APMPlaneMode::QHOVER ,true);
supportedFlightModes << APMPlaneMode(APMPlaneMode::QLOITER ,true);
supportedFlightModes << APMPlaneMode(APMPlaneMode::QLAND ,true);
setSupportedModes(supportedFlightModes);
}

8
src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h

@ -49,9 +49,13 @@ public: @@ -49,9 +49,13 @@ public:
RESERVED_13 = 13, // RESERVED FOR FUTURE USE
RESERVED_14 = 14, // RESERVED FOR FUTURE USE
GUIDED = 15,
INITIALIZING = 16
INITIALIZING = 16,
QSTABILIZE = 17,
QHOVER = 18,
QLOITER = 19,
QLAND = 20,
modeCount
};
static const int modeCount = 17;
APMPlaneMode(uint32_t mode, bool settable);
};

Loading…
Cancel
Save