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
2a4c779d
Commit
2a4c779d
authored
Feb 26, 2015
by
Don Gagne
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1278 from DonLakeFlyer/FirmwareUpgradeHelp
Better help text for Firmware Upgrade
parents
f6425893
67d27d79
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
FirmwareUpgrade.qml
src/VehicleSetup/FirmwareUpgrade.qml
+1
-0
FirmwareUpgradeController.cc
src/VehicleSetup/FirmwareUpgradeController.cc
+2
-1
No files found.
src/VehicleSetup/FirmwareUpgrade.qml
View file @
2a4c779d
...
...
@@ -93,6 +93,7 @@ Rectangle {
height
:
300
readOnly
:
true
frameVisible
:
false
text
:
qsTr
(
"
Please disconnect all connections and unplug board from USB before selecting Upgrade.
"
)
style
:
TextAreaStyle
{
textColor
:
qgcPal
.
text
backgroundColor
:
qgcPal
.
windowShade
...
...
src/VehicleSetup/FirmwareUpgradeController.cc
View file @
2a4c779d
...
...
@@ -84,7 +84,8 @@ void FirmwareUpgradeController::_foundBoard(bool firstTry, const QString portNam
{
if
(
firstTry
)
{
// Board is still plugged
_appendStatusLog
(
tr
(
"You must unplug your board before beginning the Firmware Upgrade process."
));
_appendStatusLog
(
tr
(
"Please unplug your board before beginning the Firmware Upgrade process."
));
_appendStatusLog
(
tr
(
"Click Upgrade again once the board is unplugged."
));
_cancel
();
}
else
{
_portName
=
portName
;
...
...
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