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

Fix the don't show this again option

Browse Source
This commit is contained in:
zedamota 2011-11-19 18:47:41 +00:00
parent e2c4b2f978
commit 1632d354a1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,6 @@
#include "uploadergadgetwidget.h" #include "uploadergadgetwidget.h"
#include "../../../../../build/ground/openpilotgcs/gcsversioninfo.h" #include "../../../../../build/ground/openpilotgcs/gcsversioninfo.h"
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <QErrorMessage>
#include <QDebug> #include <QDebug>
#define DFU_DEBUG true #define DFU_DEBUG true
@ -41,7 +40,7 @@ UploaderGadgetWidget::UploaderGadgetWidget(QWidget *parent) : QWidget(parent)
dfu = NULL; dfu = NULL;
m_timer = 0; m_timer = 0;
m_progress = 0; m_progress = 0;
msg=new QErrorMessage(this);
// Listen to autopilot connection events // Listen to autopilot connection events
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance(); ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
TelemetryManager* telMngr = pm->getObject<TelemetryManager>(); TelemetryManager* telMngr = pm->getObject<TelemetryManager>();
@ -624,7 +623,6 @@ void UploaderGadgetWidget::versionMatchCheck()
qDebug()<<QDate::fromString(boardDescription.buildDate.mid(0,8),"yyyyMMdd"); qDebug()<<QDate::fromString(boardDescription.buildDate.mid(0,8),"yyyyMMdd");
qDebug()<<QDate::fromString(gcsDescription.mid(gcsDescription.indexOf(" ")+1,8),"yyyyMMdd"); qDebug()<<QDate::fromString(gcsDescription.mid(gcsDescription.indexOf(" ")+1,8),"yyyyMMdd");
qDebug()<<QDate::fromString(boardDescription.buildDate.mid(0,8),"yyyyMMdd").daysTo(QDate::fromString(gcsDescription.mid(gcsDescription.indexOf(" ")+1,8),"yyyyMMdd")); qDebug()<<QDate::fromString(boardDescription.buildDate.mid(0,8),"yyyyMMdd").daysTo(QDate::fromString(gcsDescription.mid(gcsDescription.indexOf(" ")+1,8),"yyyyMMdd"));
QErrorMessage * msg=new QErrorMessage(this);
if(QDate::fromString(boardDescription.buildDate.mid(0,8),"yyyyMMdd").daysTo(QDate::fromString(gcsDescription.mid(gcsDescription.indexOf(" ")+1,8),"yyyyMMdd"))>0) if(QDate::fromString(boardDescription.buildDate.mid(0,8),"yyyyMMdd").daysTo(QDate::fromString(gcsDescription.mid(gcsDescription.indexOf(" ")+1,8),"yyyyMMdd"))>0)
msg->showMessage(QString("Incompatible GCS and FW detected, you should upgrade your board's Firmware to %1 version.").arg(gcsDescription)); msg->showMessage(QString("Incompatible GCS and FW detected, you should upgrade your board's Firmware to %1 version.").arg(gcsDescription));
else else

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

@ -54,6 +54,7 @@
#include <QTimer> #include <QTimer>
#include "devicedescriptorstruct.h" #include "devicedescriptorstruct.h"
#include <QProgressDialog> #include <QProgressDialog>
#include <QErrorMessage>
using namespace OP_DFU; using namespace OP_DFU;
@ -84,6 +85,7 @@ private:
QTimer* m_timer; QTimer* m_timer;
QLineEdit* openFileNameLE; QLineEdit* openFileNameLE;
QEventLoop m_eventloop; QEventLoop m_eventloop;
QErrorMessage * msg;
private slots: private slots:
void onPhisicalHWConnect(); void onPhisicalHWConnect();
void versionMatchCheck(); void versionMatchCheck();