From 55f7245cbab98cdd7990eabc59ad631b315a10fe Mon Sep 17 00:00:00 2001 From: Michael Carpenter Date: Tue, 30 Jul 2013 06:33:59 -0400 Subject: [PATCH] Change for "burn" to "flash" for firmware config flashing --- src/ui/configuration/ApmFirmwareConfig.cc | 22 +++++++++++----------- src/ui/configuration/ApmFirmwareConfig.h | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/ui/configuration/ApmFirmwareConfig.cc b/src/ui/configuration/ApmFirmwareConfig.cc index a7ecbe74b..4b63192a5 100644 --- a/src/ui/configuration/ApmFirmwareConfig.cc +++ b/src/ui/configuration/ApmFirmwareConfig.cc @@ -22,15 +22,15 @@ ApmFirmwareConfig::ApmFirmwareConfig(QWidget *parent) : QWidget(parent) m_networkManager = new QNetworkAccessManager(this); - connect(ui.roverPushButton,SIGNAL(clicked()),this,SLOT(burnButtonClicked())); - connect(ui.planePushButton,SIGNAL(clicked()),this,SLOT(burnButtonClicked())); - connect(ui.copterPushButton,SIGNAL(clicked()),this,SLOT(burnButtonClicked())); - connect(ui.hexaPushButton,SIGNAL(clicked()),this,SLOT(burnButtonClicked())); - connect(ui.octaQuadPushButton,SIGNAL(clicked()),this,SLOT(burnButtonClicked())); - connect(ui.octaPushButton,SIGNAL(clicked()),this,SLOT(burnButtonClicked())); - connect(ui.quadPushButton,SIGNAL(clicked()),this,SLOT(burnButtonClicked())); - connect(ui.triPushButton,SIGNAL(clicked()),this,SLOT(burnButtonClicked())); - connect(ui.y6PushButton,SIGNAL(clicked()),this,SLOT(burnButtonClicked())); + connect(ui.roverPushButton,SIGNAL(clicked()),this,SLOT(flashButtonClicked())); + connect(ui.planePushButton,SIGNAL(clicked()),this,SLOT(flashButtonClicked())); + connect(ui.copterPushButton,SIGNAL(clicked()),this,SLOT(flashButtonClicked())); + connect(ui.hexaPushButton,SIGNAL(clicked()),this,SLOT(flashButtonClicked())); + connect(ui.octaQuadPushButton,SIGNAL(clicked()),this,SLOT(flashButtonClicked())); + connect(ui.octaPushButton,SIGNAL(clicked()),this,SLOT(flashButtonClicked())); + connect(ui.quadPushButton,SIGNAL(clicked()),this,SLOT(flashButtonClicked())); + connect(ui.triPushButton,SIGNAL(clicked()),this,SLOT(flashButtonClicked())); + connect(ui.y6PushButton,SIGNAL(clicked()),this,SLOT(flashButtonClicked())); 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, burning firmware"; + qDebug() << "Download finished, flashing firmware"; QNetworkReply *reply = qobject_cast(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::burnButtonClicked() +void ApmFirmwareConfig::flashButtonClicked() { QPushButton *senderbtn = qobject_cast(sender()); if (m_buttonToUrlMap.contains(senderbtn)) diff --git a/src/ui/configuration/ApmFirmwareConfig.h b/src/ui/configuration/ApmFirmwareConfig.h index 9db7d3293..51c8fdb78 100644 --- a/src/ui/configuration/ApmFirmwareConfig.h +++ b/src/ui/configuration/ApmFirmwareConfig.h @@ -26,7 +26,7 @@ public: private slots: void firmwareListFinished(); void firmwareListError(QNetworkReply::NetworkError error); - void burnButtonClicked(); + void flashButtonClicked(); void betaFirmwareButtonClicked(bool betafirmwareenabled); void downloadFinished(); void firmwareProcessFinished(int status); -- 2.22.0