Browse Source

Fix Orbit

QGC4.4
DonLakeFlyer 7 years ago
parent
commit
3d92951396
  1. 2
      src/FlightDisplay/FlightDisplayViewMap.qml
  2. 13
      src/Vehicle/Vehicle.cc

2
src/FlightDisplay/FlightDisplayViewMap.qml

@ -369,7 +369,7 @@ FlightMap {
clickMenu.coord = clickCoord clickMenu.coord = clickCoord
clickMenu.popup() clickMenu.popup()
} else if (guidedActionsController.showGotoLocation) { } else if (guidedActionsController.showGotoLocation) {
_guidedLocationCoordinate = clickCoord gotoLocationItem.show(clickCoord)
guidedActionsController.confirmAction(guidedActionsController.actionGoto, clickCoord) guidedActionsController.confirmAction(guidedActionsController.actionGoto, clickCoord)
} else if (guidedActionsController.showOrbit) { } else if (guidedActionsController.showOrbit) {
orbitMapCircle.show(clickCoord) orbitMapCircle.show(clickCoord)

13
src/Vehicle/Vehicle.cc

@ -2777,15 +2777,6 @@ void Vehicle::guidedModeOrbit(const QGeoCoordinate& centerCoord, double radius,
return; return;
} }
double lat, lon, alt;
if (centerCoord.isValid()) {
lat = lon = alt = qQNaN();
} else {
lat = centerCoord.latitude();
lon = centerCoord.longitude();
alt = amslAltitude;
}
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,
@ -2795,7 +2786,7 @@ void Vehicle::guidedModeOrbit(const QGeoCoordinate& centerCoord, double radius,
qQNaN(), // Use default velocity qQNaN(), // Use default velocity
0, // Vehicle points to center 0, // Vehicle points to center
qQNaN(), // reserved qQNaN(), // reserved
lat, lon, alt); centerCoord.latitude(), centerCoord.longitude(), amslAltitude);
} else { } else {
sendMavCommand(defaultComponentId(), sendMavCommand(defaultComponentId(),
MAV_CMD_DO_ORBIT, MAV_CMD_DO_ORBIT,
@ -2804,7 +2795,7 @@ void Vehicle::guidedModeOrbit(const QGeoCoordinate& centerCoord, double radius,
qQNaN(), // Use default velocity qQNaN(), // Use default velocity
0, // Vehicle points to center 0, // Vehicle points to center
qQNaN(), // reserved qQNaN(), // reserved
lat, lon, alt); centerCoord.latitude(), centerCoord.longitude(), amslAltitude);
} }
} }

Loading…
Cancel
Save