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
24e75cfb
Commit
24e75cfb
authored
Nov 13, 2015
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix android build
parent
41866c2f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
10 deletions
+12
-10
MAVLinkProtocol.cc
src/comm/MAVLinkProtocol.cc
+12
-10
No files found.
src/comm/MAVLinkProtocol.cc
View file @
24e75cfb
...
@@ -108,9 +108,7 @@ void MAVLinkProtocol::setToolbox(QGCToolbox *toolbox)
...
@@ -108,9 +108,7 @@ void MAVLinkProtocol::setToolbox(QGCToolbox *toolbox)
connect
(
this
,
&
MAVLinkProtocol
::
protocolStatusMessage
,
_app
,
&
QGCApplication
::
criticalMessageBoxOnMainThread
);
connect
(
this
,
&
MAVLinkProtocol
::
protocolStatusMessage
,
_app
,
&
QGCApplication
::
criticalMessageBoxOnMainThread
);
connect
(
this
,
&
MAVLinkProtocol
::
saveTempFlightDataLog
,
_app
,
&
QGCApplication
::
saveTempFlightDataLogOnMainThread
);
connect
(
this
,
&
MAVLinkProtocol
::
saveTempFlightDataLog
,
_app
,
&
QGCApplication
::
saveTempFlightDataLogOnMainThread
);
#ifndef __mobile__
connect
(
_multiVehicleManager
->
vehicles
(),
&
QmlObjectListModel
::
countChanged
,
this
,
&
MAVLinkProtocol
::
_vehicleCountChanged
);
connect
(
_multiVehicleManager
->
vehicles
(),
&
QmlObjectListModel
::
countChanged
,
this
,
&
MAVLinkProtocol
::
_vehicleCountChanged
);
#endif
emit
versionCheckChanged
(
m_enable_version_check
);
emit
versionCheckChanged
(
m_enable_version_check
);
}
}
...
@@ -631,6 +629,18 @@ int MAVLinkProtocol::getHeartbeatRate()
...
@@ -631,6 +629,18 @@ int MAVLinkProtocol::getHeartbeatRate()
return
_heartbeatRate
;
return
_heartbeatRate
;
}
}
void
MAVLinkProtocol
::
_vehicleCountChanged
(
int
count
)
{
#ifndef __mobile__
if
(
count
==
0
)
{
// Last vehicle is gone, close out logging
_stopLogging
();
}
#else
Q_UNUSED
(
count
);
#endif
}
#ifndef __mobile__
#ifndef __mobile__
/// @brief Closes the log file if it is open
/// @brief Closes the log file if it is open
bool
MAVLinkProtocol
::
_closeLogFile
(
void
)
bool
MAVLinkProtocol
::
_closeLogFile
(
void
)
...
@@ -726,12 +736,4 @@ void MAVLinkProtocol::deleteTempLogFiles(void)
...
@@ -726,12 +736,4 @@ void MAVLinkProtocol::deleteTempLogFiles(void)
QFile
::
remove
(
fileInfo
.
filePath
());
QFile
::
remove
(
fileInfo
.
filePath
());
}
}
}
}
void
MAVLinkProtocol
::
_vehicleCountChanged
(
int
count
)
{
if
(
count
==
0
)
{
// Last vehicle is gone, close out logging
_stopLogging
();
}
}
#endif
#endif
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