Commit 3d929513 authored by DonLakeFlyer's avatar DonLakeFlyer

Fix Orbit

parent 503531aa
...@@ -369,7 +369,7 @@ FlightMap { ...@@ -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)
......
...@@ -2777,15 +2777,6 @@ void Vehicle::guidedModeOrbit(const QGeoCoordinate& centerCoord, double radius, ...@@ -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, ...@@ -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, ...@@ -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);
} }
} }
......
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