rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-27 16:54:15 +01:00
Code Issues Releases Activity

OP-1174 uploader gadget - removed deprecated code and minor renaming

Browse Source
This commit is contained in:
Philippe Renon 2014-05-01 23:21:57 +02:00
parent fababeeeee
commit 9132e3d44f
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
View File

@ -289,9 +289,9 @@ void UploaderGadgetWidget::onAutopilotDisconnect()
static void sleep(int ms)
{
QEventLoop eventloop;
QTimer::singleShot(ms, &eventloop, SLOT(quit()));
eventloop.exec();
QEventLoop eventLoop;
QTimer::singleShot(ms, &eventLoop, SLOT(quit()));
eventLoop.exec();
}
/**
@ -692,7 +692,7 @@ bool UploaderGadgetWidget::autoUpdate()
}
QEventLoop eventLoop;
firmware = file.readAll();
connect(dfu, SIGNAL(progressUpdated(int)), this, SLOT(autoUpdateProgress(int)));
connect(dfu, SIGNAL(progressUpdated(int)), this, SLOT(autoUpdateFlashProgress(int)));
connect(dfu, SIGNAL(uploadFinished(OP_DFU::Status)), &eventLoop, SLOT(quit()));
emit autoUpdateSignal(UPLOADING_FW, QVariant());
if (!dfu->enterDFU(0)) {
@ -731,11 +731,6 @@ void UploaderGadgetWidget::autoUpdateFlashProgress(int value)
emit autoUpdateSignal(UPLOADING_FW, value);
}
void UploaderGadgetWidget::autoUpdateProgress(int value)
{
autoUpdateFlashProgress(value);
}
/**
Attempt a guided procedure to put both boards in BL mode when
the system is not bootable

2
ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.h
View File

@ -134,8 +134,6 @@ public slots:
bool autoUpdate();
void autoUpdateDisconnectProgress(int);
void autoUpdateConnectProgress(int);
// autoUpdateProgress is deprecated: use autoUpdateFlashProgress instead
void autoUpdateProgress(int);
void autoUpdateFlashProgress(int);
signals: