Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
3d929513
Commit
3d929513
authored
6 years ago
by
DonLakeFlyer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Orbit
parent
503531aa
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
12 deletions
+3
-12
FlightDisplayViewMap.qml
src/FlightDisplay/FlightDisplayViewMap.qml
+1
-1
Vehicle.cc
src/Vehicle/Vehicle.cc
+2
-11
No files found.
src/FlightDisplay/FlightDisplayViewMap.qml
View file @
3d929513
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
src/Vehicle/Vehicle.cc
View file @
3d929513
...
@@ -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
);
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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