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
70f899c6
Commit
70f899c6
authored
Aug 23, 2018
by
Don Gagne
Committed by
Lorenz Meier
Aug 24, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add FactGroup for ESTIMATOR_STATUS values
parent
71f74f3f
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
447 additions
and
56 deletions
+447
-56
ChangeLog.md
ChangeLog.md
+2
-2
qgroundcontrol.qrc
qgroundcontrol.qrc
+1
-0
EstimatorStatusFactGroup.json
src/Vehicle/EstimatorStatusFactGroup.json
+130
-0
Vehicle.cc
src/Vehicle/Vehicle.cc
+168
-38
Vehicle.h
src/Vehicle/Vehicle.h
+146
-16
No files found.
ChangeLog.md
View file @
70f899c6
...
...
@@ -5,10 +5,10 @@ Note: This file only contains high level features or important fixes.
## 3.5
### 3.5.0 - Not yet released
*
*
Add ESTIMATOR_STATUS values to new estimatorStatus Vehicle FactGroup. These are now available to display in instrument panel.
## 3.4
### 3.4.1 - Not yet released
*
Fix crash when Survery with terrain follow is moved quickly
*
Fix terrain follow climb/descent rate fields swapped in ui
\ No newline at end of file
*
Fix terrain follow climb/descent rate fields swapped in ui
qgroundcontrol.qrc
View file @
70f899c6
...
...
@@ -237,6 +237,7 @@
<file alias="Vehicle/BatteryFact.json">src/Vehicle/BatteryFact.json</file>
<file alias="Vehicle/ClockFact.json">src/Vehicle/ClockFact.json</file>
<file alias="Vehicle/DistanceSensorFact.json">src/Vehicle/DistanceSensorFact.json</file>
<file alias="Vehicle/EstimatorStatusFactGroup.json">src/Vehicle/EstimatorStatusFactGroup.json</file>
<file alias="Vehicle/GPSFact.json">src/Vehicle/GPSFact.json</file>
<file alias="Vehicle/GPSRTKFact.json">src/Vehicle/GPSRTKFact.json</file>
<file alias="Vehicle/SetpointFact.json">src/Vehicle/SetpointFact.json</file>
...
...
src/Vehicle/EstimatorStatusFactGroup.json
0 → 100644
View file @
70f899c6
[
{
"name"
:
"goodAttitudeEsimate"
,
"shortDescription"
:
"Good Attitude Esimate"
,
"type"
:
"bool"
,
"default"
:
false
},
{
"name"
:
"goodHorizVelEstimate"
,
"shortDescription"
:
"Good Horiz Vel Estimate"
,
"type"
:
"bool"
,
"default"
:
false
},
{
"name"
:
"goodVertVelEstimate"
,
"shortDescription"
:
"Good Vert Vel Estimate"
,
"type"
:
"bool"
,
"default"
:
false
},
{
"name"
:
"goodHorizPosRelEstimate"
,
"shortDescription"
:
"Good Horiz Pos Rel Estimate"
,
"type"
:
"bool"
,
"default"
:
false
},
{
"name"
:
"goodHorizPosAbsEstimate"
,
"shortDescription"
:
"Good Horiz Pos Abs Estimate"
,
"type"
:
"bool"
,
"default"
:
false
},
{
"name"
:
"goodVertPosAbsEstimate"
,
"shortDescription"
:
"Good Vert Pos Abs Estimate"
,
"type"
:
"bool"
,
"default"
:
false
},
{
"name"
:
"goodVertPosAGLEstimate"
,
"shortDescription"
:
"Good Vert Pos AGL Estimate"
,
"type"
:
"bool"
,
"default"
:
false
},
{
"name"
:
"goodConstPosModeEstimate"
,
"shortDescription"
:
"Good Const Pos Mode Estimate"
,
"type"
:
"bool"
,
"default"
:
false
},
{
"name"
:
"goodPredHorizPosRelEstimate"
,
"shortDescription"
:
"Good Pred Horiz Pos Rel Estimate"
,
"type"
:
"bool"
,
"default"
:
false
},
{
"name"
:
"goodPredHorizPosAbsEstimate"
,
"shortDescription"
:
"Good Pred Horiz Pos Abs Estimate"
,
"type"
:
"bool"
,
"default"
:
false
},
{
"name"
:
"gpsGlitch"
,
"shortDescription"
:
"Gps Glitch"
,
"type"
:
"bool"
,
"default"
:
false
},
{
"name"
:
"accelError"
,
"shortDescription"
:
"Accel Error"
,
"type"
:
"bool"
,
"default"
:
false
},
{
"name"
:
"velRatio"
,
"shortDescription"
:
"Vel Ratio"
,
"type"
:
"float"
,
"decimalPlaces"
:
2
,
"default"
:
null
},
{
"name"
:
"horizPosRatio"
,
"shortDescription"
:
"Horiz Pos Ratio"
,
"type"
:
"float"
,
"decimalPlaces"
:
2
,
"default"
:
null
},
{
"name"
:
"vertPosRatio"
,
"shortDescription"
:
"Vert Pos Ratio"
,
"type"
:
"float"
,
"decimalPlaces"
:
2
,
"default"
:
null
},
{
"name"
:
"magRatio"
,
"shortDescription"
:
"Mag Ratio"
,
"type"
:
"float"
,
"decimalPlaces"
:
2
,
"default"
:
null
},
{
"name"
:
"haglRatio"
,
"shortDescription"
:
"HAGL Ratio"
,
"type"
:
"float"
,
"decimalPlaces"
:
2
,
"default"
:
null
},
{
"name"
:
"tasRatio"
,
"shortDescription"
:
"TAS Ratio"
,
"type"
:
"float"
,
"decimalPlaces"
:
2
,
"default"
:
null
},
{
"name"
:
"horizPosAccuracy"
,
"shortDescription"
:
"Horiz Pos Accuracy"
,
"type"
:
"float"
,
"decimalPlaces"
:
2
,
"default"
:
null
},
{
"name"
:
"vertPosAccuracy"
,
"shortDescription"
:
"Vert Pos Accuracy"
,
"type"
:
"float"
,
"decimalPlaces"
:
2
,
"default"
:
null
}
]
src/Vehicle/Vehicle.cc
View file @
70f899c6
This diff is collapsed.
Click to expand it.
src/Vehicle/Vehicle.h
View file @
70f899c6
This diff is collapsed.
Click to expand it.
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