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
55f7245c
Commit
55f7245c
authored
Jul 30, 2013
by
Michael Carpenter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change for "burn" to "flash" for firmware config flashing
parent
f28cb022
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
12 deletions
+12
-12
ApmFirmwareConfig.cc
src/ui/configuration/ApmFirmwareConfig.cc
+11
-11
ApmFirmwareConfig.h
src/ui/configuration/ApmFirmwareConfig.h
+1
-1
No files found.
src/ui/configuration/ApmFirmwareConfig.cc
View file @
55f7245c
...
...
@@ -22,15 +22,15 @@ ApmFirmwareConfig::ApmFirmwareConfig(QWidget *parent) : QWidget(parent)
m_networkManager
=
new
QNetworkAccessManager
(
this
);
connect
(
ui
.
roverPushButton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
burn
ButtonClicked
()));
connect
(
ui
.
planePushButton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
burn
ButtonClicked
()));
connect
(
ui
.
copterPushButton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
burn
ButtonClicked
()));
connect
(
ui
.
hexaPushButton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
burn
ButtonClicked
()));
connect
(
ui
.
octaQuadPushButton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
burn
ButtonClicked
()));
connect
(
ui
.
octaPushButton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
burn
ButtonClicked
()));
connect
(
ui
.
quadPushButton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
burn
ButtonClicked
()));
connect
(
ui
.
triPushButton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
burn
ButtonClicked
()));
connect
(
ui
.
y6PushButton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
burn
ButtonClicked
()));
connect
(
ui
.
roverPushButton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
flash
ButtonClicked
()));
connect
(
ui
.
planePushButton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
flash
ButtonClicked
()));
connect
(
ui
.
copterPushButton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
flash
ButtonClicked
()));
connect
(
ui
.
hexaPushButton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
flash
ButtonClicked
()));
connect
(
ui
.
octaQuadPushButton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
flash
ButtonClicked
()));
connect
(
ui
.
octaPushButton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
flash
ButtonClicked
()));
connect
(
ui
.
quadPushButton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
flash
ButtonClicked
()));
connect
(
ui
.
triPushButton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
flash
ButtonClicked
()));
connect
(
ui
.
y6PushButton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
flash
ButtonClicked
()));
QTimer
::
singleShot
(
500
,
this
,
SLOT
(
requestFirmwares
()));
connect
(
ui
.
betaFirmwareButton
,
SIGNAL
(
clicked
(
bool
)),
this
,
SLOT
(
betaFirmwareButtonClicked
(
bool
)));
...
...
@@ -265,7 +265,7 @@ void ApmFirmwareConfig::firmwareProcessReadyRead()
void
ApmFirmwareConfig
::
downloadFinished
()
{
qDebug
()
<<
"Download finished,
burn
ing firmware"
;
qDebug
()
<<
"Download finished,
flash
ing firmware"
;
QNetworkReply
*
reply
=
qobject_cast
<
QNetworkReply
*>
(
sender
());
if
(
!
reply
)
{
...
...
@@ -340,7 +340,7 @@ void ApmFirmwareConfig::firmwareDownloadProgress(qint64 received,qint64 total)
ui
.
progressBar
->
setValue
(
100.0
*
((
double
)
received
/
(
double
)
total
));
}
void
ApmFirmwareConfig
::
burn
ButtonClicked
()
void
ApmFirmwareConfig
::
flash
ButtonClicked
()
{
QPushButton
*
senderbtn
=
qobject_cast
<
QPushButton
*>
(
sender
());
if
(
m_buttonToUrlMap
.
contains
(
senderbtn
))
...
...
src/ui/configuration/ApmFirmwareConfig.h
View file @
55f7245c
...
...
@@ -26,7 +26,7 @@ public:
private
slots
:
void
firmwareListFinished
();
void
firmwareListError
(
QNetworkReply
::
NetworkError
error
);
void
burn
ButtonClicked
();
void
flash
ButtonClicked
();
void
betaFirmwareButtonClicked
(
bool
betafirmwareenabled
);
void
downloadFinished
();
void
firmwareProcessFinished
(
int
status
);
...
...
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