Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
3d929513
Commit
3d929513
authored
Jun 26, 2018
by
DonLakeFlyer
Browse files
Fix Orbit
parent
503531aa
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/FlightDisplay/FlightDisplayViewMap.qml
View file @
3d929513
...
...
@@ -369,7 +369,7 @@ FlightMap {
clickMenu
.
coord
=
clickCoord
clickMenu
.
popup
()
}
else
if
(
guidedActionsController
.
showGotoLocation
)
{
_guided
Location
Coordinate
=
clickCoord
goto
Location
Item
.
show
(
clickCoord
)
guidedActionsController
.
confirmAction
(
guidedActionsController
.
actionGoto
,
clickCoord
)
}
else
if
(
guidedActionsController
.
showOrbit
)
{
orbitMapCircle
.
show
(
clickCoord
)
...
...
src/Vehicle/Vehicle.cc
View file @
3d929513
...
...
@@ -2777,15 +2777,6 @@ void Vehicle::guidedModeOrbit(const QGeoCoordinate& centerCoord, double radius,
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
)
{
sendMavCommandInt
(
defaultComponentId
(),
MAV_CMD_DO_ORBIT
,
...
...
@@ -2795,7 +2786,7 @@ void Vehicle::guidedModeOrbit(const QGeoCoordinate& centerCoord, double radius,
qQNaN
(),
// Use default velocity
0
,
// Vehicle points to center
qQNaN
(),
// reserved
lat
,
lon
,
alt
);
centerCoord
.
latitude
(),
centerCoord
.
longitude
(),
amslAltitude
);
}
else
{
sendMavCommand
(
defaultComponentId
(),
MAV_CMD_DO_ORBIT
,
...
...
@@ -2804,7 +2795,7 @@ void Vehicle::guidedModeOrbit(const QGeoCoordinate& centerCoord, double radius,
qQNaN
(),
// Use default velocity
0
,
// Vehicle points to center
qQNaN
(),
// reserved
lat
,
lon
,
alt
);
centerCoord
.
latitude
(),
centerCoord
.
longitude
(),
amslAltitude
);
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment