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
4768c933
Commit
4768c933
authored
Nov 21, 2014
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unused action
parent
6293be63
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
0 additions
and
18 deletions
+0
-18
MockUASManager.h
src/qgcunittest/MockUASManager.h
+0
-1
UASManager.cc
src/uas/UASManager.cc
+0
-8
UASManager.h
src/uas/UASManager.h
+0
-7
UASManagerInterface.h
src/uas/UASManagerInterface.h
+0
-1
MainWindow.cc
src/ui/MainWindow.cc
+0
-1
No files found.
src/qgcunittest/MockUASManager.h
View file @
4768c933
...
@@ -93,7 +93,6 @@ public slots:
...
@@ -93,7 +93,6 @@ public slots:
virtual
bool
returnActiveUAS
()
{
Q_ASSERT
(
false
);
return
false
;
}
virtual
bool
returnActiveUAS
()
{
Q_ASSERT
(
false
);
return
false
;
}
virtual
bool
stopActiveUAS
()
{
Q_ASSERT
(
false
);
return
false
;
}
virtual
bool
stopActiveUAS
()
{
Q_ASSERT
(
false
);
return
false
;
}
virtual
bool
killActiveUAS
()
{
Q_ASSERT
(
false
);
return
false
;
}
virtual
bool
killActiveUAS
()
{
Q_ASSERT
(
false
);
return
false
;
}
virtual
void
configureActiveUAS
()
{
Q_ASSERT
(
false
);
}
virtual
bool
shutdownActiveUAS
()
{
Q_ASSERT
(
false
);
return
false
;
}
virtual
bool
shutdownActiveUAS
()
{
Q_ASSERT
(
false
);
return
false
;
}
virtual
bool
setHomePosition
(
double
lat
,
double
lon
,
double
alt
)
virtual
bool
setHomePosition
(
double
lat
,
double
lon
,
double
alt
)
{
Q_ASSERT
(
false
);
Q_UNUSED
(
lat
);
Q_UNUSED
(
lon
);
Q_UNUSED
(
alt
);
return
false
;
}
{
Q_ASSERT
(
false
);
Q_UNUSED
(
lat
);
Q_UNUSED
(
lon
);
Q_UNUSED
(
alt
);
return
false
;
}
...
...
src/uas/UASManager.cc
View file @
4768c933
...
@@ -436,14 +436,6 @@ bool UASManager::shutdownActiveUAS()
...
@@ -436,14 +436,6 @@ bool UASManager::shutdownActiveUAS()
return
(
activeUAS
);
return
(
activeUAS
);
}
}
void
UASManager
::
configureActiveUAS
()
{
UASInterface
*
actUAS
=
getActiveUAS
();
if
(
actUAS
)
{
// Do something
}
}
UASInterface
*
UASManager
::
getUASForId
(
int
id
)
UASInterface
*
UASManager
::
getUASForId
(
int
id
)
{
{
UASInterface
*
system
=
NULL
;
UASInterface
*
system
=
NULL
;
...
...
src/uas/UASManager.h
View file @
4768c933
...
@@ -227,13 +227,6 @@ public slots:
...
@@ -227,13 +227,6 @@ public slots:
*/
*/
bool
killActiveUAS
();
bool
killActiveUAS
();
/**
* @brief Configure the currently active UAS
*
* This command will bring up the configuration dialog for the particular UAS.
*/
void
configureActiveUAS
();
/** @brief Shut down the onboard operating system down */
/** @brief Shut down the onboard operating system down */
bool
shutdownActiveUAS
();
bool
shutdownActiveUAS
();
...
...
src/uas/UASManagerInterface.h
View file @
4768c933
...
@@ -82,7 +82,6 @@ public slots:
...
@@ -82,7 +82,6 @@ public slots:
virtual
bool
returnActiveUAS
()
=
0
;
virtual
bool
returnActiveUAS
()
=
0
;
virtual
bool
stopActiveUAS
()
=
0
;
virtual
bool
stopActiveUAS
()
=
0
;
virtual
bool
killActiveUAS
()
=
0
;
virtual
bool
killActiveUAS
()
=
0
;
virtual
void
configureActiveUAS
()
=
0
;
virtual
bool
shutdownActiveUAS
()
=
0
;
virtual
bool
shutdownActiveUAS
()
=
0
;
virtual
bool
setHomePosition
(
double
lat
,
double
lon
,
double
alt
)
=
0
;
virtual
bool
setHomePosition
(
double
lat
,
double
lon
,
double
alt
)
=
0
;
virtual
bool
setHomePositionAndNotify
(
double
lat
,
double
lon
,
double
alt
)
=
0
;
virtual
bool
setHomePositionAndNotify
(
double
lat
,
double
lon
,
double
alt
)
=
0
;
...
...
src/ui/MainWindow.cc
View file @
4768c933
...
@@ -1237,7 +1237,6 @@ void MainWindow::connectCommonActions()
...
@@ -1237,7 +1237,6 @@ void MainWindow::connectCommonActions()
connect
(
ui
.
actionEmergency_Land
,
SIGNAL
(
triggered
()),
UASManager
::
instance
(),
SLOT
(
stopActiveUAS
()));
connect
(
ui
.
actionEmergency_Land
,
SIGNAL
(
triggered
()),
UASManager
::
instance
(),
SLOT
(
stopActiveUAS
()));
connect
(
ui
.
actionEmergency_Kill
,
SIGNAL
(
triggered
()),
UASManager
::
instance
(),
SLOT
(
killActiveUAS
()));
connect
(
ui
.
actionEmergency_Kill
,
SIGNAL
(
triggered
()),
UASManager
::
instance
(),
SLOT
(
killActiveUAS
()));
connect
(
ui
.
actionShutdownMAV
,
SIGNAL
(
triggered
()),
UASManager
::
instance
(),
SLOT
(
shutdownActiveUAS
()));
connect
(
ui
.
actionShutdownMAV
,
SIGNAL
(
triggered
()),
UASManager
::
instance
(),
SLOT
(
shutdownActiveUAS
()));
connect
(
ui
.
actionConfiguration
,
SIGNAL
(
triggered
()),
UASManager
::
instance
(),
SLOT
(
configureActiveUAS
()));
// Views actions
// Views actions
connect
(
ui
.
actionFlightView
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
loadPilotView
()));
connect
(
ui
.
actionFlightView
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
loadPilotView
()));
...
...
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