mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-02-18 08:54:15 +01:00
OP-1525 Added curve and slider for StickExpo.
Added Piro comp setting.
This commit is contained in:
parent
53cd70981b
commit
3727de5de4
@ -7,3 +7,4 @@ include(../../plugins/uavobjectutil/uavobjectutil.pri)
|
|||||||
include(../../plugins/uavsettingsimportexport/uavsettingsimportexport.pri)
|
include(../../plugins/uavsettingsimportexport/uavsettingsimportexport.pri)
|
||||||
include(../../plugins/uavobjectwidgetutils/uavobjectwidgetutils.pri)
|
include(../../plugins/uavobjectwidgetutils/uavobjectwidgetutils.pri)
|
||||||
include(../../libs/version_info/version_info.pri)
|
include(../../libs/version_info/version_info.pri)
|
||||||
|
include(../../libs/qwt/qwt.pri)
|
||||||
|
@ -45,7 +45,7 @@
|
|||||||
|
|
||||||
#include "qwt/src/qwt.h"
|
#include "qwt/src/qwt.h"
|
||||||
#include "qwt/src/qwt_plot.h"
|
#include "qwt/src/qwt_plot.h"
|
||||||
#include "qwt/src/qwt_plot_curve.h"
|
#include "qwt/src/qwt_plot_canvas.h"
|
||||||
|
|
||||||
ConfigStabilizationWidget::ConfigStabilizationWidget(QWidget *parent) : ConfigTaskWidget(parent),
|
ConfigStabilizationWidget::ConfigStabilizationWidget(QWidget *parent) : ConfigTaskWidget(parent),
|
||||||
boardModel(0), m_pidBankCount(0), m_currentPIDBank(0)
|
boardModel(0), m_pidBankCount(0), m_currentPIDBank(0)
|
||||||
@ -53,6 +53,8 @@ ConfigStabilizationWidget::ConfigStabilizationWidget(QWidget *parent) : ConfigTa
|
|||||||
ui = new Ui_StabilizationWidget();
|
ui = new Ui_StabilizationWidget();
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
||||||
|
setupExpoPlot();
|
||||||
|
|
||||||
StabilizationSettings *stabSettings = qobject_cast<StabilizationSettings *>(getObject("StabilizationSettings"));
|
StabilizationSettings *stabSettings = qobject_cast<StabilizationSettings *>(getObject("StabilizationSettings"));
|
||||||
Q_ASSERT(stabSettings);
|
Q_ASSERT(stabSettings);
|
||||||
|
|
||||||
@ -148,6 +150,8 @@ ConfigStabilizationWidget::ConfigStabilizationWidget(QWidget *parent) : ConfigTa
|
|||||||
|
|
||||||
connect(this, SIGNAL(autoPilotConnected()), this, SLOT(onBoardConnected()));
|
connect(this, SIGNAL(autoPilotConnected()), this, SLOT(onBoardConnected()));
|
||||||
|
|
||||||
|
connect(ui->expoSpinner, SIGNAL(valueChanged(int)), this, SLOT(replotExpo(int)));
|
||||||
|
|
||||||
disableMouseWheelEvents();
|
disableMouseWheelEvents();
|
||||||
updateEnableControls();
|
updateEnableControls();
|
||||||
}
|
}
|
||||||
@ -222,6 +226,25 @@ void ConfigStabilizationWidget::updateObjectFromThrottleCurve()
|
|||||||
field->setValue(ui->enableThrustPIDScalingCheckBox->isChecked() ? "TRUE" : "FALSE");
|
field->setValue(ui->enableThrustPIDScalingCheckBox->isChecked() ? "TRUE" : "FALSE");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ConfigStabilizationWidget::setupExpoPlot()
|
||||||
|
{
|
||||||
|
ui->expoPlot->setMouseTracking(false);
|
||||||
|
ui->expoPlot->setAxisScale(QwtPlot::xBottom, 0.0, 1.0, 0.25);
|
||||||
|
ui->expoPlot->setAxisScale(QwtPlot::yLeft, 0.0, 1.0, 0.25);
|
||||||
|
ui->expoPlot->canvas()->setFrameShape(QFrame::NoFrame);
|
||||||
|
|
||||||
|
m_expoPlotCurve.setRenderHint(QwtPlotCurve::RenderAntialiased);
|
||||||
|
m_expoPlotCurve.attach(ui->expoPlot);
|
||||||
|
|
||||||
|
m_plotGrid.setMajPen(QColor(Qt::gray));
|
||||||
|
m_plotGrid.setMinPen(QColor(Qt::lightGray));
|
||||||
|
m_plotGrid.enableXMin(false);
|
||||||
|
m_plotGrid.enableYMin(false);
|
||||||
|
m_plotGrid.attach(ui->expoPlot);
|
||||||
|
|
||||||
|
replotExpo(ui->expoSpinner->value());
|
||||||
|
}
|
||||||
|
|
||||||
void ConfigStabilizationWidget::resetThrottleCurveToDefault()
|
void ConfigStabilizationWidget::resetThrottleCurveToDefault()
|
||||||
{
|
{
|
||||||
UAVDataObject *defaultStabBank = (UAVDataObject *)getObjectManager()->getObject(QString(m_pidTabBars.at(0)->tabData(m_currentPIDBank).toString()));
|
UAVDataObject *defaultStabBank = (UAVDataObject *)getObjectManager()->getObject(QString(m_pidTabBars.at(0)->tabData(m_currentPIDBank).toString()));
|
||||||
@ -254,6 +277,25 @@ void ConfigStabilizationWidget::throttleCurveUpdated()
|
|||||||
setDirty(true);
|
setDirty(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ConfigStabilizationWidget::replotExpo(int value)
|
||||||
|
{
|
||||||
|
double x[EXPO_CURVE_POINTS] = {0};
|
||||||
|
double y[EXPO_CURVE_POINTS] = {0};
|
||||||
|
double factor = pow(1.03293, value);
|
||||||
|
double step = 1.0 / (EXPO_CURVE_POINTS - 1);
|
||||||
|
for (int i = 0; i < EXPO_CURVE_POINTS; i++) {
|
||||||
|
x[i] = i * step;
|
||||||
|
y[i] = pow(x[i], factor);
|
||||||
|
qDebug() << "x=" << x[i] << ",y=" << y[i];
|
||||||
|
}
|
||||||
|
m_expoPlotCurve.setSamples(x, y, EXPO_CURVE_POINTS);
|
||||||
|
int hue = 255 - ((value + 100) / 200.0 * 255);
|
||||||
|
qDebug() << "hue" << hue;
|
||||||
|
m_expoPlotCurve.setPen(QPen(QColor::fromHsl(hue, 200, 128), 3));
|
||||||
|
m_expoPlotCurve.show();
|
||||||
|
ui->expoPlot->replot();
|
||||||
|
}
|
||||||
|
|
||||||
void ConfigStabilizationWidget::realtimeUpdatesSlot(bool value)
|
void ConfigStabilizationWidget::realtimeUpdatesSlot(bool value)
|
||||||
{
|
{
|
||||||
ui->realTimeUpdates_6->setChecked(value);
|
ui->realTimeUpdates_6->setChecked(value);
|
||||||
|
@ -35,7 +35,8 @@
|
|||||||
#include "stabilizationsettings.h"
|
#include "stabilizationsettings.h"
|
||||||
#include <QWidget>
|
#include <QWidget>
|
||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
|
#include "qwt/src/qwt_plot_curve.h"
|
||||||
|
#include "qwt/src/qwt_plot_grid.h"
|
||||||
|
|
||||||
class ConfigStabilizationWidget : public ConfigTaskWidget {
|
class ConfigStabilizationWidget : public ConfigTaskWidget {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
@ -54,12 +55,18 @@ private:
|
|||||||
// Milliseconds between automatic 'Instant Updates'
|
// Milliseconds between automatic 'Instant Updates'
|
||||||
static const int AUTOMATIC_UPDATE_RATE = 500;
|
static const int AUTOMATIC_UPDATE_RATE = 500;
|
||||||
|
|
||||||
|
static const int EXPO_CURVE_POINTS = 100;
|
||||||
|
|
||||||
int boardModel;
|
int boardModel;
|
||||||
int m_pidBankCount;
|
int m_pidBankCount;
|
||||||
int m_currentPIDBank;
|
int m_currentPIDBank;
|
||||||
|
|
||||||
|
QwtPlotCurve m_expoPlotCurve;
|
||||||
|
QwtPlotGrid m_plotGrid;
|
||||||
|
|
||||||
void updateThrottleCurveFromObject();
|
void updateThrottleCurveFromObject();
|
||||||
void updateObjectFromThrottleCurve();
|
void updateObjectFromThrottleCurve();
|
||||||
|
void setupExpoPlot();
|
||||||
protected:
|
protected:
|
||||||
QString mapObjectName(const QString objectName);
|
QString mapObjectName(const QString objectName);
|
||||||
|
|
||||||
@ -75,5 +82,6 @@ private slots:
|
|||||||
void pidBankChanged(int index);
|
void pidBankChanged(int index);
|
||||||
void resetThrottleCurveToDefault();
|
void resetThrottleCurveToDefault();
|
||||||
void throttleCurveUpdated();
|
void throttleCurveUpdated();
|
||||||
|
void replotExpo(int value);
|
||||||
};
|
};
|
||||||
#endif // ConfigStabilizationWidget_H
|
#endif // ConfigStabilizationWidget_H
|
||||||
|
@ -6,8 +6,8 @@
|
|||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>981</width>
|
<width>1040</width>
|
||||||
<height>843</height>
|
<height>865</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
@ -95,7 +95,7 @@
|
|||||||
<enum>QTabWidget::Rounded</enum>
|
<enum>QTabWidget::Rounded</enum>
|
||||||
</property>
|
</property>
|
||||||
<property name="currentIndex">
|
<property name="currentIndex">
|
||||||
<number>1</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<property name="documentMode">
|
<property name="documentMode">
|
||||||
<bool>false</bool>
|
<bool>false</bool>
|
||||||
@ -136,8 +136,8 @@
|
|||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>959</width>
|
<width>1018</width>
|
||||||
<height>757</height>
|
<height>779</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_3">
|
<layout class="QVBoxLayout" name="verticalLayout_3">
|
||||||
@ -166,7 +166,37 @@ margin-top: -1px;
|
|||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_6">
|
<layout class="QVBoxLayout" name="verticalLayout_6">
|
||||||
<item>
|
<item>
|
||||||
|
<widget class="QFrame" name="horizontalFrame_2">
|
||||||
|
<property name="minimumSize">
|
||||||
|
<size>
|
||||||
|
<width>0</width>
|
||||||
|
<height>295</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="maximumSize">
|
||||||
|
<size>
|
||||||
|
<width>16777215</width>
|
||||||
|
<height>295</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<layout class="QGridLayout" name="gridLayout_31">
|
||||||
|
<property name="topMargin">
|
||||||
|
<number>1</number>
|
||||||
|
</property>
|
||||||
|
<item row="0" column="0">
|
||||||
<widget class="QGroupBox" name="basicResponsivenessGroupBox">
|
<widget class="QGroupBox" name="basicResponsivenessGroupBox">
|
||||||
|
<property name="minimumSize">
|
||||||
|
<size>
|
||||||
|
<width>550</width>
|
||||||
|
<height>0</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="maximumSize">
|
||||||
|
<size>
|
||||||
|
<width>16777215</width>
|
||||||
|
<height>16777215</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
<property name="styleSheet">
|
<property name="styleSheet">
|
||||||
<string notr="true"/>
|
<string notr="true"/>
|
||||||
</property>
|
</property>
|
||||||
@ -182,7 +212,7 @@ margin-top: -1px;
|
|||||||
<property name="checkable">
|
<property name="checkable">
|
||||||
<bool>false</bool>
|
<bool>false</bool>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QGridLayout" name="gridLayout_7" rowstretch="0,0,0">
|
<layout class="QGridLayout" name="gridLayout_7" rowstretch="0,0,0,0">
|
||||||
<property name="leftMargin">
|
<property name="leftMargin">
|
||||||
<number>9</number>
|
<number>9</number>
|
||||||
</property>
|
</property>
|
||||||
@ -240,20 +270,7 @@ margin-top: -1px;
|
|||||||
<property name="bottomMargin">
|
<property name="bottomMargin">
|
||||||
<number>0</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<item row="0" column="2">
|
<item row="2" column="1" colspan="3">
|
||||||
<spacer name="horizontalSpacer_50">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Horizontal</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeHint" stdset="0">
|
|
||||||
<size>
|
|
||||||
<width>40</width>
|
|
||||||
<height>20</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</spacer>
|
|
||||||
</item>
|
|
||||||
<item row="2" column="1" colspan="5">
|
|
||||||
<widget class="QSlider" name="RateResponsivenessSlider">
|
<widget class="QSlider" name="RateResponsivenessSlider">
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
@ -294,7 +311,7 @@ margin-top: -1px;
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="1" column="6">
|
<item row="1" column="4">
|
||||||
<widget class="QSpinBox" name="spinBox">
|
<widget class="QSpinBox" name="spinBox">
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
@ -328,7 +345,7 @@ margin-top: -1px;
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="3" column="6">
|
<item row="3" column="4">
|
||||||
<widget class="QSpinBox" name="spinBox_5">
|
<widget class="QSpinBox" name="spinBox_5">
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
@ -365,21 +382,27 @@ margin-top: -1px;
|
|||||||
</item>
|
</item>
|
||||||
<item row="1" column="0">
|
<item row="1" column="0">
|
||||||
<widget class="QLabel" name="label">
|
<widget class="QLabel" name="label">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>78</width>
|
<width>80</width>
|
||||||
<height>16</height>
|
<height>16</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Attitude mode</string>
|
<string>Attitude</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="0" column="5">
|
<item row="0" column="3">
|
||||||
<widget class="QLabel" name="label_144">
|
<widget class="QLabel" name="label_144">
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
|
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
|
||||||
@ -932,7 +955,7 @@ border-radius: 5;</string>
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="3" column="1" colspan="5">
|
<item row="3" column="1" colspan="3">
|
||||||
<widget class="QSlider" name="RateYawResponsivenessSlider">
|
<widget class="QSlider" name="RateYawResponsivenessSlider">
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
@ -973,7 +996,7 @@ border-radius: 5;</string>
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="1" column="1" colspan="5">
|
<item row="1" column="1" colspan="3">
|
||||||
<widget class="QSlider" name="AttitudeResponsivenessSlider">
|
<widget class="QSlider" name="AttitudeResponsivenessSlider">
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
@ -1016,7 +1039,7 @@ border-radius: 5;</string>
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="2" column="6">
|
<item row="2" column="4">
|
||||||
<widget class="QSpinBox" name="spinBox_2">
|
<widget class="QSpinBox" name="spinBox_2">
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
@ -1053,14 +1076,20 @@ border-radius: 5;</string>
|
|||||||
</item>
|
</item>
|
||||||
<item row="2" column="0">
|
<item row="2" column="0">
|
||||||
<widget class="QLabel" name="label_2">
|
<widget class="QLabel" name="label_2">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>78</width>
|
<width>80</width>
|
||||||
<height>16</height>
|
<height>16</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Rate mode</string>
|
<string>Rate</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||||
@ -1069,14 +1098,20 @@ border-radius: 5;</string>
|
|||||||
</item>
|
</item>
|
||||||
<item row="3" column="0">
|
<item row="3" column="0">
|
||||||
<widget class="QLabel" name="label_5">
|
<widget class="QLabel" name="label_5">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>110</width>
|
<width>80</width>
|
||||||
<height>16</height>
|
<height>16</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Rate mode yaw</string>
|
<string>Rate yaw</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||||
@ -1636,7 +1671,7 @@ border-radius: 5;</string>
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="0" column="3">
|
<item row="0" column="2">
|
||||||
<widget class="QLabel" name="label_143">
|
<widget class="QLabel" name="label_143">
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
|
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
|
||||||
@ -2189,26 +2224,13 @@ border-radius: 5;</string>
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="0" column="4">
|
|
||||||
<spacer name="horizontalSpacer_51">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Horizontal</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeHint" stdset="0">
|
|
||||||
<size>
|
|
||||||
<width>40</width>
|
|
||||||
<height>20</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</spacer>
|
|
||||||
</item>
|
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item row="1" column="0">
|
||||||
<widget class="QGroupBox" name="groupBox_9">
|
<widget class="QGroupBox" name="groupBox_9">
|
||||||
<property name="title">
|
<property name="title">
|
||||||
<string>Acro+</string>
|
<string>Acro+</string>
|
||||||
@ -2295,7 +2317,6 @@ border-radius: 5;</string>
|
|||||||
<stringlist>
|
<stringlist>
|
||||||
<string>objname:StabilizationSettingsBankX</string>
|
<string>objname:StabilizationSettingsBankX</string>
|
||||||
<string>fieldname:AcroInsanityFactor</string>
|
<string>fieldname:AcroInsanityFactor</string>
|
||||||
<string>haslimits:no</string>
|
|
||||||
<string>scale:0.01</string>
|
<string>scale:0.01</string>
|
||||||
<string>buttongroup:77</string>
|
<string>buttongroup:77</string>
|
||||||
</stringlist>
|
</stringlist>
|
||||||
@ -2329,7 +2350,6 @@ border-radius: 5;</string>
|
|||||||
<stringlist>
|
<stringlist>
|
||||||
<string>objname:StabilizationSettingsBankX</string>
|
<string>objname:StabilizationSettingsBankX</string>
|
||||||
<string>fieldname:AcroInsanityFactor</string>
|
<string>fieldname:AcroInsanityFactor</string>
|
||||||
<string>haslimits:no</string>
|
|
||||||
<string>scale:0.01</string>
|
<string>scale:0.01</string>
|
||||||
<string>buttongroup:77</string>
|
<string>buttongroup:77</string>
|
||||||
</stringlist>
|
</stringlist>
|
||||||
@ -2338,9 +2358,15 @@ border-radius: 5;</string>
|
|||||||
</item>
|
</item>
|
||||||
<item row="1" column="0">
|
<item row="1" column="0">
|
||||||
<widget class="QLabel" name="label_13">
|
<widget class="QLabel" name="label_13">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>110</width>
|
<width>80</width>
|
||||||
<height>0</height>
|
<height>0</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
@ -2357,6 +2383,149 @@ border-radius: 5;</string>
|
|||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item row="0" column="1" rowspan="2">
|
||||||
|
<widget class="QGroupBox" name="groupBox_7">
|
||||||
|
<property name="title">
|
||||||
|
<string>Expo</string>
|
||||||
|
</property>
|
||||||
|
<layout class="QGridLayout" name="gridLayout_5">
|
||||||
|
<item row="0" column="0" alignment="Qt::AlignRight">
|
||||||
|
<widget class="QPushButton" name="pushButton_12">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
|
<property name="toolTip">
|
||||||
|
<string>Reset all values to GCS defaults</string>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>Default</string>
|
||||||
|
</property>
|
||||||
|
<property name="objrelation" stdset="0">
|
||||||
|
<stringlist>
|
||||||
|
<string>objname:StabilizationSettings</string>
|
||||||
|
<string>button:default</string>
|
||||||
|
<string>buttongroup:66</string>
|
||||||
|
</stringlist>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="0">
|
||||||
|
<widget class="QFrame" name="basicResponsivenessControls_2">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
|
<layout class="QGridLayout" name="gridLayout_30">
|
||||||
|
<property name="leftMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<property name="topMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<property name="rightMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<property name="bottomMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<item row="1" column="3">
|
||||||
|
<widget class="QSpinBox" name="expoSpinner">
|
||||||
|
<property name="minimumSize">
|
||||||
|
<size>
|
||||||
|
<width>60</width>
|
||||||
|
<height>22</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="maximumSize">
|
||||||
|
<size>
|
||||||
|
<width>60</width>
|
||||||
|
<height>22</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="minimum">
|
||||||
|
<number>-100</number>
|
||||||
|
</property>
|
||||||
|
<property name="maximum">
|
||||||
|
<number>100</number>
|
||||||
|
</property>
|
||||||
|
<property name="value">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<property name="objrelation" stdset="0">
|
||||||
|
<stringlist>
|
||||||
|
<string>objname:StabilizationSettingsBankX</string>
|
||||||
|
<string>fieldname:StickExpo</string>
|
||||||
|
<string>haslimits:yes</string>
|
||||||
|
<string>scale:1</string>
|
||||||
|
<string>buttongroup:66</string>
|
||||||
|
</stringlist>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="0" colspan="4">
|
||||||
|
<widget class="QwtPlot" name="expoPlot" native="true">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="0" colspan="3">
|
||||||
|
<widget class="QSlider" name="RateYawResponsivenessSlider_2">
|
||||||
|
<property name="minimumSize">
|
||||||
|
<size>
|
||||||
|
<width>0</width>
|
||||||
|
<height>25</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="toolTip">
|
||||||
|
<string><html><head/><body><p>The Rate mode Yaw slider can be adjusted to value ranges whose responsiveness is represented by the Moderate / Snappy / Insane bar</p></body></html></string>
|
||||||
|
</property>
|
||||||
|
<property name="minimum">
|
||||||
|
<number>-100</number>
|
||||||
|
</property>
|
||||||
|
<property name="maximum">
|
||||||
|
<number>100</number>
|
||||||
|
</property>
|
||||||
|
<property name="value">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Horizontal</enum>
|
||||||
|
</property>
|
||||||
|
<property name="tickPosition">
|
||||||
|
<enum>QSlider::TicksBelow</enum>
|
||||||
|
</property>
|
||||||
|
<property name="tickInterval">
|
||||||
|
<number>20</number>
|
||||||
|
</property>
|
||||||
|
<property name="objrelation" stdset="0">
|
||||||
|
<stringlist>
|
||||||
|
<string>objname:StabilizationSettingsBankX</string>
|
||||||
|
<string>fieldname:StickExpo</string>
|
||||||
|
<string>haslimits:yes</string>
|
||||||
|
<string>scale:1</string>
|
||||||
|
<string>buttongroup:66</string>
|
||||||
|
</stringlist>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QGroupBox" name="RateStabilizationGroup_15">
|
<widget class="QGroupBox" name="RateStabilizationGroup_15">
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
@ -2374,7 +2543,7 @@ border-radius: 5;</string>
|
|||||||
<property name="maximumSize">
|
<property name="maximumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>16777215</width>
|
<width>16777215</width>
|
||||||
<height>195</height>
|
<height>160</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<property name="title">
|
<property name="title">
|
||||||
@ -5100,7 +5269,7 @@ Then lower the value by 5 or so.</string>
|
|||||||
<property name="maximumSize">
|
<property name="maximumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>16777215</width>
|
<width>16777215</width>
|
||||||
<height>195</height>
|
<height>135</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<property name="autoFillBackground">
|
<property name="autoFillBackground">
|
||||||
@ -7718,8 +7887,8 @@ border-radius: 5;</string>
|
|||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>959</width>
|
<width>1018</width>
|
||||||
<height>757</height>
|
<height>779</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_29">
|
<layout class="QVBoxLayout" name="verticalLayout_29">
|
||||||
@ -17544,6 +17713,55 @@ border-radius: 5;</string>
|
|||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QGroupBox" name="groupBox_10">
|
||||||
|
<property name="title">
|
||||||
|
<string>Piro Compensation</string>
|
||||||
|
</property>
|
||||||
|
<layout class="QGridLayout" name="gridLayout_32">
|
||||||
|
<item row="1" column="0">
|
||||||
|
<widget class="QCheckBox" name="enableThrustPIDScalingCheckBox_2">
|
||||||
|
<property name="minimumSize">
|
||||||
|
<size>
|
||||||
|
<width>0</width>
|
||||||
|
<height>27</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>Enable piro compensation</string>
|
||||||
|
</property>
|
||||||
|
<property name="objrelation" stdset="0">
|
||||||
|
<stringlist>
|
||||||
|
<string>objname:StabilizationSettingsBankX</string>
|
||||||
|
<string>fieldname:EnablePiroComp</string>
|
||||||
|
<string>buttongroup:55</string>
|
||||||
|
</stringlist>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="0" alignment="Qt::AlignRight">
|
||||||
|
<widget class="QPushButton" name="pushButton_13">
|
||||||
|
<property name="toolTip">
|
||||||
|
<string>Reset all values to GCS defaults</string>
|
||||||
|
</property>
|
||||||
|
<property name="styleSheet">
|
||||||
|
<string notr="true"/>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>Default</string>
|
||||||
|
</property>
|
||||||
|
<property name="objrelation" stdset="0">
|
||||||
|
<stringlist>
|
||||||
|
<string>objname:StabilizationSettings</string>
|
||||||
|
<string>button:default</string>
|
||||||
|
<string>buttongroup:55</string>
|
||||||
|
</stringlist>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@ -17661,8 +17879,8 @@ border-radius: 5;</string>
|
|||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>959</width>
|
<width>1018</width>
|
||||||
<height>757</height>
|
<height>779</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_8" stretch="0,0,0,0,0,0">
|
<layout class="QVBoxLayout" name="verticalLayout_8" stretch="0,0,0,0,0,0">
|
||||||
@ -23507,8 +23725,8 @@ font:bold;</string>
|
|||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>959</width>
|
<width>1018</width>
|
||||||
<height>757</height>
|
<height>779</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_18">
|
<layout class="QVBoxLayout" name="verticalLayout_18">
|
||||||
@ -26480,22 +26698,28 @@ Useful if you have accidentally changed some settings.</string>
|
|||||||
<header location="global">mixercurvewidget.h</header>
|
<header location="global">mixercurvewidget.h</header>
|
||||||
<container>1</container>
|
<container>1</container>
|
||||||
</customwidget>
|
</customwidget>
|
||||||
|
<customwidget>
|
||||||
|
<class>QwtPlot</class>
|
||||||
|
<extends>QWidget</extends>
|
||||||
|
<header>qwt/src/qwt_plot.h</header>
|
||||||
|
<container>1</container>
|
||||||
|
</customwidget>
|
||||||
</customwidgets>
|
</customwidgets>
|
||||||
<tabstops>
|
<tabstops>
|
||||||
<tabstop>stabilizationReloadBoardData_6</tabstop>
|
<tabstop>tabWidget</tabstop>
|
||||||
<tabstop>saveStabilizationToRAM_6</tabstop>
|
<tabstop>scrollArea</tabstop>
|
||||||
<tabstop>saveStabilizationToSD_6</tabstop>
|
<tabstop>basicResponsivenessCheckBox</tabstop>
|
||||||
<tabstop>pushButton_23</tabstop>
|
<tabstop>pushButton</tabstop>
|
||||||
<tabstop>pushButton_20</tabstop>
|
<tabstop>AttitudeResponsivenessSlider</tabstop>
|
||||||
<tabstop>horizontalSlider_76</tabstop>
|
<tabstop>spinBox</tabstop>
|
||||||
<tabstop>spinBox_7</tabstop>
|
<tabstop>RateResponsivenessSlider</tabstop>
|
||||||
<tabstop>PitchPSlider</tabstop>
|
<tabstop>spinBox_2</tabstop>
|
||||||
<tabstop>spinBox_PitchRateP</tabstop>
|
<tabstop>RateYawResponsivenessSlider</tabstop>
|
||||||
<tabstop>horizontalSlider_78</tabstop>
|
<tabstop>spinBox_5</tabstop>
|
||||||
<tabstop>spinBox_12</tabstop>
|
<tabstop>pushButton_12</tabstop>
|
||||||
<tabstop>horizontalSlider_79</tabstop>
|
<tabstop>AttitudeResponsivenessSlider_2</tabstop>
|
||||||
<tabstop>spinBox_8</tabstop>
|
<tabstop>pushButton_21</tabstop>
|
||||||
<tabstop>horizontalSlider_80</tabstop>
|
<tabstop>spinBox_3</tabstop>
|
||||||
<tabstop>spinBox_9</tabstop>
|
<tabstop>spinBox_9</tabstop>
|
||||||
<tabstop>horizontalSlider_81</tabstop>
|
<tabstop>horizontalSlider_81</tabstop>
|
||||||
<tabstop>spinBox_10</tabstop>
|
<tabstop>spinBox_10</tabstop>
|
||||||
@ -26543,8 +26767,63 @@ Useful if you have accidentally changed some settings.</string>
|
|||||||
<tabstop>AccelKp</tabstop>
|
<tabstop>AccelKp</tabstop>
|
||||||
<tabstop>AccelKi</tabstop>
|
<tabstop>AccelKi</tabstop>
|
||||||
<tabstop>realTimeUpdates_6</tabstop>
|
<tabstop>realTimeUpdates_6</tabstop>
|
||||||
<tabstop>tabWidget</tabstop>
|
<tabstop>stabilizationReloadBoardData_6</tabstop>
|
||||||
<tabstop>scrollArea_2</tabstop>
|
<tabstop>scrollArea_2</tabstop>
|
||||||
|
<tabstop>saveStabilizationToRAM_6</tabstop>
|
||||||
|
<tabstop>pushButton_23</tabstop>
|
||||||
|
<tabstop>horizontalSlider_76</tabstop>
|
||||||
|
<tabstop>spinBox_7</tabstop>
|
||||||
|
<tabstop>PitchPSlider</tabstop>
|
||||||
|
<tabstop>pushButton_20</tabstop>
|
||||||
|
<tabstop>spinBox_PitchRateP</tabstop>
|
||||||
|
<tabstop>horizontalSlider_78</tabstop>
|
||||||
|
<tabstop>saveStabilizationToSD_6</tabstop>
|
||||||
|
<tabstop>realTimeUpdates_8</tabstop>
|
||||||
|
<tabstop>advancedResponsivenessCheckBox</tabstop>
|
||||||
|
<tabstop>enableThrustPIDScalingCheckBox</tabstop>
|
||||||
|
<tabstop>ThrustPIDSource</tabstop>
|
||||||
|
<tabstop>ThrustPIDTarget</tabstop>
|
||||||
|
<tabstop>ThrustPIDAxis</tabstop>
|
||||||
|
<tabstop>defaultThrottleCurveButton</tabstop>
|
||||||
|
<tabstop>realTimeUpdates_12</tabstop>
|
||||||
|
<tabstop>scrollArea_3</tabstop>
|
||||||
|
<tabstop>pushButton_9</tabstop>
|
||||||
|
<tabstop>WeakLevelingRate</tabstop>
|
||||||
|
<tabstop>WeakLevelingKp</tabstop>
|
||||||
|
<tabstop>pushButton_6</tabstop>
|
||||||
|
<tabstop>MaAxisLock</tabstop>
|
||||||
|
<tabstop>MaxAxisLockRate</tabstop>
|
||||||
|
<tabstop>pushButton_10</tabstop>
|
||||||
|
<tabstop>RattitudeModeTransition</tabstop>
|
||||||
|
<tabstop>doubleSpinBox_4</tabstop>
|
||||||
|
<tabstop>doubleSpinBox_5</tabstop>
|
||||||
|
<tabstop>comboBox</tabstop>
|
||||||
|
<tabstop>doubleSpinBox_3</tabstop>
|
||||||
|
<tabstop>doubleSpinBox</tabstop>
|
||||||
|
<tabstop>comboBox_2</tabstop>
|
||||||
|
<tabstop>doubleSpinBox_2</tabstop>
|
||||||
|
<tabstop>doubleSpinBox_7</tabstop>
|
||||||
|
<tabstop>pushButton_11</tabstop>
|
||||||
|
<tabstop>scrollArea_4</tabstop>
|
||||||
|
<tabstop>pushButton_7</tabstop>
|
||||||
|
<tabstop>AltKpSlider</tabstop>
|
||||||
|
<tabstop>AltKiSlider</tabstop>
|
||||||
|
<tabstop>AltKdSlider</tabstop>
|
||||||
|
<tabstop>AltKp</tabstop>
|
||||||
|
<tabstop>AltKi</tabstop>
|
||||||
|
<tabstop>AltKd</tabstop>
|
||||||
|
<tabstop>AltThrRateSlider_2</tabstop>
|
||||||
|
<tabstop>AltThrExp_2</tabstop>
|
||||||
|
<tabstop>AltThrRate_2</tabstop>
|
||||||
|
<tabstop>AltThrExpSlider_2</tabstop>
|
||||||
|
<tabstop>pushButton_8</tabstop>
|
||||||
|
<tabstop>realTimeUpdates_7</tabstop>
|
||||||
|
<tabstop>horizontalSlider_80</tabstop>
|
||||||
|
<tabstop>horizontalSlider_79</tabstop>
|
||||||
|
<tabstop>spinBox_8</tabstop>
|
||||||
|
<tabstop>spinBox_12</tabstop>
|
||||||
|
<tabstop>expoSpinner</tabstop>
|
||||||
|
<tabstop>RateYawResponsivenessSlider_2</tabstop>
|
||||||
</tabstops>
|
</tabstops>
|
||||||
<resources>
|
<resources>
|
||||||
<include location="../coreplugin/core.qrc"/>
|
<include location="../coreplugin/core.qrc"/>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user