From 4a6c25720e47ce44b85e6b96caf2a865659567f9 Mon Sep 17 00:00:00 2001 From: m_thread Date: Fri, 10 Oct 2014 00:32:56 +0200 Subject: [PATCH] OP-1525 Fixed tab order and Uncrustified code. --- .../config/configstabilizationwidget.h | 4 +- .../src/plugins/config/stabilization.ui | 130 +++++++++--------- 2 files changed, 70 insertions(+), 64 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.h b/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.h index c63c77909..980a2fca5 100644 --- a/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.h +++ b/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.h @@ -53,9 +53,9 @@ private: QString m_stabilizationObjectsString; // 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_COUNT = 100; + static const int EXPO_CURVE_POINTS_COUNT = 100; int boardModel; int m_pidBankCount; diff --git a/ground/openpilotgcs/src/plugins/config/stabilization.ui b/ground/openpilotgcs/src/plugins/config/stabilization.ui index 0937936df..14dc71ae9 100644 --- a/ground/openpilotgcs/src/plugins/config/stabilization.ui +++ b/ground/openpilotgcs/src/plugins/config/stabilization.ui @@ -27073,13 +27073,31 @@ Useful if you have accidentally changed some settings. spinBox_2 RateYawResponsivenessSlider spinBox_5 - pushButton_12 - AttitudeResponsivenessSlider_2 pushButton_21 + AttitudeResponsivenessSlider_2 spinBox_3 + pushButton_12 + RateYawResponsivenessSlider_2 + expoSpinnerRoll + RateYawResponsivenessSlider_3 + expoSpinnerPitch + RateYawResponsivenessSlider_4 + expoSpinnerYaw + checkBox_7 + pushButton_20 + horizontalSlider_76 + spinBox_7 + PitchPSlider + spinBox_PitchRateP + horizontalSlider_78 + spinBox_12 + horizontalSlider_79 + spinBox_8 + horizontalSlider_80 spinBox_9 horizontalSlider_81 spinBox_10 + checkBox_8 pushButton_22 horizontalSlider_82 spinBox_13 @@ -27088,25 +27106,9 @@ Useful if you have accidentally changed some settings. horizontalSlider_84 spinBox_15 lowThrottleZeroIntegral_8 - checkBox_7 - checkBox_8 - pushButton_4 - RateRollKp_2 - RatePitchKp - RateYawKp - RateRollKi_2 - RatePitchKi - RateYawKi - RollRateKd - PitchRateKd - YawRateKd - pushButton_2 - AttitudeRollKp - AttitudePitchKp_2 - AttitudeYawKp - AttitudeRollKi - AttitudePitchKi_2 - AttitudeYawKi + realTimeUpdates_8 + scrollArea_2 + advancedResponsivenessCheckBox pushButton_3 rateRollKp_3 ratePitchKp_4 @@ -27117,70 +27119,74 @@ Useful if you have accidentally changed some settings. rateRollILimit_3 ratePitchILimit_4 rateYawILimit_3 - checkBox_3 - checkBox_2 - pushButton_5 - GyroTau - AccelKp - AccelKi - realTimeUpdates_6 - stabilizationReloadBoardData_6 - scrollArea_2 - saveStabilizationToRAM_6 - pushButton_23 - horizontalSlider_76 - spinBox_7 - PitchPSlider - pushButton_20 - spinBox_PitchRateP - horizontalSlider_78 - saveStabilizationToSD_6 - realTimeUpdates_8 - advancedResponsivenessCheckBox enableThrustPIDScalingCheckBox ThrustPIDSource ThrustPIDTarget ThrustPIDAxis defaultThrottleCurveButton + checkBox_3 + pushButton_4 + RateRollKp_2 + RatePitchKp + RateYawKp + RateRollKi_2 + RatePitchKi + RateYawKi + RollRateKd + PitchRateKd + YawRateKd + checkBox_2 + pushButton_2 + AttitudeRollKp + AttitudePitchKp_2 + AttitudeYawKp + AttitudeRollKi + AttitudePitchKi_2 + AttitudeYawKi + enableThrustPIDScalingCheckBox_2 + pushButton_13 realTimeUpdates_12 scrollArea_3 pushButton_9 - WeakLevelingRate WeakLevelingKp + WeakLevelingRate pushButton_6 MaAxisLock MaxAxisLockRate pushButton_10 RattitudeModeTransition - doubleSpinBox_4 - doubleSpinBox_5 - comboBox - doubleSpinBox_3 - doubleSpinBox - comboBox_2 - doubleSpinBox_2 - doubleSpinBox_7 pushButton_11 + doubleSpinBox + doubleSpinBox_3 + doubleSpinBox_4 + comboBox + doubleSpinBox_7 + doubleSpinBox_2 + doubleSpinBox_5 + comboBox_2 + pushButton_5 + GyroTau + AccelKp + AccelKi + realTimeUpdates_6 scrollArea_4 pushButton_7 AltKpSlider - AltKiSlider - AltKdSlider AltKp + AltKiSlider AltKi + AltKdSlider AltKd - AltThrRateSlider_2 - AltThrExp_2 - AltThrRate_2 - AltThrExpSlider_2 pushButton_8 + AltThrExpSlider_2 + AltThrExp_2 + AltThrRateSlider_2 + AltThrRate_2 realTimeUpdates_7 - horizontalSlider_80 - horizontalSlider_79 - spinBox_8 - spinBox_12 - expoSpinnerRoll - RateYawResponsivenessSlider_2 + pushButton_23 + stabilizationReloadBoardData_6 + saveStabilizationToRAM_6 + saveStabilizationToSD_6