rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Code Issues Releases Activity

Merge branch 'pt/wiz_autoupdate' of ssh://git.openpilot.org/OpenPilot into pt/wiz_autoupdate

Browse Source
This commit is contained in:
PT_Dreamer 2012-10-10 18:26:28 +01:00
commit ea3eb984f4
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ground/openpilotgcs/src/plugins/setupwizard/setupwizard.pro
View File

@ -3,12 +3,13 @@ TEMPLATE = lib
TARGET = SetupWizard
QT += svg
include(../../openpilotgcsplugin.pri)
include(../../plugins/coreplugin/coreplugin.pri)
include(../../openpilotgcsplugin.pri)
include(../../plugins/coreplugin/coreplugin.pri)
include(../../plugins/uavobjectutil/uavobjectutil.pri)
include(../../plugins/config/config.pri)
include(../../plugins/uploader/uploader.pri)
LIBS *= -l$$qtLibraryName(Uploader)
HEADERS += setupwizardplugin.h \
setupwizard.h \
pages/startpage.h \

5
ground/openpilotgcs/src/plugins/uploader/enums.h
View File

@ -26,11 +26,10 @@
*/
#ifndef ENUMS_H
#define ENUMS_H
#include "uploader_global.h"
namespace uploader
{
typedef UPLOADER_EXPORT enum { IAP_STATE_READY, IAP_STATE_STEP_1, IAP_STATE_STEP_2, IAP_STEP_RESET, IAP_STATE_BOOTLOADER} IAPStep;
typedef UPLOADER_EXPORT enum { WAITING_DISCONNECT, WAITING_CONNECT, JUMP_TO_BL, LOADING_FW, UPLOADING_FW, UPLOADING_DESC, BOOTING, SUCCESS, FAILURE} AutoUpdateStep;
typedef enum { IAP_STATE_READY, IAP_STATE_STEP_1, IAP_STATE_STEP_2, IAP_STEP_RESET, IAP_STATE_BOOTLOADER} IAPStep;
typedef enum { WAITING_DISCONNECT, WAITING_CONNECT, JUMP_TO_BL, LOADING_FW, UPLOADING_FW, UPLOADING_DESC, BOOTING, SUCCESS, FAILURE} AutoUpdateStep;
}
#endif // ENUMS_H

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

@ -434,7 +434,7 @@ void UploaderGadgetWidget::commonSystemBoot(bool safeboot)
}
bool UploaderGadgetWidget::autoUpdateCapable()
{
return QFile::exists(":/build/fw_coptercontrol/fw_coptercontrol.opfw");
return QDir(":/build").exists();
}
bool UploaderGadgetWidget::autoUpdate()