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
54780e15
Commit
54780e15
authored
7 years ago
by
Don Gagne
Committed by
GitHub
7 years ago
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5641 from DonLakeFlyer/StableMerge
Bring stable across to master
parents
44b4595a
03b34ca5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
QGCApplication.cc
src/QGCApplication.cc
+1
-1
Vehicle.cc
src/Vehicle/Vehicle.cc
+3
-3
No files found.
src/QGCApplication.cc
View file @
54780e15
...
...
@@ -401,11 +401,11 @@ bool QGCApplication::_initForNormalAppBoot(void)
// Start the user interface
MainWindow
*
mainWindow
=
MainWindow
::
_create
();
Q_CHECK_PTR
(
mainWindow
);
#endif
// Now that main window is up check for lost log files
connect
(
this
,
&
QGCApplication
::
checkForLostLogFiles
,
toolbox
()
->
mavlinkProtocol
(),
&
MAVLinkProtocol
::
checkForLostLogFiles
);
emit
checkForLostLogFiles
();
#endif
// Load known link configurations
toolbox
()
->
linkManager
()
->
loadLinkConfigurationList
();
...
...
This diff is collapsed.
Click to expand it.
src/Vehicle/Vehicle.cc
View file @
54780e15
...
...
@@ -1836,19 +1836,19 @@ void Vehicle::sendMessageMultiple(mavlink_message_t message)
void
Vehicle
::
_missionManagerError
(
int
errorCode
,
const
QString
&
errorMsg
)
{
Q_UNUSED
(
errorCode
);
qgcApp
()
->
showMessage
(
QString
(
"
Error during Mission communication with Vehicle
: %1"
).
arg
(
errorMsg
));
qgcApp
()
->
showMessage
(
QString
(
"
Mission transfer failed. Retry transfer. Error
: %1"
).
arg
(
errorMsg
));
}
void
Vehicle
::
_geoFenceManagerError
(
int
errorCode
,
const
QString
&
errorMsg
)
{
Q_UNUSED
(
errorCode
);
qgcApp
()
->
showMessage
(
QString
(
"
Error during GeoFence communication with Vehicle
: %1"
).
arg
(
errorMsg
));
qgcApp
()
->
showMessage
(
QString
(
"
GeoFence transfer failed. Retry transfer. Error
: %1"
).
arg
(
errorMsg
));
}
void
Vehicle
::
_rallyPointManagerError
(
int
errorCode
,
const
QString
&
errorMsg
)
{
Q_UNUSED
(
errorCode
);
qgcApp
()
->
showMessage
(
QString
(
"
Error during Rally Point communication with Vehicle
: %1"
).
arg
(
errorMsg
));
qgcApp
()
->
showMessage
(
QString
(
"
Rally Point transfer failed. Retry transfer. Error
: %1"
).
arg
(
errorMsg
));
}
void
Vehicle
::
_addNewMapTrajectoryPoint
(
void
)
...
...
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