rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-15 07:29:15 +01:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
David Ankers 2012-10-16 11:28:18 +11:00
commit 39f24a0764
4 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.cpp
View File

@ -300,16 +300,21 @@ bool OutputCalibrationPage::checkAlarms()
SystemAlarms::DataFields data = systemAlarms->getData();
if(data.Alarm[SystemAlarms::ALARM_ACTUATOR] != SystemAlarms::ALARM_OK) {
QMessageBox mbox;
QMessageBox mbox(this);
mbox.setText(QString(tr("The actuator module is in an error state.\n\n"
"This error can be caused by not having the board correctly connected or\n"
"if the board is not sufficiently powered by an external power source like\n"
"a battery. To use only USB as power source is not enough when the USB can't\n"
"power external components like ESCs and servos.\n\n"
"Please fix the error before continuing calibration.")));
"Please make sure the correct firmware version is used then "
"restart the wizard and try again. If the problem persists please "
"consult the openpilot.org support forum.")));
mbox.setStandardButtons(QMessageBox::Ok);
mbox.setIcon(QMessageBox::Critical);
getWizard()->setWindowFlags(getWizard()->windowFlags() & ~Qt::WindowStaysOnTopHint);
mbox.exec();
getWizard()->setWindowFlags(getWizard()->windowFlags() | Qt::WindowStaysOnTopHint);
getWizard()->setWindowIcon(qApp->windowIcon());
getWizard()->show();
return false;
}
return true;

6
ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp
View File

@ -158,7 +158,7 @@ bool deviceWidget::populateBoardStructuredDescription(QByteArray desc)
{
myDevice->lblGitTag->setText(onBoardDescription.gitHash);
myDevice->lblBuildDate->setText(onBoardDescription.gitDate.insert(4,"-").insert(7,"-"));
if(onBoardDescription.gitTag.startsWith("release",Qt::CaseInsensitive))
if (onBoardDescription.gitTag.compare("master") == 0)
{
myDevice->lblDescription->setText(QString("Firmware tag: ")+onBoardDescription.gitTag);
QPixmap pix = QPixmap(QString(":uploader/images/application-certificate.svg"));
@ -188,7 +188,7 @@ bool deviceWidget::populateLoadedStructuredDescription(QByteArray desc)
{
myDevice->lblGitTagL->setText(LoadedDescription.gitHash);
myDevice->lblBuildDateL->setText( LoadedDescription.gitDate.insert(4,"-").insert(7,"-"));
if(LoadedDescription.gitTag.startsWith("release",Qt::CaseInsensitive))
if (LoadedDescription.gitTag.compare("master") == 0)
{
myDevice->lblDescritpionL->setText(LoadedDescription.gitTag);
myDevice->description->setText(LoadedDescription.gitTag);
@ -302,7 +302,7 @@ void deviceWidget::loadFirmware()
myDevice->statusLabel->setText(tr("The board has newer firmware than loaded. Are you sure you want to update?"));
px.load(QString(":/uploader/images/warning.svg"));
}
else if(!LoadedDescription.gitTag.startsWith("release",Qt::CaseInsensitive))
else if (LoadedDescription.gitTag.compare("master"))
{
myDevice->statusLabel->setText(tr("The loaded firmware is untagged or custom build. Update only if it was received from a trusted source (official website or your own build)"));
px.load(QString(":/uploader/images/warning.svg"));

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

@ -103,7 +103,7 @@ void runningDeviceWidget::populate()
deviceDescriptorStruct devDesc;
if(UAVObjectUtilManager::descriptionToStructure(description,devDesc))
{
if(devDesc.gitTag.startsWith("release",Qt::CaseInsensitive))
if (devDesc.gitTag.compare("master") == 0)
{
myDevice->lblFWTag->setText(QString("Firmware tag: ")+devDesc.gitTag);
QPixmap pix = QPixmap(QString(":uploader/images/application-certificate.svg"));

9
package/winx86/openpilotgcs.nsi
View File

@ -325,6 +325,7 @@ Section "un.OpenPilot GCS" UnSecProgram
DeleteRegKey HKCU "Software\OpenPilot"
; Remove shortcuts, if any
SetShellVarContext all
Delete /rebootok "$DESKTOP\OpenPilot GCS.lnk"
Delete /rebootok "$SMPROGRAMS\OpenPilot\*"
RMDir /rebootok "$SMPROGRAMS\OpenPilot"
@ -332,17 +333,21 @@ SectionEnd
Section "un.Maps cache" UnSecCache
; Remove maps cache
SetShellVarContext current
RMDir /r /rebootok "$APPDATA\OpenPilot\mapscache"
SectionEnd
Section /o "un.Configuration" UnSecConfig
; Remove configuration
Delete /rebootok "$APPDATA\OpenPilot\OpenPilotGCS.db"
Delete /rebootok "$APPDATA\OpenPilot\OpenPilotGCS.xml"
SetShellVarContext current
Delete /rebootok "$APPDATA\OpenPilot\OpenPilotGCS*.db"
Delete /rebootok "$APPDATA\OpenPilot\OpenPilotGCS*.xml"
Delete /rebootok "$APPDATA\OpenPilot\OpenPilotGCS*.ini"
SectionEnd
Section "-un.Profile" UnSecProfile
; Remove OpenPilot user profile subdirectory if empty
SetShellVarContext current
RMDir "$APPDATA\OpenPilot"
SectionEnd