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
1e079309
Commit
1e079309
authored
Mar 07, 2018
by
Gus Grubba
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix pedantic compiler errors and warnings.
parent
6e7c9f32
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
6 deletions
+8
-6
APMCompassCal.cc
src/AutoPilotPlugins/APM/APMCompassCal.cc
+1
-0
MissionController.cc
src/MissionManager/MissionController.cc
+5
-5
MissionItem.cc
src/MissionManager/MissionItem.cc
+1
-1
QGCGeoBoundingCube.h
src/QmlControls/QGCGeoBoundingCube.h
+1
-0
No files found.
src/AutoPilotPlugins/APM/APMCompassCal.cc
View file @
1e079309
...
...
@@ -526,6 +526,7 @@ int CalWorkerThread::sphere_fit_least_squares(const float x[], const float y[],
//Iterate N times, ignore stop condition.
unsigned
int
n
=
0
;
#undef FLT_EPSILON
#define FLT_EPSILON 1.1920929e-07F
/* 1E-5 */
while
(
n
<
max_iterations
)
{
...
...
src/MissionManager/MissionController.cc
View file @
1e079309
...
...
@@ -2017,7 +2017,7 @@ void MissionController::_updateTimeout()
case
MAV_CMD_NAV_WAYPOINT
:
case
MAV_CMD_NAV_LAND
:
if
(
pSimpleItem
->
coordinate
().
isValid
())
{
if
(
pSimpleItem
->
command
()
==
MAV_CMD_NAV_TAKEOFF
)
{
if
(
(
MAV_CMD
)
pSimpleItem
->
command
()
==
MAV_CMD_NAV_TAKEOFF
)
{
takeoffCoordinate
=
pSimpleItem
->
coordinate
();
}
else
if
(
!
firstCoordinate
.
isValid
())
{
firstCoordinate
=
pSimpleItem
->
coordinate
();
...
...
@@ -2025,10 +2025,10 @@ void MissionController::_updateTimeout()
double
lat
=
pSimpleItem
->
coordinate
().
latitude
()
+
90.0
;
double
lon
=
pSimpleItem
->
coordinate
().
longitude
()
+
180.0
;
double
alt
=
pSimpleItem
->
coordinate
().
altitude
();
north
=
fmax
(
north
,
lat
);
south
=
fmin
(
south
,
lat
);
east
=
fmax
(
east
,
lon
);
west
=
fmin
(
west
,
lon
);
north
=
fmax
(
north
,
lat
);
south
=
fmin
(
south
,
lat
);
east
=
fmax
(
east
,
lon
);
west
=
fmin
(
west
,
lon
);
minAlt
=
fmin
(
minAlt
,
alt
);
maxAlt
=
fmax
(
maxAlt
,
alt
);
}
...
...
src/MissionManager/MissionItem.cc
View file @
1e079309
...
...
@@ -418,7 +418,7 @@ void MissionItem::setCoordinate(const QGeoCoordinate& coordinate)
QGeoCoordinate
MissionItem
::
coordinate
(
void
)
const
{
if
(
!
isfinite
(
param5
())
||
!
isfinite
(
param6
()))
{
if
(
!
std
::
isfinite
(
param5
())
||
!
std
::
isfinite
(
param6
()))
{
//-- If either of these are NAN, return an invalid (QGeoCoordinate::isValid() == false) coordinate
return
QGeoCoordinate
();
}
...
...
src/QmlControls/QGCGeoBoundingCube.h
View file @
1e079309
...
...
@@ -19,6 +19,7 @@ class QGCGeoBoundingCube : public QObject {
Q_OBJECT
public:
QGCGeoBoundingCube
(
const
QGCGeoBoundingCube
&
other
)
:
QObject
()
{
pointNW
=
other
.
pointNW
;
pointSE
=
other
.
pointSE
;
...
...
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