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
b317b17c
Commit
b317b17c
authored
Dec 27, 2016
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unused signal/slot
parent
9f8e0530
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
14 deletions
+0
-14
Vehicle.cc
src/Vehicle/Vehicle.cc
+0
-9
Vehicle.h
src/Vehicle/Vehicle.h
+0
-5
No files found.
src/Vehicle/Vehicle.cc
View file @
b317b17c
...
@@ -180,7 +180,6 @@ Vehicle::Vehicle(LinkInterface* link,
...
@@ -180,7 +180,6 @@ Vehicle::Vehicle(LinkInterface* link,
// Now connect the new UAS
// Now connect the new UAS
connect
(
_mav
,
SIGNAL
(
attitudeChanged
(
UASInterface
*
,
double
,
double
,
double
,
quint64
)),
this
,
SLOT
(
_updateAttitude
(
UASInterface
*
,
double
,
double
,
double
,
quint64
)));
connect
(
_mav
,
SIGNAL
(
attitudeChanged
(
UASInterface
*
,
double
,
double
,
double
,
quint64
)),
this
,
SLOT
(
_updateAttitude
(
UASInterface
*
,
double
,
double
,
double
,
quint64
)));
connect
(
_mav
,
SIGNAL
(
attitudeChanged
(
UASInterface
*
,
int
,
double
,
double
,
double
,
quint64
)),
this
,
SLOT
(
_updateAttitude
(
UASInterface
*
,
int
,
double
,
double
,
double
,
quint64
)));
connect
(
_mav
,
SIGNAL
(
attitudeChanged
(
UASInterface
*
,
int
,
double
,
double
,
double
,
quint64
)),
this
,
SLOT
(
_updateAttitude
(
UASInterface
*
,
int
,
double
,
double
,
double
,
quint64
)));
connect
(
_mav
,
SIGNAL
(
statusChanged
(
UASInterface
*
,
QString
,
QString
)),
this
,
SLOT
(
_updateState
(
UASInterface
*
,
QString
,
QString
)));
_loadSettings
();
_loadSettings
();
...
@@ -1124,14 +1123,6 @@ void Vehicle::_handletextMessageReceived(UASMessage* message)
...
@@ -1124,14 +1123,6 @@ void Vehicle::_handletextMessageReceived(UASMessage* message)
}
}
}
}
void
Vehicle
::
_updateState
(
UASInterface
*
,
QString
name
,
QString
)
{
if
(
_currentState
!=
name
)
{
_currentState
=
name
;
emit
currentStateChanged
();
}
}
void
Vehicle
::
_handleTextMessage
(
int
newCount
)
void
Vehicle
::
_handleTextMessage
(
int
newCount
)
{
{
// Reset?
// Reset?
...
...
src/Vehicle/Vehicle.h
View file @
b317b17c
...
@@ -230,7 +230,6 @@ public:
...
@@ -230,7 +230,6 @@ public:
Q_PROPERTY
(
QmlObjectListModel
*
trajectoryPoints
READ
trajectoryPoints
CONSTANT
)
Q_PROPERTY
(
QmlObjectListModel
*
trajectoryPoints
READ
trajectoryPoints
CONSTANT
)
Q_PROPERTY
(
float
latitude
READ
latitude
NOTIFY
coordinateChanged
)
Q_PROPERTY
(
float
latitude
READ
latitude
NOTIFY
coordinateChanged
)
Q_PROPERTY
(
float
longitude
READ
longitude
NOTIFY
coordinateChanged
)
Q_PROPERTY
(
float
longitude
READ
longitude
NOTIFY
coordinateChanged
)
Q_PROPERTY
(
QString
currentState
READ
currentState
NOTIFY
currentStateChanged
)
Q_PROPERTY
(
bool
messageTypeNone
READ
messageTypeNone
NOTIFY
messageTypeChanged
)
Q_PROPERTY
(
bool
messageTypeNone
READ
messageTypeNone
NOTIFY
messageTypeChanged
)
Q_PROPERTY
(
bool
messageTypeNormal
READ
messageTypeNormal
NOTIFY
messageTypeChanged
)
Q_PROPERTY
(
bool
messageTypeNormal
READ
messageTypeNormal
NOTIFY
messageTypeChanged
)
Q_PROPERTY
(
bool
messageTypeWarning
READ
messageTypeWarning
NOTIFY
messageTypeChanged
)
Q_PROPERTY
(
bool
messageTypeWarning
READ
messageTypeWarning
NOTIFY
messageTypeChanged
)
...
@@ -507,7 +506,6 @@ public:
...
@@ -507,7 +506,6 @@ public:
float
latitude
()
{
return
_coordinate
.
latitude
();
}
float
latitude
()
{
return
_coordinate
.
latitude
();
}
float
longitude
()
{
return
_coordinate
.
longitude
();
}
float
longitude
()
{
return
_coordinate
.
longitude
();
}
bool
mavPresent
()
{
return
_mav
!=
NULL
;
}
bool
mavPresent
()
{
return
_mav
!=
NULL
;
}
QString
currentState
()
{
return
_currentState
;
}
int
rcRSSI
()
{
return
_rcRSSI
;
}
int
rcRSSI
()
{
return
_rcRSSI
;
}
bool
px4Firmware
()
const
{
return
_firmwareType
==
MAV_AUTOPILOT_PX4
;
}
bool
px4Firmware
()
const
{
return
_firmwareType
==
MAV_AUTOPILOT_PX4
;
}
bool
apmFirmware
()
const
{
return
_firmwareType
==
MAV_AUTOPILOT_ARDUPILOTMEGA
;
}
bool
apmFirmware
()
const
{
return
_firmwareType
==
MAV_AUTOPILOT_ARDUPILOTMEGA
;
}
...
@@ -627,7 +625,6 @@ signals:
...
@@ -627,7 +625,6 @@ signals:
void
latestErrorChanged
();
void
latestErrorChanged
();
void
longitudeChanged
();
void
longitudeChanged
();
void
currentConfigChanged
();
void
currentConfigChanged
();
void
currentStateChanged
();
void
flowImageIndexChanged
();
void
flowImageIndexChanged
();
void
rcRSSIChanged
(
int
rcRSSI
);
void
rcRSSIChanged
(
int
rcRSSI
);
...
@@ -677,7 +674,6 @@ private slots:
...
@@ -677,7 +674,6 @@ private slots:
void
_updateAttitude
(
UASInterface
*
uas
,
double
roll
,
double
pitch
,
double
yaw
,
quint64
timestamp
);
void
_updateAttitude
(
UASInterface
*
uas
,
double
roll
,
double
pitch
,
double
yaw
,
quint64
timestamp
);
/** @brief Attitude from one specific component / redundant autopilot */
/** @brief Attitude from one specific component / redundant autopilot */
void
_updateAttitude
(
UASInterface
*
uas
,
int
component
,
double
roll
,
double
pitch
,
double
yaw
,
quint64
timestamp
);
void
_updateAttitude
(
UASInterface
*
uas
,
int
component
,
double
roll
,
double
pitch
,
double
yaw
,
quint64
timestamp
);
void
_updateState
(
UASInterface
*
system
,
QString
name
,
QString
description
);
/** @brief A new camera image has arrived */
/** @brief A new camera image has arrived */
void
_imageReady
(
UASInterface
*
uas
);
void
_imageReady
(
UASInterface
*
uas
);
void
_connectionLostTimeout
(
void
);
void
_connectionLostTimeout
(
void
);
...
@@ -757,7 +753,6 @@ private:
...
@@ -757,7 +753,6 @@ private:
int
_currentNormalCount
;
int
_currentNormalCount
;
MessageType_t
_currentMessageType
;
MessageType_t
_currentMessageType
;
QString
_latestError
;
QString
_latestError
;
QString
_currentState
;
int
_updateCount
;
int
_updateCount
;
QString
_formatedMessage
;
QString
_formatedMessage
;
int
_rcRSSI
;
int
_rcRSSI
;
...
...
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