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
82c7afbb
Commit
82c7afbb
authored
Dec 09, 2012
by
Bryant
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed most -Wreorder warnings from GCC.
parent
d779e7f1
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
16 deletions
+14
-16
QGCFlightGearLink.cc
src/comm/QGCFlightGearLink.cc
+3
-3
DebugConsole.cc
src/ui/DebugConsole.cc
+2
-2
HDDisplay.cc
src/ui/HDDisplay.cc
+0
-2
HSIDisplay.cc
src/ui/HSIDisplay.cc
+7
-7
QGCVehicleConfig.cc
src/ui/QGCVehicleConfig.cc
+2
-2
No files found.
src/comm/QGCFlightGearLink.cc
View file @
82c7afbb
...
...
@@ -40,11 +40,11 @@ This file is part of the QGROUNDCONTROL project
#include "MainWindow.h"
QGCFlightGearLink
::
QGCFlightGearLink
(
UASInterface
*
mav
,
QString
startupArguments
,
QString
remoteHost
,
QHostAddress
host
,
quint16
port
)
:
socket
(
NULL
),
process
(
NULL
),
terraSync
(
NULL
),
socket
(
NULL
),
startupArguments
(
startupArguments
),
flightGearVersion
(
0
)
flightGearVersion
(
0
),
startupArguments
(
startupArguments
)
{
this
->
host
=
host
;
this
->
port
=
port
+
mav
->
getUASID
();
...
...
src/ui/DebugConsole.cc
View file @
82c7afbb
...
...
@@ -49,6 +49,8 @@ DebugConsole::DebugConsole(QWidget *parent) :
autoHold
(
true
),
bytesToIgnore
(
0
),
lastByte
(
-
1
),
escReceived
(
false
),
escIndex
(
0
),
sentBytes
(),
holdBuffer
(),
lineBuffer
(
""
),
...
...
@@ -61,8 +63,6 @@ DebugConsole::DebugConsole(QWidget *parent) :
lowpassDataRate
(
0.0
f
),
dataRateThreshold
(
400
),
commandIndex
(
0
),
escReceived
(
false
),
escIndex
(
0
),
m_ui
(
new
Ui
::
DebugConsole
)
{
// Setup basic user interface
...
...
src/ui/HDDisplay.cc
View file @
82c7afbb
...
...
@@ -201,9 +201,7 @@ void HDDisplay::triggerUpdate()
void
HDDisplay
::
paintEvent
(
QPaintEvent
*
event
)
{
Q_UNUSED
(
event
);
quint64
interval
=
0
;
//qDebug() << "INTERVAL:" << MG::TIME::getGroundTimeNow() - interval << __FILE__ << __LINE__;
interval
=
QGC
::
groundTimeMilliseconds
();
renderOverlay
();
}
...
...
src/ui/HSIDisplay.cc
View file @
82c7afbb
...
...
@@ -118,12 +118,6 @@ HSIDisplay::HSIDisplay(QWidget *parent) :
visionFixKnown
(
false
),
gpsFixKnown
(
false
),
iruFixKnown
(
false
),
setPointKnown
(
false
),
positionSetPointKnown
(
false
),
userSetPointSet
(
false
),
userXYSetPointSet
(
false
),
userZSetPointSet
(
false
),
userYawSetPointSet
(
false
),
gyroKnown
(
false
),
gyroON
(
false
),
gyroOK
(
false
),
...
...
@@ -150,7 +144,13 @@ HSIDisplay::HSIDisplay(QWidget *parent) :
viconOK
(
false
),
actuatorsKnown
(
false
),
actuatorsON
(
false
),
actuatorsOK
(
false
)
actuatorsOK
(
false
),
setPointKnown
(
false
),
positionSetPointKnown
(
false
),
userSetPointSet
(
false
),
userXYSetPointSet
(
false
),
userZSetPointSet
(
false
),
userYawSetPointSet
(
false
)
{
refreshTimer
->
setInterval
(
updateInterval
);
...
...
src/ui/QGCVehicleConfig.cc
View file @
82c7afbb
...
...
@@ -19,8 +19,6 @@ QGCVehicleConfig::QGCVehicleConfig(QWidget *parent) :
QWidget
(
parent
),
mav
(
NULL
),
chanCount
(
0
),
changed
(
true
),
rc_mode
(
RC_MODE_2
),
rcRoll
(
0.0
f
),
rcPitch
(
0.0
f
),
rcYaw
(
0.0
f
),
...
...
@@ -29,6 +27,8 @@ QGCVehicleConfig::QGCVehicleConfig(QWidget *parent) :
rcAux1
(
0.0
f
),
rcAux2
(
0.0
f
),
rcAux3
(
0.0
f
),
changed
(
true
),
rc_mode
(
RC_MODE_2
),
calibrationEnabled
(
false
),
ui
(
new
Ui
::
QGCVehicleConfig
)
{
...
...
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