zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Change for "burn" to "flash" for firmware config flashing

QGC4.4
Michael Carpenter 12 years ago
parent
f28cb0223e
commit
55f7245cba
2 changed files with 12 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      src/ui/configuration/ApmFirmwareConfig.cc
  2. 2
      src/ui/configuration/ApmFirmwareConfig.h

22
src/ui/configuration/ApmFirmwareConfig.cc
Unescape View File

@ -22,15 +22,15 @@ ApmFirmwareConfig::ApmFirmwareConfig(QWidget *parent) : QWidget(parent) @@ -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() @@ -265,7 +265,7 @@ void ApmFirmwareConfig::firmwareProcessReadyRead()
void ApmFirmwareConfig::downloadFinished()
{
qDebug() << "Download finished, burning firmware";
qDebug() << "Download finished, flashing firmware";
QNetworkReply *reply = qobject_cast<QNetworkReply*>(sender());
if (!reply)
{
@ -340,7 +340,7 @@ void ApmFirmwareConfig::firmwareDownloadProgress(qint64 received,qint64 total) @@ -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<QPushButton*>(sender());
if (m_buttonToUrlMap.contains(senderbtn))

2
src/ui/configuration/ApmFirmwareConfig.h
Unescape View File

@ -26,7 +26,7 @@ public: @@ -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);

Write Preview
Loading…
Cancel
Save