mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Finish off the firmware update code.

Browse source 
This code connects the final parts of the generic firmware update code.

Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Anton Lundin 2014-10-20 22:58:21 +02:00 • committed by Dirk Hohndel
parent c11e2fbb6f
commit adf03c7845
2 changed files with 24 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

22
configuredivecomputer.cpp
View file

@ -13,7 +13,8 @@ ConfigureDiveComputer::ConfigureDiveComputer(QObject *parent) :
QObject(parent), QObject(parent),
readThread(0), readThread(0),
writeThread(0), writeThread(0),
resetThread(0) resetThread(0),
firmwareThread(0)
{ {
setState(INITIAL); setState(INITIAL);
} }
@ -512,7 +513,17 @@ bool ConfigureDiveComputer::restoreXMLBackup(QString fileName, DeviceDetails *de
void ConfigureDiveComputer::startFirmwareUpdate(QString fileName, device_data_t *data) void ConfigureDiveComputer::startFirmwareUpdate(QString fileName, device_data_t *data)
{ {
setState(FWUPDATE);
if (firmwareThread)
firmwareThread->deleteLater();
firmwareThread = new FirmwareUpdateThread(this, data, fileName);
connect(firmwareThread, SIGNAL(finished()),
this, SLOT(firmwareThreadFinished()), Qt::QueuedConnection);
connect(firmwareThread, SIGNAL(error(QString)), this, SLOT(setError(QString)));
firmwareThread->start();
} }
void ConfigureDiveComputer::resetSettings(device_data_t *data) void ConfigureDiveComputer::resetSettings(device_data_t *data)
@ -557,6 +568,15 @@ void ConfigureDiveComputer::writeThreadFinished()
} }
} }
void ConfigureDiveComputer::firmwareThreadFinished()
{
setState(DONE);
if (resetThread->lastError.isEmpty()) {
//No error
emit message(tr("Device firmware successfully updated"));
}
}
void ConfigureDiveComputer::resetThreadFinished() void ConfigureDiveComputer::resetThreadFinished()
{ {
setState(DONE); setState(DONE);

3
configuredivecomputer.h
View file

@ -22,6 +22,7 @@ public:
READING, READING,
WRITING, WRITING,
RESETTING, RESETTING,
FWUPDATE,
CANCELLING, CANCELLING,
CANCELLED, CANCELLED,
ERROR, ERROR,
@ -49,11 +50,13 @@ private:
ReadSettingsThread *readThread; ReadSettingsThread *readThread;
WriteSettingsThread *writeThread; WriteSettingsThread *writeThread;
ResetSettingsThread *resetThread; ResetSettingsThread *resetThread;
FirmwareUpdateThread *firmwareThread;
void setState(states newState); void setState(states newState);
private slots: private slots:
void readThreadFinished(); void readThreadFinished();
void writeThreadFinished(); void writeThreadFinished();
void resetThreadFinished(); void resetThreadFinished();
void firmwareThreadFinished();
void setError(QString err); void setError(QString err);
}; };