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
12e5dd71
Commit
12e5dd71
authored
Dec 08, 2016
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correct handling of GPS_RAW_INT, GLOBAL_POSITION_INT, VFR_HUD
* Moved from UAS * Remove unused code
parent
23d3eb50
Changes
2
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
89 additions
and
127 deletions
+89
-127
Vehicle.cc
src/Vehicle/Vehicle.cc
+82
-110
Vehicle.h
src/Vehicle/Vehicle.h
+7
-17
No files found.
src/Vehicle/Vehicle.cc
View file @
12e5dd71
This diff is collapsed.
Click to expand it.
src/Vehicle/Vehicle.h
View file @
12e5dd71
...
@@ -137,13 +137,6 @@ public:
...
@@ -137,13 +137,6 @@ public:
static
const
char
*
_countFactName
;
static
const
char
*
_countFactName
;
static
const
char
*
_lockFactName
;
static
const
char
*
_lockFactName
;
private
slots
:
void
_setSatelliteCount
(
double
val
,
QString
);
void
_setSatRawHDOP
(
double
val
);
void
_setSatRawVDOP
(
double
val
);
void
_setSatRawCOG
(
double
val
);
void
_setSatLoc
(
UASInterface
*
,
int
fix
);
private:
private:
Vehicle
*
_vehicle
;
Vehicle
*
_vehicle
;
Fact
_hdopFact
;
Fact
_hdopFact
;
...
@@ -683,11 +676,6 @@ private slots:
...
@@ -683,11 +676,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
_updateSpeed
(
UASInterface
*
uas
,
double
_groundSpeed
,
double
_airSpeed
,
quint64
timestamp
);
void
_updateAltitude
(
UASInterface
*
uas
,
double
_altitudeAMSL
,
double
_altitudeRelative
,
double
_climbRate
,
quint64
timestamp
);
void
_updateNavigationControllerErrors
(
UASInterface
*
uas
,
double
altitudeError
,
double
speedError
,
double
xtrackError
);
void
_updateNavigationControllerData
(
UASInterface
*
uas
,
float
navRoll
,
float
navPitch
,
float
navBearing
,
float
targetBearing
,
float
targetDistance
);
void
_checkUpdate
();
void
_updateState
(
UASInterface
*
system
,
QString
name
,
QString
description
);
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
);
...
@@ -716,6 +704,10 @@ private:
...
@@ -716,6 +704,10 @@ private:
void
_handleCommandAck
(
mavlink_message_t
&
message
);
void
_handleCommandAck
(
mavlink_message_t
&
message
);
void
_handleAutopilotVersion
(
LinkInterface
*
link
,
mavlink_message_t
&
message
);
void
_handleAutopilotVersion
(
LinkInterface
*
link
,
mavlink_message_t
&
message
);
void
_handleHilActuatorControls
(
mavlink_message_t
&
message
);
void
_handleHilActuatorControls
(
mavlink_message_t
&
message
);
void
_handleGpsRawInt
(
mavlink_message_t
&
message
);
void
_handleGlobalPositionInt
(
mavlink_message_t
&
message
);
void
_handleAltitude
(
mavlink_message_t
&
message
);
void
_handleVfrHud
(
mavlink_message_t
&
message
);
void
_missionManagerError
(
int
errorCode
,
const
QString
&
errorMsg
);
void
_missionManagerError
(
int
errorCode
,
const
QString
&
errorMsg
);
void
_geoFenceManagerError
(
int
errorCode
,
const
QString
&
errorMsg
);
void
_geoFenceManagerError
(
int
errorCode
,
const
QString
&
errorMsg
);
void
_rallyPointManagerError
(
int
errorCode
,
const
QString
&
errorMsg
);
void
_rallyPointManagerError
(
int
errorCode
,
const
QString
&
errorMsg
);
...
@@ -763,11 +755,6 @@ private:
...
@@ -763,11 +755,6 @@ private:
int
_currentNormalCount
;
int
_currentNormalCount
;
MessageType_t
_currentMessageType
;
MessageType_t
_currentMessageType
;
QString
_latestError
;
QString
_latestError
;
float
_navigationAltitudeError
;
float
_navigationSpeedError
;
float
_navigationCrosstrackError
;
float
_navigationTargetBearing
;
QTimer
*
_refreshTimer
;
QString
_currentState
;
QString
_currentState
;
int
_updateCount
;
int
_updateCount
;
QString
_formatedMessage
;
QString
_formatedMessage
;
...
@@ -779,6 +766,9 @@ private:
...
@@ -779,6 +766,9 @@ private:
uint32_t
_onboardControlSensorsEnabled
;
uint32_t
_onboardControlSensorsEnabled
;
uint32_t
_onboardControlSensorsHealth
;
uint32_t
_onboardControlSensorsHealth
;
uint32_t
_onboardControlSensorsUnhealthy
;
uint32_t
_onboardControlSensorsUnhealthy
;
bool
_useGpsRawIntForPosition
;
bool
_useGpsRawIntForAltitude
;
bool
_useAltitudeForAltitude
;
typedef
struct
{
typedef
struct
{
int
component
;
int
component
;
...
...
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