Skip to content

Q
qgroundcontrol
Unverified Commit 4509f4b1 authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #7073 from DonLakeFlyer/OrbitRotation 

Fix Orbit rotation as passed to vehicle
parents e1a290be ed7d691d
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
src/FlightDisplay/GuidedActionsController.qml
View file @ 4509f4b1
...@@ -384,7 +384,7 @@ Item { ...@@ -384,7 +384,7 @@ Item {
_activeVehicle.setCurrentMissionSequence(actionData) _activeVehicle.setCurrentMissionSequence(actionData)
break break
case actionOrbit: case actionOrbit:
_activeVehicle.guidedModeOrbit(orbitMapCircle.center, orbitMapCircle.radius() * (orbitMapCircle.clockWiseRotation ? 1 : -1), _activeVehicle.altitudeAMSL.rawValue + actionAltitudeChange) _activeVehicle.guidedModeOrbit(orbitMapCircle.center, orbitMapCircle.radius() * (orbitMapCircle.clockwiseRotation ? 1 : -1), _activeVehicle.altitudeAMSL.rawValue + actionAltitudeChange)
orbitMapCircle.hide() orbitMapCircle.hide()
break break
case actionLandAbort: case actionLandAbort:
......
src/Vehicle/Vehicle.cc
View file @ 4509f4b1
...@@ -3032,7 +3032,7 @@ void Vehicle::guidedModeOrbit(const QGeoCoordinate& centerCoord, double radius, ...@@ -3032,7 +3032,7 @@ void Vehicle::guidedModeOrbit(const QGeoCoordinate& centerCoord, double radius,
return; return;
} }
if (capabilityBits() && MAV_PROTOCOL_CAPABILITY_COMMAND_INT) { if (capabilityBits() & MAV_PROTOCOL_CAPABILITY_COMMAND_INT) {
sendMavCommandInt(defaultComponentId(), sendMavCommandInt(defaultComponentId(),
MAV_CMD_DO_ORBIT, MAV_CMD_DO_ORBIT,
MAV_FRAME_GLOBAL, MAV_FRAME_GLOBAL,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment