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
6677c9b2
Commit
6677c9b2
authored
Apr 18, 2017
by
Don Gagne
Committed by
GitHub
Apr 18, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5012 from DonLakeFlyer/SomeFixes
Some fixes
parents
ec0f0532
bcffae2b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
ParameterManager.cc
src/FactSystem/ParameterManager.cc
+1
-1
FlightDisplayView.qml
src/FlightDisplay/FlightDisplayView.qml
+3
-1
No files found.
src/FactSystem/ParameterManager.cc
View file @
6677c9b2
...
...
@@ -110,7 +110,7 @@ void ParameterManager::_parameterUpdate(int vehicleId, int componentId, QString
// ArduPilot has this strange behavior of streaming parameters that we didn't ask for. This even happens before it responds to the
// PARAM_REQUEST_LIST. We disregard any of this until the initial request is responded to.
if
(
parameterId
==
65535
&&
_initialRequestTimeoutTimer
.
isActive
())
{
if
(
parameterId
==
65535
&&
parameterName
!=
"_HASH_CHECK"
&&
_initialRequestTimeoutTimer
.
isActive
())
{
qCDebug
(
ParameterManagerVerbose1Log
)
<<
"Disregarding unrequested param prior to intial list response"
<<
parameterName
;
return
;
}
...
...
src/FlightDisplay/FlightDisplayView.qml
View file @
6677c9b2
...
...
@@ -333,6 +333,8 @@ QGCView {
anchors.left
:
parent
.
left
anchors.right
:
altitudeSlider
.
visible
?
altitudeSlider
.
left
:
parent
.
right
anchors.bottom
:
parent
.
bottom
property
var
qgcView
:
root
}
// Button to start/stop video recording
...
...
@@ -514,7 +516,7 @@ QGCView {
z
:
_flightVideoPipControl
.
z
+
1
onShowStartMissionChanged
:
{
if
(
showStartMission
)
{
if
(
showStartMission
&&
!
showResumeMission
)
{
confirmAction
(
actionStartMission
)
}
}
...
...
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