1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-16 08:29:15 +01:00

Compile fix.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2890 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
edouard 2011-02-26 13:53:50 +00:00 committed by edouard
parent 770c623f34
commit 4d76926561
2 changed files with 98 additions and 92 deletions

View File

@ -36,6 +36,9 @@
#include "uavobjects/uavobjectmanager.h" #include "uavobjects/uavobjectmanager.h"
#include "uavobjects/uavobject.h" #include "uavobjects/uavobject.h"
#include "coreplugin/icore.h"
#include "coreplugin/connectionmanager.h"
#include "rawhid/rawhidplugin.h" #include "rawhid/rawhidplugin.h"
#include <QtGui/QWidget> #include <QtGui/QWidget>

View File

@ -1,92 +1,95 @@
/** /**
****************************************************************************** ******************************************************************************
* *
* @file uploadergadgetwidget.h * @file uploadergadgetwidget.h
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. * @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @addtogroup GCSPlugins GCS Plugins * @addtogroup GCSPlugins GCS Plugins
* @{ * @{
* @addtogroup YModemUploader YModem Serial Uploader Plugin * @addtogroup YModemUploader YModem Serial Uploader Plugin
* @{ * @{
* @brief The YModem protocol serial uploader plugin * @brief The YModem protocol serial uploader plugin
*****************************************************************************/ *****************************************************************************/
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, but * This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details. * for more details.
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef UPLOADERGADGETWIDGET_H #ifndef UPLOADERGADGETWIDGET_H
#define UPLOADERGADGETWIDGET_H #define UPLOADERGADGETWIDGET_H
#include "ui_uploader.h" #include "ui_uploader.h"
#include "delay.h" #include "delay.h"
#include "devicewidget.h" #include "devicewidget.h"
#include "op_dfu.h" #include "op_dfu.h"
#include <qextserialport.h> #include <qextserialport.h>
#include <qextserialenumerator.h> #include <qextserialenumerator.h>
#include "uavtalk/telemetrymanager.h" #include "uavtalk/telemetrymanager.h"
#include "extensionsystem/pluginmanager.h" #include "extensionsystem/pluginmanager.h"
#include "uavobjectmanager.h" #include "uavobjectmanager.h"
#include "uavobject.h" #include "uavobject.h"
#include "rawhid/rawhidplugin.h" #include "coreplugin/icore.h"
#include <QtGui/QWidget> #include "coreplugin/connectionmanager.h"
#include <QLabel>
#include <QLineEdit> #include "rawhid/rawhidplugin.h"
#include <QThread> #include <QtGui/QWidget>
#include <QMessageBox> #include <QLabel>
#include <QTimer> #include <QLineEdit>
#include <QThread>
#include <QMessageBox>
using namespace OP_DFU; #include <QTimer>
class UploaderGadgetWidget : public QWidget
{ using namespace OP_DFU;
Q_OBJECT
class UploaderGadgetWidget : public QWidget
public: {
UploaderGadgetWidget(QWidget *parent = 0); Q_OBJECT
~UploaderGadgetWidget();
typedef enum { IAP_STATE_READY, IAP_STATE_STEP_1, IAP_STATE_STEP_2, IAP_STEP_RESET, IAP_STATE_BOOTLOADER} IAPStep; public:
typedef enum { RESCUE_STEP0, RESCUE_STEP1, RESCUE_STEP2, RESCUE_STEP3, RESCUE_POWER1, RESCUE_POWER2, RESCUE_DETECT } RescueStep; UploaderGadgetWidget(QWidget *parent = 0);
void log(QString str); ~UploaderGadgetWidget();
typedef enum { IAP_STATE_READY, IAP_STATE_STEP_1, IAP_STATE_STEP_2, IAP_STEP_RESET, IAP_STATE_BOOTLOADER} IAPStep;
public slots: typedef enum { RESCUE_STEP0, RESCUE_STEP1, RESCUE_STEP2, RESCUE_STEP3, RESCUE_POWER1, RESCUE_POWER2, RESCUE_DETECT } RescueStep;
void onAutopilotConnect(); void log(QString str);
void onAutopilotDisconnect();
public slots:
private: void onAutopilotConnect();
Ui_UploaderWidget *m_config; void onAutopilotDisconnect();
DFUObject *dfu;
IAPStep currentStep; private:
RescueStep rescueStep; Ui_UploaderWidget *m_config;
bool resetOnly; DFUObject *dfu;
void clearLog(); IAPStep currentStep;
QString getPortDevice(const QString &friendName); RescueStep rescueStep;
bool resetOnly;
QLineEdit* openFileNameLE; void clearLog();
QString getPortDevice(const QString &friendName);
private slots:
void error(QString errorString,int errorNumber); QLineEdit* openFileNameLE;
void info(QString infoString,int infoNumber);
void goToBootloader(UAVObject* = NULL, bool = false); private slots:
void systemReset(); void error(QString errorString,int errorNumber);
void systemBoot(); void info(QString infoString,int infoNumber);
void systemRescue(); void goToBootloader(UAVObject* = NULL, bool = false);
void getSerialPorts(); void systemReset();
void systemBoot();
}; void systemRescue();
void getSerialPorts();
#endif // UPLOADERGADGETWIDGET_H
};
#endif // UPLOADERGADGETWIDGET_H