From 1923fb95a5d5b330921d5ea0e5abaffeb1a07162 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Mon, 11 Mar 2013 22:48:41 +0100 Subject: [PATCH] Hacking on uploader --- src/PX4FirmwareUpgradeWorker.cc | 2 +- src/PX4FirmwareUpgradeWorker.h | 4 ++-- src/apps/qupgrade/QUpgradeApp.cc | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/PX4FirmwareUpgradeWorker.cc b/src/PX4FirmwareUpgradeWorker.cc index 690841aff..5abd7d1a4 100644 --- a/src/PX4FirmwareUpgradeWorker.cc +++ b/src/PX4FirmwareUpgradeWorker.cc @@ -1,4 +1,4 @@ -#include +//#include #include #include "PX4FirmwareUpgradeWorker.h" diff --git a/src/PX4FirmwareUpgradeWorker.h b/src/PX4FirmwareUpgradeWorker.h index 873eadc35..c505133b2 100644 --- a/src/PX4FirmwareUpgradeWorker.h +++ b/src/PX4FirmwareUpgradeWorker.h @@ -2,7 +2,7 @@ #define PX4FIRMWAREUPGRADEWORKER_H #include -#include +//#include #include @@ -67,7 +67,7 @@ protected: private: SerialLink *link; bool insync; - QJsonDocument firmware; + //QJsonDocument firmware; }; #endif // PX4FIRMWAREUPGRADEWORKER_H diff --git a/src/apps/qupgrade/QUpgradeApp.cc b/src/apps/qupgrade/QUpgradeApp.cc index 52d68a57d..c1a13ae53 100644 --- a/src/apps/qupgrade/QUpgradeApp.cc +++ b/src/apps/qupgrade/QUpgradeApp.cc @@ -78,15 +78,15 @@ QUpgradeApp::QUpgradeApp(int &argc, char* argv[]) : QApplication(argc, argv) // Get PX4 upgrade widget and instantiate worker thread PX4FirmwareUpgradeWorker* worker = PX4FirmwareUpgradeWorker::putWorkerInThread(this); - connect(worker, SIGNAL(detectionStatusChanged(QString)), upgrader, SLOT(setDetectionStatusText(QString)), Qt::QueuedConnection); - connect(worker, SIGNAL(upgradeStatusChanged(QString)), upgrader, SLOT(setFlashStatusText(QString)), Qt::QueuedConnection); - connect(worker, SIGNAL(upgradeProgressChanged(int)), upgrader, SLOT(setFlashProgress(int)), Qt::QueuedConnection); - connect(worker, SIGNAL(validPortFound(QString)), upgrader, SLOT(setPortName(QString))); - connect(upgrader, SIGNAL(firmwareFileNameSet(QString)), worker, SLOT(loadFirmware(QString)), Qt::QueuedConnection); - connect(upgrader, SIGNAL(upgrade()), worker, SLOT(upgrade()), Qt::QueuedConnection); - connect(this, SIGNAL(lastWindowClosed()), worker, SLOT(abort()), Qt::QueuedConnection); - - worker->loadFirmware("/Users/user/src/Firmware/Images/px4io.bin"); +// connect(worker, SIGNAL(detectionStatusChanged(QString)), upgrader, SLOT(setDetectionStatusText(QString)), Qt::QueuedConnection); +// connect(worker, SIGNAL(upgradeStatusChanged(QString)), upgrader, SLOT(setFlashStatusText(QString)), Qt::QueuedConnection); +// connect(worker, SIGNAL(upgradeProgressChanged(int)), upgrader, SLOT(setFlashProgress(int)), Qt::QueuedConnection); +// connect(worker, SIGNAL(validPortFound(QString)), upgrader, SLOT(setPortName(QString))); +// connect(upgrader, SIGNAL(firmwareFileNameSet(QString)), worker, SLOT(loadFirmware(QString)), Qt::QueuedConnection); +// connect(upgrader, SIGNAL(upgrade()), worker, SLOT(upgrade()), Qt::QueuedConnection); +// connect(this, SIGNAL(lastWindowClosed()), worker, SLOT(abort()), Qt::QueuedConnection); + + worker->loadFirmware("/Users/lomeier/src/Firmware/Images/px4fmu.bin"); window->setWindowTitle(applicationName() + " " + applicationVersion()); window->show(); -- 2.22.0