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
190b1d8a
Commit
190b1d8a
authored
Dec 28, 2013
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Modify consumers of UASManager and QGCUASParamManager to use new interfaces
parent
b42a36a8
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
16 additions
and
17 deletions
+16
-17
UAS.h
src/uas/UAS.h
+2
-1
UASInterface.h
src/uas/UASInterface.h
+2
-2
UASParameterCommsMgr.cc
src/uas/UASParameterCommsMgr.cc
+1
-1
QGCBaseParamWidget.cc
src/ui/QGCBaseParamWidget.cc
+2
-2
QGCBaseParamWidget.h
src/ui/QGCBaseParamWidget.h
+2
-2
QGCPX4VehicleConfig.h
src/ui/QGCPX4VehicleConfig.h
+1
-1
QGCVehicleConfig.h
src/ui/QGCVehicleConfig.h
+1
-1
FrameTypeConfig.h
src/ui/configuration/FrameTypeConfig.h
+1
-3
QGCComboBox.h
src/ui/designer/QGCComboBox.h
+2
-2
QGCMapWidget.cc
src/ui/map/QGCMapWidget.cc
+1
-1
QGCPX4AirframeConfig.h
src/ui/px4_configuration/QGCPX4AirframeConfig.h
+1
-1
No files found.
src/uas/UAS.h
View file @
190b1d8a
...
...
@@ -40,6 +40,7 @@ This file is part of the QGROUNDCONTROL project
#include "QGCFlightGearLink.h"
#include "QGCJSBSimLink.h"
#include "QGCXPlaneLink.h"
#include "QGCUASParamManager.h"
/**
...
...
@@ -542,7 +543,7 @@ public:
}
/** @brief Get reference to the param manager **/
virtual
QGCUASParamManager
*
getParamManager
()
{
virtual
QGCUASParamManager
Interface
*
getParamManager
()
{
return
&
paramMgr
;
}
...
...
src/uas/UASInterface.h
View file @
190b1d8a
...
...
@@ -42,7 +42,7 @@ This file is part of the QGROUNDCONTROL project
#include "ProtocolInterface.h"
#include "UASParameterDataModel.h"
#include "UASWaypointManager.h"
#include "QGCUASParamManager.h"
#include "QGCUASParamManager
Interface
.h"
#include "RadioCalibration/RadioCalibrationData.h"
#ifdef QGC_PROTOBUF_ENABLED
...
...
@@ -156,7 +156,7 @@ public:
virtual
UASWaypointManager
*
getWaypointManager
(
void
)
=
0
;
/** @brief Get reference to the param manager **/
virtual
QGCUASParamManager
*
getParamManager
()
=
0
;
virtual
QGCUASParamManager
Interface
*
getParamManager
()
=
0
;
/* COMMUNICATION FLAGS */
...
...
src/uas/UASParameterCommsMgr.cc
View file @
190b1d8a
...
...
@@ -2,7 +2,7 @@
#include <QSettings>
#include "QGCUASParamManager.h"
#include "QGCUASParamManager
Interface
.h"
#include "UASInterface.h"
...
...
src/ui/QGCBaseParamWidget.cc
View file @
190b1d8a
...
...
@@ -3,9 +3,9 @@
#include <QFileDialog>
#include <QFile>
#include <QVariant>
#include <QTextStream>
>
#include <QTextStream>
#include "QGCUASParamManager.h"
#include "QGCUASParamManager
Interface
.h"
#include "UASInterface.h"
...
...
src/ui/QGCBaseParamWidget.h
View file @
190b1d8a
...
...
@@ -8,7 +8,7 @@
//forward declarations
class
QGCUASParamManager
;
class
QGCUASParamManager
Interface
;
class
UASInterface
;
...
...
@@ -50,7 +50,7 @@ public slots:
virtual
void
loadParametersFromFile
();
protected:
QGCUASParamManager
*
paramMgr
;
QGCUASParamManager
Interface
*
paramMgr
;
UASInterface
*
mav
;
QString
updatingParamNameLock
;
///< Name of param currently being updated-- used for reducing echo on param change
...
...
src/ui/QGCPX4VehicleConfig.h
View file @
190b1d8a
...
...
@@ -276,7 +276,7 @@ protected:
bool
doneLoadingConfig
;
UASInterface
*
mav
;
///< The current MAV
QGCUASParamManager
*
paramMgr
;
///< params mgr for the mav
QGCUASParamManager
Interface
*
paramMgr
;
///< params mgr for the mav
static
const
unsigned
int
chanMax
=
14
;
///< Maximum number of channels
static
const
unsigned
int
chanMappedMax
=
16
;
///< Maximum number of mapped channels (can be higher than input channel count)
unsigned
int
chanCount
;
///< Actual channels
...
...
src/ui/QGCVehicleConfig.h
View file @
190b1d8a
...
...
@@ -158,7 +158,7 @@ protected slots:
protected:
bool
doneLoadingConfig
;
UASInterface
*
mav
;
///< The current MAV
QGCUASParamManager
*
paramMgr
;
///< params mgr for the mav
QGCUASParamManager
Interface
*
paramMgr
;
///< params mgr for the mav
static
const
unsigned
int
chanMax
=
8
;
///< Maximum number of channels
unsigned
int
chanCount
;
///< Actual channels
int
rcType
;
///< Type of the remote control
...
...
src/ui/configuration/FrameTypeConfig.h
View file @
190b1d8a
...
...
@@ -34,10 +34,8 @@ This file is part of the QGROUNDCONTROL project
#include <QWidget>
#include "ui_FrameTypeConfig.h"
#include "UASInterface.h"
#include "UASManager.h"
#include "QGCUASParamManager.h"
#include "AP2ConfigWidget.h"
class
FrameTypeConfig
:
public
AP2ConfigWidget
{
Q_OBJECT
...
...
src/ui/designer/QGCComboBox.h
View file @
190b1d8a
...
...
@@ -7,7 +7,7 @@
#include "QGCToolWidgetItem.h"
class
QGCUASParamManager
;
class
QGCUASParamManager
Interface
;
namespace
Ui
{
...
...
@@ -52,7 +52,7 @@ protected slots:
/** @brief Updates current parameter based on new combobox value */
void
comboBoxIndexChanged
(
QString
val
);
protected:
QGCUASParamManager
*
paramMgr
;
///< Access to parameter manager
QGCUASParamManager
Interface
*
paramMgr
;
///< Access to parameter manager
bool
visibleEnabled
;
QString
visibleParam
;
int
visibleVal
;
...
...
src/ui/map/QGCMapWidget.cc
View file @
190b1d8a
...
...
@@ -134,7 +134,7 @@ bool QGCMapWidget::setHomeActionTriggered()
QMessageBox
::
information
(
0
,
"Error"
,
"Please connect first"
);
return
false
;
}
UASManager
*
uasManager
=
UASManager
::
instance
();
UASManager
Interface
*
uasManager
=
UASManager
::
instance
();
if
(
!
uasManager
)
{
return
false
;
}
// Enter an altitude
...
...
src/ui/px4_configuration/QGCPX4AirframeConfig.h
View file @
190b1d8a
...
...
@@ -97,7 +97,7 @@ protected:
private:
UASInterface
*
mav
;
QGCUASParamManager
*
paramMgr
;
QGCUASParamManager
Interface
*
paramMgr
;
QProgressDialog
*
progress
;
unsigned
pendingParams
;
enum
CONFIG_STATE
configState
;
...
...
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