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
62d22100
Commit
62d22100
authored
Jun 30, 2014
by
Bryant Mairs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Renamed configuration.h to QGCConfig.h to avoid issues with opmapcontrol's configuration.h
parent
3a01d185
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
11 additions
and
11 deletions
+11
-11
qgroundcontrol.pro
qgroundcontrol.pro
+1
-1
QGC.h
src/QGC.h
+1
-1
QGCConfig.h
src/QGCConfig.h
+0
-0
OpalLink.h
src/comm/OpalLink.h
+1
-1
QGCFlightGearLink.h
src/comm/QGCFlightGearLink.h
+1
-1
QGCJSBSimLink.h
src/comm/QGCJSBSimLink.h
+1
-1
QGCXPlaneLink.h
src/comm/QGCXPlaneLink.h
+1
-1
SerialLink.h
src/comm/SerialLink.h
+2
-2
TCPLink.h
src/comm/TCPLink.h
+1
-1
UDPLink.h
src/comm/UDPLink.h
+1
-1
terminalconsole.cpp
src/ui/configuration/terminalconsole.cpp
+1
-1
No files found.
qgroundcontrol.pro
View file @
62d22100
...
...
@@ -406,7 +406,7 @@ HEADERS += \
src
/
ui
/
linechart
/
LinechartPlot
.
h
\
src
/
ui
/
linechart
/
Scrollbar
.
h
\
src
/
ui
/
linechart
/
ScrollZoomer
.
h
\
src
/
configuration
.
h
\
src
/
QGCConfig
.
h
\
src
/
ui
/
uas
/
UASView
.
h
\
src
/
ui
/
CameraView
.
h
\
src
/
comm
/
MAVLinkSimulationLink
.
h
\
...
...
src/QGC.h
View file @
62d22100
...
...
@@ -28,7 +28,7 @@
#include <QColor>
#include <QThread>
#include "
configuration
.h"
#include "
QGCConfig
.h"
/* Windows fixes */
...
...
src/
configuration
.h
→
src/
QGCConfig
.h
View file @
62d22100
File moved
src/comm/OpalLink.h
View file @
62d22100
...
...
@@ -44,7 +44,7 @@ This file is part of the QGROUNDCONTROL project
#include "LinkManager.h"
#include "MG.h"
#include "QGCMAVLink.h"
#include "
configuration
.h"
#include "
QGCConfig
.h"
#include "OpalRT.h"
#include "ParameterList.h"
#include "Parameter.h"
...
...
src/comm/QGCFlightGearLink.h
View file @
62d22100
...
...
@@ -39,7 +39,7 @@ This file is part of the QGROUNDCONTROL project
#include <QTimer>
#include <QProcess>
#include <LinkInterface.h>
#include
<configuration.h>
#include
"QGCConfig.h"
#include "UASInterface.h"
#include "QGCHilLink.h"
#include <QGCHilFlightGearConfiguration.h>
...
...
src/comm/QGCJSBSimLink.h
View file @
62d22100
...
...
@@ -39,7 +39,7 @@ This file is part of the QGROUNDCONTROL project
#include <QTimer>
#include <QProcess>
#include <LinkInterface.h>
#include
<configuration.h>
#include
"QGCConfig.h"
#include "UASInterface.h"
#include "QGCHilLink.h"
...
...
src/comm/QGCXPlaneLink.h
View file @
62d22100
...
...
@@ -39,7 +39,7 @@ This file is part of the QGROUNDCONTROL project
#include <QTimer>
#include <QProcess>
#include <LinkInterface.h>
#include
<configuration.h>
#include
"QGCConfig.h"
#include "UASInterface.h"
#include "QGCHilLink.h"
...
...
src/comm/SerialLink.h
View file @
62d22100
...
...
@@ -36,7 +36,7 @@ This file is part of the QGROUNDCONTROL project
#include <QThread>
#include <QMutex>
#include <QString>
#include
<configuration.h>
#include
"QGCConfig.h"
#include "SerialLinkInterface.h"
// We use QSerialPort::SerialPortError in a signal so we must declare it as a meta type
...
...
@@ -67,7 +67,7 @@ public:
int
stopBits
=
1
);
~
SerialLink
();
static
const
int
poll_interval
=
SERIAL_POLL_INTERVAL
;
///< Polling interval, defined in
configuration
.h
static
const
int
poll_interval
=
SERIAL_POLL_INTERVAL
;
///< Polling interval, defined in
QGCConfig
.h
/** @brief Get a list of the currently available ports */
QList
<
QString
>
getCurrentPorts
();
...
...
src/comm/TCPLink.h
View file @
62d22100
...
...
@@ -35,7 +35,7 @@
#include <QMutex>
#include <QHostAddress>
#include <LinkInterface.h>
#include
<configuration.h>
#include
"QGCConfig.h"
// Even though QAbstractSocket::SocketError is used in a signal by Qt, Qt doesn't declare it as a meta type.
// This in turn causes debug output to be kicked out about not being able to queue the signal. We declare it
...
...
src/comm/UDPLink.h
View file @
62d22100
...
...
@@ -37,7 +37,7 @@ This file is part of the QGROUNDCONTROL project
#include <QMutex>
#include <QUdpSocket>
#include <LinkInterface.h>
#include
<configuration.h>
#include
"QGCConfig.h"
class
UDPLink
:
public
LinkInterface
{
...
...
src/ui/configuration/terminalconsole.cpp
View file @
62d22100
...
...
@@ -37,7 +37,7 @@ This file is part of the APM_PLANNER project
#include "terminalconsole.h"
#include "ui_terminalconsole.h"
#include "console.h"
#include "
configuration
.h"
#include "
QGCConfig
.h"
#include <QDebug>
#include <QSettings>
...
...
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