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

Merged in m_thread/librepilot/thread/LP-311_Fix_The_Fix (pull request #253)

Browse Source 
LP-311 Fixing the fix
This commit is contained in:
Alessio Morale 2016-07-03 16:00:01 +02:00
commit 1aed9f5723
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ground/gcs/src/plugins/config/configstabilizationwidget.cpp
View File

@ -252,6 +252,21 @@ void ConfigStabilizationWidget::refreshWidgetsValues(UAVObject *o)
ConfigTaskWidget::refreshWidgetsValues(o); ConfigTaskWidget::refreshWidgetsValues(o);
updateThrottleCurveFromObject(); updateThrottleCurveFromObject();
// Check and update basic/advanced checkboxes only if something connected
// if something not "basic": Rate value out of slider limits or different Pitch/Roll values
if (ui->lowThrottleZeroIntegral_8->isEnabled() && !realtimeUpdates->isActive()) {
if ((ui->attitudeRollResponse->value() == ui->attitudePitchResponse->value()) &&
(ui->rateRollResponse->value() == ui->ratePitchResponse->value()) &&
(ui->rateRollResponse->value() <= ui->RateResponsivenessSlider->maximum()) &&
(ui->ratePitchResponse->value() <= ui->RateResponsivenessSlider->maximum())) {
ui->basicResponsivenessCheckBox->setChecked(true);
ui->advancedResponsivenessCheckBox->setChecked(false);
} else {
ui->basicResponsivenessCheckBox->setChecked(false);
ui->advancedResponsivenessCheckBox->setChecked(true);
}
}
} }
void ConfigStabilizationWidget::updateObjectsFromWidgets() void ConfigStabilizationWidget::updateObjectsFromWidgets()

10
ground/gcs/src/plugins/config/stabilization.ui
View File

@ -997,8 +997,11 @@ margin-top: -1px;
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QCheckBox" name="basicResponsivenessCheckBox"> <widget class="QCheckBox" name="basicResponsivenessCheckBox">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When this option is selected the simplified version of the configuration view will be used. &lt;/p&gt;&lt;p&gt;This view hides some settings that are considered advanced and will make it easier for users to get a first working configuration.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text"> <property name="text">
<string>Use Basic Configuration</string> <string>Use Basic Configuration View</string>
</property> </property>
<property name="checked"> <property name="checked">
<bool>false</bool> <bool>false</bool>
@ -7873,8 +7876,11 @@ border-radius: 5;</string>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When this option is selected the advanced version of the configuration view will be used. &lt;/p&gt;&lt;p&gt;This view shows all settings that are considered advanced and will enable users to to tweak all possible settings to fine tune configuration.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text"> <property name="text">
<string>Use Advanced Configuration</string> <string>Use Advanced Configuration View</string>
</property> </property>
</widget> </widget>
</item> </item>