diff --git a/ground/openpilotgcs/src/plugins/config/airframe.ui b/ground/openpilotgcs/src/plugins/config/airframe.ui index 99a56ce09..e6a970165 100644 --- a/ground/openpilotgcs/src/plugins/config/airframe.ui +++ b/ground/openpilotgcs/src/plugins/config/airframe.ui @@ -73,7 +73,7 @@ - 0 + 1 @@ -464,203 +464,214 @@ - + - + - - - Frame type: - - - - - - - Select the Multirotor frame type here. - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - + - - - - 75 - true - - - - Mix Level - - + + + + + Frame type: + + + + + + + Select the Multirotor frame type here. + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + - + - + - - - 100 + + + + 75 + true + - - Qt::AlignCenter + + Mix Level - - - Weight of Roll mixing in percent. + + + + + + + 100 + + + Qt::AlignCenter + + + + + + + Weight of Roll mixing in percent. Typical values are 100% for + configuration and 50% for X configuration on quads. - - - 100 - - - 100 - - - Qt::Vertical - - - - - - - R - - - Qt::AlignCenter - - - - - - - - - - - 100 - - - Qt::AlignCenter - - - - - - - Weight of Pitch mixing in percent. + + + 100 + + + 100 + + + Qt::Vertical + + + + + + + R + + + Qt::AlignCenter + + + + + + + + + + + 100 + + + Qt::AlignCenter + + + + + + + Weight of Pitch mixing in percent. Typical values are 100% for + configuration and 50% for X configuration on quads. - - - 100 - - - 100 - - - Qt::Vertical - - - - - - - P - - - Qt::AlignCenter - - - - - - - - - - - 50 - - - Qt::AlignCenter - - - - - - - Weight of Yaw mixing in percent. + + + 100 + + + 100 + + + Qt::Vertical + + + + + + + P + + + Qt::AlignCenter + + + + + + + + + + + 50 + + + Qt::AlignCenter + + + + + + + Weight of Yaw mixing in percent. Typical value is 50% for + or X configuration on quads. - - - -100 - - - 100 - - - 50 - - - Qt::Vertical - - - - - - - false - - - Y - - - Qt::AlignCenter - - + + + 0 + + + 100 + + + 50 + + + Qt::Vertical + + + + + + + false + + + Y + + + Qt::AlignCenter + + + + + + + + + + + 0 + 0 + + + + + 110 + 110 + + + + - - - - Qt::Horizontal - - - - 40 - 20 - - - - @@ -718,10 +729,11 @@ Typical value is 50% for + or X configuration on quads. - 110 - 110 + 120 + 120 + @@ -736,13 +748,23 @@ Typical value is 50% for + or X configuration on quads. - + + + 10 + - Tricopter Yaw Ch + Tricopter Yaw + + + + + + + channel: @@ -783,7 +805,7 @@ Typical value is 50% for + or X configuration on quads. - Motors + Motor output channels: @@ -969,22 +991,6 @@ p, li { white-space: pre-wrap; } - - - - - 0 - 0 - - - - - 110 - 110 - - - - @@ -2223,8 +2229,120 @@ p, li { white-space: pre-wrap; } 214 - 118 - 215 + 127 + 214 + + + + + mrRollMixLevel + valueChanged(int) + label_43 + setNum(int) + + + 42 + 220 + + + 43 + 171 + + + + + mrPitchMixLevel + valueChanged(int) + label_44 + setNum(int) + + + 83 + 228 + + + 82 + 168 + + + + + mrYawMixLevel + valueChanged(int) + label_45 + setNum(int) + + + 120 + 254 + + + 121 + 172 + + + + + elevonSlider1 + valueChanged(int) + label_18 + setNum(int) + + + 236 + 253 + + + 226 + 310 + + + + + elevonSlider2 + valueChanged(int) + label_25 + setNum(int) + + + 306 + 273 + + + 301 + 315 + + + + + customFFSlider + valueChanged(int) + customFeedForwardValue + setNum(int) + + + 651 + 112 + + + 600 + 112 + + + + + customFFMaxAccel + valueChanged(int) + label_OSD + setNum(int) + + + 659 + 211 + + + 581 + 218 diff --git a/ground/openpilotgcs/src/plugins/coreplugin/coreconstants.h b/ground/openpilotgcs/src/plugins/coreplugin/coreconstants.h index 39aa1f991..b282d3afa 100644 --- a/ground/openpilotgcs/src/plugins/coreplugin/coreconstants.h +++ b/ground/openpilotgcs/src/plugins/coreplugin/coreconstants.h @@ -35,6 +35,8 @@ namespace Constants { #define GCS_VERSION_MAJOR 1 #define GCS_VERSION_MINOR 0 #define GCS_VERSION_RELEASE 0 +const char * const GCS_VERSION_TYPE = "Beta"; +const char * const GCS_VERSION_CODENAME = "Pascal"; #define STRINGIFY_INTERNAL(x) #x #define STRINGIFY(x) STRINGIFY_INTERNAL(x) diff --git a/ground/openpilotgcs/src/plugins/coreplugin/mainwindow.cpp b/ground/openpilotgcs/src/plugins/coreplugin/mainwindow.cpp index 1065db08a..3a1fc324e 100644 --- a/ground/openpilotgcs/src/plugins/coreplugin/mainwindow.cpp +++ b/ground/openpilotgcs/src/plugins/coreplugin/mainwindow.cpp @@ -289,7 +289,7 @@ void MainWindow::extensionsInitialized() if ( ! qs->allKeys().count() ){ QMessageBox msgBox; msgBox.setText(tr("No configuration file could be found.")); - msgBox.setInformativeText(tr("Do you want to load an example configuration?")); + msgBox.setInformativeText(tr("Do you want to load the default configuration?")); msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No); msgBox.setDefaultButton(QMessageBox::Yes); if ( msgBox.exec() == QMessageBox::Yes ){ diff --git a/ground/openpilotgcs/src/plugins/coreplugin/versiondialog.cpp b/ground/openpilotgcs/src/plugins/coreplugin/versiondialog.cpp index dfd489eb5..cd4200765 100644 --- a/ground/openpilotgcs/src/plugins/coreplugin/versiondialog.cpp +++ b/ground/openpilotgcs/src/plugins/coreplugin/versiondialog.cpp @@ -69,7 +69,7 @@ VersionDialog::VersionDialog(QWidget *parent) #endif const QString description = tr( - "

OpenPilot GCS %1

" + "

OpenPilot GCS %1 %9 (%10)

" "Based on Qt %2 (%3 bit)
" "
" "Built on %4 at %5
" @@ -87,7 +87,7 @@ VersionDialog::VersionDialog(QWidget *parent) "PARTICULAR PURPOSE.
") .arg(version, QLatin1String(QT_VERSION_STR), QString::number(QSysInfo::WordSize), QLatin1String(__DATE__), QLatin1String(__TIME__), QLatin1String(GCS_YEAR), - (QLatin1String(GCS_AUTHOR)), ideRev); + (QLatin1String(GCS_AUTHOR)), ideRev).arg(QLatin1String(GCS_VERSION_TYPE), QLatin1String(GCS_VERSION_CODENAME)); QLabel *copyRightLabel = new QLabel(description); copyRightLabel->setWordWrap(true); diff --git a/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp b/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp index 30868af9f..dcbbb8fbd 100755 --- a/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp +++ b/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp @@ -441,6 +441,7 @@ void UploaderGadgetWidget::systemRescue() } rescueStep = RESCUE_POWER1; log("Connect Power in 2 second..."); + log("(not required on CopterControl)"); QTimer::singleShot(1000, this, SLOT(systemRescue())); break; case RESCUE_POWER1: