From 411c38aebfd9cc6acf1e84a88fa4c1d9b3d151b3 Mon Sep 17 00:00:00 2001 From: zedamota Date: Tue, 17 Apr 2012 13:54:41 +0100 Subject: [PATCH 1/8] Fixes the incompatible message when the GIT tag has a leading zero. --- .../openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp b/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp index a8238f950..31788eb57 100755 --- a/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp +++ b/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp @@ -643,8 +643,8 @@ void UploaderGadgetWidget::versionMatchCheck() QString gcsDescription = QString::fromLatin1(Core::Constants::GCS_REVISION_STR); QString gcsGitHash = gcsDescription.mid(gcsDescription.indexOf(":")+1, 8); + gcsGitHash.remove( QRegExp("^[0]*") ); QString gcsGitDate = gcsDescription.mid(gcsDescription.indexOf(" ")+1, 14); - QString gcsVersion = gcsGitDate + " (" + gcsGitHash + ")"; QString fwVersion = boardDescription.gitDate + " (" + boardDescription.gitHash + ")"; From 45e34cbae0996242d52e887804cc77c154ece59d Mon Sep 17 00:00:00 2001 From: zedamota Date: Tue, 17 Apr 2012 15:19:41 +0100 Subject: [PATCH 2/8] Force CC attitude config page refresh on board connection. --- .../openpilotgcs/src/plugins/config/configccattitudewidget.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp b/ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp index 935e6ad4a..4ffabef66 100644 --- a/ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp @@ -53,6 +53,7 @@ ConfigCCAttitudeWidget::ConfigCCAttitudeWidget(QWidget *parent) : addUAVObjectToWidgetRelation("AttitudeSettings","BoardRotation",ui->pitchBias,AttitudeSettings::BOARDROTATION_PITCH); addUAVObjectToWidgetRelation("AttitudeSettings","BoardRotation",ui->yawBias,AttitudeSettings::BOARDROTATION_YAW); addWidget(ui->zeroBias); + refreshWidgetsValues(); } ConfigCCAttitudeWidget::~ConfigCCAttitudeWidget() From bfb56be98e465d07f72c475518781e6b691d03fd Mon Sep 17 00:00:00 2001 From: Laura Sebesta Date: Tue, 17 Apr 2012 15:54:08 -0400 Subject: [PATCH 3/8] Small GCS UI improvements related to stab settings, esp. significant digits and tab focus.. Fixed matlab importer patch. --- .../src/plugins/config/outputchannelform.ui | 634 +++++++++--------- .../src/plugins/config/stabilization.ui | 331 ++++++--- .../plugins/uavobjects/uavobjecttemplate.m | 4 +- 3 files changed, 581 insertions(+), 388 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/outputchannelform.ui b/ground/openpilotgcs/src/plugins/config/outputchannelform.ui index 622b76c5d..9c2c62f47 100644 --- a/ground/openpilotgcs/src/plugins/config/outputchannelform.ui +++ b/ground/openpilotgcs/src/plugins/config/outputchannelform.ui @@ -7,7 +7,7 @@ 0 0 813 - 56 + 58 @@ -20,315 +20,19 @@ 1 - - + + 0 0 - - - 20 - 0 - - - Channel Number - - - Qt::LeftToRight + Current value of slider. - TextLabel - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - - 110 - 0 - - - - TextLabel - - - Qt::AlignCenter - - - - - - - Minimum PWM value, beware of not overdriving your servo. - - - 9999 - - - - - - - Qt::Horizontal - - - QSizePolicy::Minimum - - - - 0 - 20 - - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - 9999 - - - Qt::Horizontal - - - - - - - Qt::Horizontal - - - QSizePolicy::Minimum - - - - 5 - 20 - - - - - - - - - 0 - 0 - - - - - 40 - 0 - - - - Check to invert the channel. - - - - - - - - 0 - 0 - - - - - 40 - 0 - - - - Output mode - - - - - - - Maximum PWM value, beware of not overdriving your servo. - - - 9999 - - - - - - - - 0 - 0 - - - - - 75 - false - true - - - - background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); -color: rgb(255, 255, 255); -border-radius: 5; -font:bold; -margin:1px; - - - Assignment - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 75 - false - true - - - - background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); -color: rgb(255, 255, 255); -border-radius: 5; -font:bold; -margin:1px; - - - Min - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 75 - false - true - - - - background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); -color: rgb(255, 255, 255); -border-radius: 5; -font:bold; -margin:1px; - - - Neutral (slowest for motor) - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 75 - false - true - - - - background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); -color: rgb(255, 255, 255); -border-radius: 5; -font:bold; -margin:1px; - - - Max - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 75 - false - true - - - - background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); -color: rgb(255, 255, 255); -border-radius: 5; -font:bold; -margin:1px; - - - Rev. - - - Qt::AlignCenter + 0000 @@ -362,19 +66,25 @@ margin:1px; - - + + 0 0 - - Current value of slider. + + + 110 + 0 + - 0000 + TextLabel + + + Qt::AlignCenter @@ -414,8 +124,320 @@ margin:1px; + + + + + 0 + 0 + + + + + 20 + 0 + + + + Channel Number + + + Qt::LeftToRight + + + TextLabel + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Qt::StrongFocus + + + Minimum PWM value, beware of not overdriving your servo. + + + 9999 + + + + + + + + 0 + 0 + + + + + 40 + 0 + + + + Qt::StrongFocus + + + Check to invert the channel. + + + + + + + + 0 + 0 + + + + + 75 + false + true + + + + background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); +color: rgb(255, 255, 255); +border-radius: 5; +font:bold; +margin:1px; + + + Neutral (slowest for motor) + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 75 + false + true + + + + background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); +color: rgb(255, 255, 255); +border-radius: 5; +font:bold; +margin:1px; + + + Assignment + + + Qt::AlignCenter + + + + + + + Qt::Horizontal + + + QSizePolicy::Minimum + + + + 0 + 20 + + + + + + + + + 0 + 0 + + + + + 75 + false + true + + + + background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); +color: rgb(255, 255, 255); +border-radius: 5; +font:bold; +margin:1px; + + + Min + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 75 + false + true + + + + background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); +color: rgb(255, 255, 255); +border-radius: 5; +font:bold; +margin:1px; + + + Max + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 40 + 0 + + + + Qt::StrongFocus + + + Output mode + + + + + + + Qt::Horizontal + + + QSizePolicy::Minimum + + + + 5 + 20 + + + + + + + + + 0 + 0 + + + + + 75 + false + true + + + + background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); +color: rgb(255, 255, 255); +border-radius: 5; +font:bold; +margin:1px; + + + Rev. + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + Qt::StrongFocus + + + 9999 + + + Qt::Horizontal + + + + + + + Qt::StrongFocus + + + Maximum PWM value, beware of not overdriving your servo. + + + 9999 + + + + + actuatorMin + actuatorNeutral + actuatorMax + actuatorRev + actuatorLink + diff --git a/ground/openpilotgcs/src/plugins/config/stabilization.ui b/ground/openpilotgcs/src/plugins/config/stabilization.ui index a8d99f817..eaf4d9c9d 100755 --- a/ground/openpilotgcs/src/plugins/config/stabilization.ui +++ b/ground/openpilotgcs/src/plugins/config/stabilization.ui @@ -470,7 +470,7 @@ QTabWidget::North - 0 + 1 true @@ -495,7 +495,7 @@ 0 - 0 + -267 667 880 @@ -3424,6 +3424,9 @@ border-radius: 5; 22 + + Qt::StrongFocus + 200 @@ -3516,6 +3519,9 @@ border-radius: 5; 22 + + Qt::StrongFocus + 200 @@ -3608,6 +3614,9 @@ border-radius: 5; 22 + + Qt::StrongFocus + 200 @@ -3703,6 +3712,9 @@ border-radius: 5; 22 + + Qt::StrongFocus + 200 @@ -3779,6 +3791,9 @@ border-radius: 5; 22 + + Qt::StrongFocus + 200 @@ -3855,6 +3870,9 @@ border-radius: 5; 22 + + Qt::StrongFocus + 200 @@ -6741,6 +6759,9 @@ border-radius: 5; 22 + + Qt::StrongFocus + 200 @@ -6833,6 +6854,9 @@ border-radius: 5; 22 + + Qt::StrongFocus + 200 @@ -6925,6 +6949,9 @@ border-radius: 5; 22 + + Qt::StrongFocus + 200 @@ -7036,6 +7063,9 @@ border-radius: 5; 22 + + Qt::StrongFocus + 200 @@ -7112,6 +7142,9 @@ border-radius: 5; 22 + + Qt::StrongFocus + 200 @@ -7188,6 +7221,9 @@ border-radius: 5; 22 + + Qt::StrongFocus + 200 @@ -10184,6 +10220,9 @@ Angle 22 + + Qt::StrongFocus + 200 @@ -10274,6 +10313,9 @@ Angle 22 + + Qt::StrongFocus + 200 @@ -10364,6 +10406,9 @@ Angle 22 + + Qt::StrongFocus + 200 @@ -10459,6 +10504,9 @@ Rate 22 + + Qt::StrongFocus + 200 @@ -10535,6 +10583,9 @@ Rate 22 + + Qt::StrongFocus + 200 @@ -10611,6 +10662,9 @@ Rate 22 + + Qt::StrongFocus + 200 @@ -10707,6 +10761,9 @@ Attitude 22 + + Qt::StrongFocus + 200 @@ -10783,6 +10840,9 @@ Attitude 22 + + Qt::StrongFocus + 200 @@ -10859,6 +10919,9 @@ Attitude 22 + + Qt::StrongFocus + 200 @@ -14600,6 +14663,9 @@ border-radius: 5; 22 + + Qt::StrongFocus + Slowly raise Kp until you start seeing clear oscillations when you fly. Then lower the value by 20% or so. @@ -14608,7 +14674,7 @@ Then lower the value by 20% or so. - 6 + 5 0.000100000000000 @@ -14645,6 +14711,9 @@ Then lower the value by 20% or so. 22 + + Qt::StrongFocus + Slowly raise Kp until you start seeing clear oscillations when you fly. Then lower the value by 20% or so. @@ -14653,7 +14722,7 @@ Then lower the value by 20% or so. - 6 + 5 0.000100000000000 @@ -14690,6 +14759,9 @@ Then lower the value by 20% or so. 22 + + Qt::StrongFocus + Slowly raise Kp until you start seeing clear oscillations when you fly. Then lower the value by 20% or so. @@ -14700,7 +14772,7 @@ You can usually go for higher values for Yaw factors. - 6 + 5 0.000100000000000 @@ -14772,6 +14844,9 @@ You can usually go for higher values for Yaw factors. 22 + + Qt::StrongFocus + As a rule of thumb, you can set the Ki at roughly the same value as the Kp. @@ -14780,7 +14855,7 @@ value as the Kp. - 6 + 5 0.000100000000000 @@ -14833,6 +14908,9 @@ value as the Kp. 22 + + Qt::StrongFocus + As a rule of thumb, you can set the Ki at roughly the same value as the Kp. @@ -14841,7 +14919,7 @@ value as the Kp. - 6 + 5 0.000100000000000 @@ -14894,6 +14972,9 @@ value as the Kp. 22 + + Qt::StrongFocus + As a rule of thumb, you can set the Ki at roughly the same value as the Kp. @@ -14902,7 +14983,7 @@ value as the Kp. - 6 + 5 0.000100000000000 @@ -14970,6 +15051,9 @@ value as the Kp. 22 + + Qt::StrongFocus + @@ -14980,7 +15064,7 @@ value as the Kp. 6 - 1.000000000000000 + 0.000001000000000 @@ -15014,6 +15098,9 @@ value as the Kp. 22 + + Qt::StrongFocus + @@ -15021,7 +15108,7 @@ value as the Kp. 6 - 1.000000000000000 + 0.000001000000000 @@ -15055,6 +15142,9 @@ value as the Kp. 22 + + Qt::StrongFocus + @@ -15065,7 +15155,7 @@ value as the Kp. 6 - 1.000000000000000 + 0.000001000000000 @@ -15103,7 +15193,7 @@ value as the Kp. - ILimit + K_i*ILimit Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -15130,6 +15220,9 @@ value as the Kp. 22 + + Qt::StrongFocus + @@ -15139,9 +15232,12 @@ value as the Kp. 6 - + 1.000000000000000 + + 0.000010000000000 + objname:StabilizationSettings @@ -15174,15 +15270,21 @@ value as the Kp. 22 + + Qt::StrongFocus + 6 - + 1.000000000000000 + + 0.000010000000000 + objname:StabilizationSettings @@ -15215,6 +15317,9 @@ value as the Kp. 22 + + Qt::StrongFocus + @@ -15224,9 +15329,12 @@ value as the Kp. 6 - + 1.000000000000000 + + 0.000010000000000 + objname:StabilizationSettings @@ -18122,7 +18230,10 @@ border-radius: 5; - 6 + 2 + + + 1000.000000000000000 0.100000000000000 @@ -18163,7 +18274,10 @@ border-radius: 5; - 6 + 2 + + + 1000.000000000000000 0.100000000000000 @@ -18207,7 +18321,10 @@ border-radius: 5; - 6 + 2 + + + 1000.000000000000000 0.100000000000000 @@ -18259,50 +18376,6 @@ border-radius: 5; - - - - - 0 - 0 - - - - - 0 - 22 - - - - - 16777215 - 22 - - - - - - - - - - 6 - - - 0.100000000000000 - - - - objname:StabilizationSettings - fieldname:RollPI - element:Ki - haslimits:no - scale:1 - buttongroup:5,20 - - - - @@ -18343,7 +18416,10 @@ border-radius: 5; - 6 + 2 + + + 1000.000000000000000 0.100000000000000 @@ -18403,7 +18479,10 @@ border-radius: 5; - 6 + 2 + + + 1000.000000000000000 0.100000000000000 @@ -18444,7 +18523,7 @@ border-radius: 5; - ILimit + K_i*ILimit Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -18478,7 +18557,10 @@ border-radius: 5; - 6 + 2 + + + 1000.000000000000000 0.100000000000000 @@ -18519,7 +18601,10 @@ border-radius: 5; - 6 + 2 + + + 1000.000000000000000 0.100000000000000 @@ -18563,7 +18648,10 @@ border-radius: 5; - 6 + 2 + + + 1000.000000000000000 0.100000000000000 @@ -18580,6 +18668,53 @@ border-radius: 5; + + + + + 0 + 0 + + + + + 0 + 22 + + + + + 16777215 + 22 + + + + + + + + + + 2 + + + 1000.000000000000000 + + + 0.100000000000000 + + + + objname:StabilizationSettings + fieldname:RollPI + element:Ki + haslimits:no + scale:1 + buttongroup:5,20 + + + + @@ -21412,6 +21547,9 @@ angle(deg) 22 + + Qt::StrongFocus + @@ -21422,7 +21560,7 @@ angle(deg) 0 - 1000000.000000000000000 + 360.000000000000000 1.000000000000000 @@ -21458,6 +21596,9 @@ angle(deg) 22 + + Qt::StrongFocus + @@ -21465,7 +21606,7 @@ angle(deg) 0 - 1000000.000000000000000 + 360.000000000000000 1.000000000000000 @@ -21537,6 +21678,9 @@ rate(deg/s) 22 + + Qt::StrongFocus + @@ -21547,7 +21691,7 @@ rate(deg/s) 0 - 1000000.000000000000000 + 10000.000000000000000 1.000000000000000 @@ -21600,6 +21744,9 @@ rate(deg/s) 22 + + Qt::StrongFocus + @@ -21607,7 +21754,7 @@ rate(deg/s) 0 - 1000000.000000000000000 + 10000.000000000000000 1.000000000000000 @@ -21660,6 +21807,9 @@ rate(deg/s) 22 + + Qt::StrongFocus + @@ -21670,7 +21820,7 @@ rate(deg/s) 0 - 1000000.000000000000000 + 10000.000000000000000 1.000000000000000 @@ -21739,6 +21889,9 @@ rate(deg/s) 22 + + Qt::StrongFocus + @@ -21749,7 +21902,7 @@ rate(deg/s) 0 - 1000000.000000000000000 + 10000.000000000000000 1.000000000000000 @@ -21786,6 +21939,9 @@ rate(deg/s) 22 + + Qt::StrongFocus + @@ -21793,7 +21949,7 @@ rate(deg/s) 0 - 1000000.000000000000000 + 10000.000000000000000 1.000000000000000 @@ -21830,6 +21986,9 @@ rate(deg/s) 22 + + Qt::StrongFocus + @@ -21840,7 +21999,7 @@ rate(deg/s) 0 - 1000000.000000000000000 + 10000.000000000000000 1.000000000000000 @@ -21877,6 +22036,9 @@ rate(deg/s) 22 + + Qt::StrongFocus + @@ -21887,7 +22049,7 @@ rate(deg/s) 0 - 1000000.000000000000000 + 360.000000000000000 1.000000000000000 @@ -24702,6 +24864,9 @@ border-radius: 5; 22 + + Qt::StrongFocus + GyroTau is a gyro filter, the higher the factor the more filtering is applied to the gyros @@ -24715,7 +24880,7 @@ border-radius: 5; 1000000.000000000000000 - 1.000000000000000 + 0.010000000000000 @@ -24748,6 +24913,9 @@ border-radius: 5; 22 + + Qt::StrongFocus + The proportional term for the accelerometer, the higher this term the more weight the accel is given @@ -24761,7 +24929,7 @@ border-radius: 5; 1000000.000000000000000 - 1.000000000000000 + 0.010000000000000 @@ -24794,6 +24962,9 @@ border-radius: 5; 22 + + Qt::StrongFocus + The intergral term for the accelerometer within the filter @@ -24807,7 +24978,7 @@ border-radius: 5; 1000000.000000000000000 - 1.000000000000000 + 0.000100000000000 diff --git a/ground/openpilotgcs/src/plugins/uavobjects/uavobjecttemplate.m b/ground/openpilotgcs/src/plugins/uavobjects/uavobjecttemplate.m index c494c529b..a01b2ad27 100644 --- a/ground/openpilotgcs/src/plugins/uavobjects/uavobjecttemplate.m +++ b/ground/openpilotgcs/src/plugins/uavobjects/uavobjecttemplate.m @@ -89,8 +89,8 @@ fclose(fid); $(CLEANUPCODE) if strcmpi(outputType,'mat') - matfile = strrep(logfile,'opl','mat'); - save(matfile $(SAVEOBJECTSCODE)); + [pathstr, name, ext] = fileparts(logfile); + save([fullfile(pathstr, name) '.mat'] $(SAVEOBJECTSCODE)); else $(EXPORTCSVCODE); end From c6c5e18992fc23ca3315a1035af78237b015fb2a Mon Sep 17 00:00:00 2001 From: Laura Sebesta Date: Tue, 17 Apr 2012 16:32:07 -0400 Subject: [PATCH 4/8] Fixed outputchannelform.ui tab order and tab focus. --- .../src/plugins/config/outputchannelform.ui | 634 +++++++++--------- 1 file changed, 328 insertions(+), 306 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/outputchannelform.ui b/ground/openpilotgcs/src/plugins/config/outputchannelform.ui index 622b76c5d..9c2c62f47 100644 --- a/ground/openpilotgcs/src/plugins/config/outputchannelform.ui +++ b/ground/openpilotgcs/src/plugins/config/outputchannelform.ui @@ -7,7 +7,7 @@ 0 0 813 - 56 + 58 @@ -20,315 +20,19 @@ 1 - - + + 0 0 - - - 20 - 0 - - - Channel Number - - - Qt::LeftToRight + Current value of slider. - TextLabel - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - - 110 - 0 - - - - TextLabel - - - Qt::AlignCenter - - - - - - - Minimum PWM value, beware of not overdriving your servo. - - - 9999 - - - - - - - Qt::Horizontal - - - QSizePolicy::Minimum - - - - 0 - 20 - - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - 9999 - - - Qt::Horizontal - - - - - - - Qt::Horizontal - - - QSizePolicy::Minimum - - - - 5 - 20 - - - - - - - - - 0 - 0 - - - - - 40 - 0 - - - - Check to invert the channel. - - - - - - - - 0 - 0 - - - - - 40 - 0 - - - - Output mode - - - - - - - Maximum PWM value, beware of not overdriving your servo. - - - 9999 - - - - - - - - 0 - 0 - - - - - 75 - false - true - - - - background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); -color: rgb(255, 255, 255); -border-radius: 5; -font:bold; -margin:1px; - - - Assignment - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 75 - false - true - - - - background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); -color: rgb(255, 255, 255); -border-radius: 5; -font:bold; -margin:1px; - - - Min - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 75 - false - true - - - - background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); -color: rgb(255, 255, 255); -border-radius: 5; -font:bold; -margin:1px; - - - Neutral (slowest for motor) - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 75 - false - true - - - - background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); -color: rgb(255, 255, 255); -border-radius: 5; -font:bold; -margin:1px; - - - Max - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 75 - false - true - - - - background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); -color: rgb(255, 255, 255); -border-radius: 5; -font:bold; -margin:1px; - - - Rev. - - - Qt::AlignCenter + 0000 @@ -362,19 +66,25 @@ margin:1px; - - + + 0 0 - - Current value of slider. + + + 110 + 0 + - 0000 + TextLabel + + + Qt::AlignCenter @@ -414,8 +124,320 @@ margin:1px; + + + + + 0 + 0 + + + + + 20 + 0 + + + + Channel Number + + + Qt::LeftToRight + + + TextLabel + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Qt::StrongFocus + + + Minimum PWM value, beware of not overdriving your servo. + + + 9999 + + + + + + + + 0 + 0 + + + + + 40 + 0 + + + + Qt::StrongFocus + + + Check to invert the channel. + + + + + + + + 0 + 0 + + + + + 75 + false + true + + + + background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); +color: rgb(255, 255, 255); +border-radius: 5; +font:bold; +margin:1px; + + + Neutral (slowest for motor) + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 75 + false + true + + + + background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); +color: rgb(255, 255, 255); +border-radius: 5; +font:bold; +margin:1px; + + + Assignment + + + Qt::AlignCenter + + + + + + + Qt::Horizontal + + + QSizePolicy::Minimum + + + + 0 + 20 + + + + + + + + + 0 + 0 + + + + + 75 + false + true + + + + background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); +color: rgb(255, 255, 255); +border-radius: 5; +font:bold; +margin:1px; + + + Min + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 75 + false + true + + + + background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); +color: rgb(255, 255, 255); +border-radius: 5; +font:bold; +margin:1px; + + + Max + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 40 + 0 + + + + Qt::StrongFocus + + + Output mode + + + + + + + Qt::Horizontal + + + QSizePolicy::Minimum + + + + 5 + 20 + + + + + + + + + 0 + 0 + + + + + 75 + false + true + + + + background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); +color: rgb(255, 255, 255); +border-radius: 5; +font:bold; +margin:1px; + + + Rev. + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + Qt::StrongFocus + + + 9999 + + + Qt::Horizontal + + + + + + + Qt::StrongFocus + + + Maximum PWM value, beware of not overdriving your servo. + + + 9999 + + + + + actuatorMin + actuatorNeutral + actuatorMax + actuatorRev + actuatorLink + From 46584209fbec3463f98ef4c0baee59d4ac5248a6 Mon Sep 17 00:00:00 2001 From: Laura Sebesta Date: Tue, 17 Apr 2012 17:14:03 -0400 Subject: [PATCH 5/8] Fixed foxus problems in basic tab. --- .../src/plugins/config/stabilization.ui | 239 +++++++++++++++++- 1 file changed, 237 insertions(+), 2 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/stabilization.ui b/ground/openpilotgcs/src/plugins/config/stabilization.ui index a8d99f817..4ad56cc3d 100755 --- a/ground/openpilotgcs/src/plugins/config/stabilization.ui +++ b/ground/openpilotgcs/src/plugins/config/stabilization.ui @@ -495,7 +495,7 @@ 0 - 0 + -267 667 880 @@ -1128,6 +1128,9 @@ border-radius: 3; 0 + + Qt::StrongFocus + @@ -3377,6 +3380,9 @@ border-radius: 5; 25 + + Qt::StrongFocus + @@ -3424,6 +3430,9 @@ border-radius: 5; 22 + + Qt::StrongFocus + 200 @@ -3472,6 +3481,9 @@ border-radius: 5; 25 + + Qt::StrongFocus + @@ -3516,6 +3528,9 @@ border-radius: 5; 22 + + Qt::StrongFocus + 200 @@ -3564,6 +3579,9 @@ border-radius: 5; 25 + + Qt::StrongFocus + @@ -3608,6 +3626,9 @@ border-radius: 5; 22 + + Qt::StrongFocus + 200 @@ -3659,6 +3680,9 @@ border-radius: 5; 25 + + Qt::StrongFocus + @@ -3703,6 +3727,9 @@ border-radius: 5; 22 + + Qt::StrongFocus + 200 @@ -3735,6 +3762,9 @@ border-radius: 5; 25 + + Qt::StrongFocus + @@ -3779,6 +3809,9 @@ border-radius: 5; 22 + + Qt::StrongFocus + 200 @@ -3811,6 +3844,9 @@ border-radius: 5; 25 + + Qt::StrongFocus + @@ -3855,6 +3891,9 @@ border-radius: 5; 22 + + Qt::StrongFocus + 200 @@ -4506,6 +4545,9 @@ border-radius: 3; 0 + + Qt::StrongFocus + @@ -6697,6 +6739,9 @@ border-radius: 5; 25 + + Qt::StrongFocus + @@ -6741,6 +6786,9 @@ border-radius: 5; 22 + + Qt::StrongFocus + 200 @@ -6789,6 +6837,9 @@ border-radius: 5; 25 + + Qt::StrongFocus + @@ -6833,6 +6884,9 @@ border-radius: 5; 22 + + Qt::StrongFocus + 200 @@ -6881,6 +6935,9 @@ border-radius: 5; 25 + + Qt::StrongFocus + @@ -6925,6 +6982,9 @@ border-radius: 5; 22 + + Qt::StrongFocus + 200 @@ -6992,6 +7052,9 @@ border-radius: 5; 25 + + Qt::StrongFocus + @@ -7036,6 +7099,9 @@ border-radius: 5; 22 + + Qt::StrongFocus + 200 @@ -7068,6 +7134,9 @@ border-radius: 5; 25 + + Qt::StrongFocus + @@ -7112,6 +7181,9 @@ border-radius: 5; 22 + + Qt::StrongFocus + 200 @@ -7144,6 +7216,9 @@ border-radius: 5; 25 + + Qt::StrongFocus + @@ -7188,6 +7263,9 @@ border-radius: 5; 22 + + Qt::StrongFocus + 200 @@ -10141,6 +10219,9 @@ Angle 25 + + Qt::StrongFocus + @@ -10184,6 +10265,9 @@ Angle 22 + + Qt::StrongFocus + 200 @@ -10231,6 +10315,9 @@ Angle 25 + + Qt::StrongFocus + @@ -10274,6 +10361,9 @@ Angle 22 + + Qt::StrongFocus + 200 @@ -10321,6 +10411,9 @@ Angle 25 + + Qt::StrongFocus + @@ -10364,6 +10457,9 @@ Angle 22 + + Qt::StrongFocus + 200 @@ -10415,6 +10511,9 @@ Rate 25 + + Qt::StrongFocus + @@ -10459,6 +10558,9 @@ Rate 22 + + Qt::StrongFocus + 200 @@ -10491,6 +10593,9 @@ Rate 25 + + Qt::StrongFocus + @@ -10535,6 +10640,9 @@ Rate 22 + + Qt::StrongFocus + 200 @@ -10567,6 +10675,9 @@ Rate 25 + + Qt::StrongFocus + @@ -10611,6 +10722,9 @@ Rate 22 + + Qt::StrongFocus + 200 @@ -10663,6 +10777,9 @@ Attitude 25 + + Qt::StrongFocus + @@ -10707,6 +10824,9 @@ Attitude 22 + + Qt::StrongFocus + 200 @@ -10739,6 +10859,9 @@ Attitude 25 + + Qt::StrongFocus + @@ -10783,6 +10906,9 @@ Attitude 22 + + Qt::StrongFocus + 200 @@ -10815,6 +10941,9 @@ Attitude 25 + + Qt::StrongFocus + @@ -10859,6 +10988,9 @@ Attitude 22 + + Qt::StrongFocus + 200 @@ -11753,7 +11885,7 @@ border-radius: 4; 0 - 0 + -466 667 1079 @@ -25598,6 +25730,109 @@ border-radius: 4; + + tabWidget + scrollArea + checkBox_7 + pushButton_19 + 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_21 + pushButton_22 + horizontalSlider_82 + spinBox_13 + horizontalSlider_83 + spinBox_14 + horizontalSlider_84 + spinBox_15 + horizontalSlider_85 + spinBox_18 + horizontalSlider_86 + spinBox_19 + horizontalSlider_87 + spinBox_20 + pushButton_23 + pushButton_24 + horizontalSlider_88 + spinBox_16 + horizontalSlider_89 + spinBox_17 + horizontalSlider_90 + spinBox_21 + horizontalSlider_91 + spinBox_22 + horizontalSlider_92 + spinBox_23 + horizontalSlider_93 + spinBox_24 + horizontalSlider_94 + spinBox_25 + horizontalSlider_95 + spinBox_26 + horizontalSlider_96 + spinBox_27 + lowThrottleZeroIntegral_8 + realTimeUpdates_6 + stabilizationReloadBoardData_6 + saveStabilizationToRAM_6 + saveStabilizationToSD_6 + scrollArea_2 + checkBox_3 + pushButton_4 + RateRollKp_2 + RatePitchKp + RateYawKp + RateRollKi_2 + RatePitchKi + RateYawKi + RollRateKd + PitchRateKd + YawRateKd + RateRollILimit_2 + RatePitchILimit + RateYawILimit + checkBox_2 + pushButton_2 + AttitudeRollKp + AttitudePitchKp_2 + AttitudeYawKp + AttitudeRollKi + AttitudePitchKi_2 + AttitudeYawKi + AttitudeRollILimit + AttitudePitchILimit_2 + AttitudeYawILimit + pushButton_3 + rateRollKp_3 + ratePitchKp_4 + rateRollKi_3 + ratePitchKi_4 + rateYawKi_3 + rateRollILimit_3 + ratePitchILimit_4 + rateYawILimit_3 + rateYawKp_3 + pushButton_5 + GyroTau + AccelKp + AccelKi + lowThrottleZeroIntegral_9 + realTimeUpdates_7 + saveStabilizationToRAM_7 + saveStabilizationToSD_7 + From e143f987930110932e34f17c5441f4cc7aae196d Mon Sep 17 00:00:00 2001 From: Laura Sebesta Date: Tue, 17 Apr 2012 17:35:48 -0400 Subject: [PATCH 6/8] Fixed steps in spin boxes. --- .../src/plugins/config/stabilization.ui | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/stabilization.ui b/ground/openpilotgcs/src/plugins/config/stabilization.ui index 4ad56cc3d..d8db8322c 100755 --- a/ground/openpilotgcs/src/plugins/config/stabilization.ui +++ b/ground/openpilotgcs/src/plugins/config/stabilization.ui @@ -15112,7 +15112,7 @@ value as the Kp. 6 - 1.000000000000000 + 0.000001000000000 @@ -15153,7 +15153,7 @@ value as the Kp. 6 - 1.000000000000000 + 0.000001000000000 @@ -15197,7 +15197,7 @@ value as the Kp. 6 - 1.000000000000000 + 0.000001000000000 @@ -15235,7 +15235,7 @@ value as the Kp. - ILimit + K_i*ILimit Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -15272,7 +15272,7 @@ value as the Kp. 6 - 1.000000000000000 + 0.0010000000000 @@ -15313,7 +15313,7 @@ value as the Kp. 6 - 1.000000000000000 + 0.00100000000000 @@ -15357,7 +15357,7 @@ value as the Kp. 6 - 1.000000000000000 + 0.00100000000000 @@ -18576,7 +18576,7 @@ border-radius: 5; - ILimit + K_i*ILimit Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -24847,7 +24847,7 @@ border-radius: 5; 1000000.000000000000000 - 1.000000000000000 + 0.001000000000000 @@ -24893,7 +24893,7 @@ border-radius: 5; 1000000.000000000000000 - 1.000000000000000 + 0.010000000000000 @@ -24939,7 +24939,7 @@ border-radius: 5; 1000000.000000000000000 - 1.000000000000000 + 0.000100000000000 From 68f4a9ebd5d81873ad7208f81cc28b0d1b26d717 Mon Sep 17 00:00:00 2001 From: James Cotton Date: Tue, 17 Apr 2012 16:42:02 -0500 Subject: [PATCH 7/8] Revert "Small GCS UI improvements related to stab settings, esp. significant digits and tab focus.." Broken on mac This reverts commit bfb56be98e465d07f72c475518781e6b691d03fd. --- .../src/plugins/config/outputchannelform.ui | 634 +++++++++--------- .../src/plugins/config/stabilization.ui | 331 +++------ .../plugins/uavobjects/uavobjecttemplate.m | 4 +- 3 files changed, 388 insertions(+), 581 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/outputchannelform.ui b/ground/openpilotgcs/src/plugins/config/outputchannelform.ui index 9c2c62f47..622b76c5d 100644 --- a/ground/openpilotgcs/src/plugins/config/outputchannelform.ui +++ b/ground/openpilotgcs/src/plugins/config/outputchannelform.ui @@ -7,7 +7,7 @@ 0 0 813 - 58 + 56 @@ -20,19 +20,315 @@ 1 - - + + 0 0 + + + 20 + 0 + + - Current value of slider. + Channel Number + + + Qt::LeftToRight - 0000 + TextLabel + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 110 + 0 + + + + TextLabel + + + Qt::AlignCenter + + + + + + + Minimum PWM value, beware of not overdriving your servo. + + + 9999 + + + + + + + Qt::Horizontal + + + QSizePolicy::Minimum + + + + 0 + 20 + + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + 9999 + + + Qt::Horizontal + + + + + + + Qt::Horizontal + + + QSizePolicy::Minimum + + + + 5 + 20 + + + + + + + + + 0 + 0 + + + + + 40 + 0 + + + + Check to invert the channel. + + + + + + + + 0 + 0 + + + + + 40 + 0 + + + + Output mode + + + + + + + Maximum PWM value, beware of not overdriving your servo. + + + 9999 + + + + + + + + 0 + 0 + + + + + 75 + false + true + + + + background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); +color: rgb(255, 255, 255); +border-radius: 5; +font:bold; +margin:1px; + + + Assignment + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 75 + false + true + + + + background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); +color: rgb(255, 255, 255); +border-radius: 5; +font:bold; +margin:1px; + + + Min + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 75 + false + true + + + + background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); +color: rgb(255, 255, 255); +border-radius: 5; +font:bold; +margin:1px; + + + Neutral (slowest for motor) + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 75 + false + true + + + + background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); +color: rgb(255, 255, 255); +border-radius: 5; +font:bold; +margin:1px; + + + Max + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 75 + false + true + + + + background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); +color: rgb(255, 255, 255); +border-radius: 5; +font:bold; +margin:1px; + + + Rev. + + + Qt::AlignCenter @@ -66,25 +362,19 @@ margin:1px; - - + + 0 0 - - - 110 - 0 - + + Current value of slider. - TextLabel - - - Qt::AlignCenter + 0000 @@ -124,320 +414,8 @@ margin:1px; - - - - - 0 - 0 - - - - - 20 - 0 - - - - Channel Number - - - Qt::LeftToRight - - - TextLabel - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Qt::StrongFocus - - - Minimum PWM value, beware of not overdriving your servo. - - - 9999 - - - - - - - - 0 - 0 - - - - - 40 - 0 - - - - Qt::StrongFocus - - - Check to invert the channel. - - - - - - - - 0 - 0 - - - - - 75 - false - true - - - - background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); -color: rgb(255, 255, 255); -border-radius: 5; -font:bold; -margin:1px; - - - Neutral (slowest for motor) - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 75 - false - true - - - - background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); -color: rgb(255, 255, 255); -border-radius: 5; -font:bold; -margin:1px; - - - Assignment - - - Qt::AlignCenter - - - - - - - Qt::Horizontal - - - QSizePolicy::Minimum - - - - 0 - 20 - - - - - - - - - 0 - 0 - - - - - 75 - false - true - - - - background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); -color: rgb(255, 255, 255); -border-radius: 5; -font:bold; -margin:1px; - - - Min - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 75 - false - true - - - - background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); -color: rgb(255, 255, 255); -border-radius: 5; -font:bold; -margin:1px; - - - Max - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 40 - 0 - - - - Qt::StrongFocus - - - Output mode - - - - - - - Qt::Horizontal - - - QSizePolicy::Minimum - - - - 5 - 20 - - - - - - - - - 0 - 0 - - - - - 75 - false - true - - - - background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255)); -color: rgb(255, 255, 255); -border-radius: 5; -font:bold; -margin:1px; - - - Rev. - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - Qt::StrongFocus - - - 9999 - - - Qt::Horizontal - - - - - - - Qt::StrongFocus - - - Maximum PWM value, beware of not overdriving your servo. - - - 9999 - - - - - actuatorMin - actuatorNeutral - actuatorMax - actuatorRev - actuatorLink - diff --git a/ground/openpilotgcs/src/plugins/config/stabilization.ui b/ground/openpilotgcs/src/plugins/config/stabilization.ui index eaf4d9c9d..a8d99f817 100755 --- a/ground/openpilotgcs/src/plugins/config/stabilization.ui +++ b/ground/openpilotgcs/src/plugins/config/stabilization.ui @@ -470,7 +470,7 @@ QTabWidget::North - 1 + 0 true @@ -495,7 +495,7 @@ 0 - -267 + 0 667 880 @@ -3424,9 +3424,6 @@ border-radius: 5; 22 - - Qt::StrongFocus - 200 @@ -3519,9 +3516,6 @@ border-radius: 5; 22 - - Qt::StrongFocus - 200 @@ -3614,9 +3608,6 @@ border-radius: 5; 22 - - Qt::StrongFocus - 200 @@ -3712,9 +3703,6 @@ border-radius: 5; 22 - - Qt::StrongFocus - 200 @@ -3791,9 +3779,6 @@ border-radius: 5; 22 - - Qt::StrongFocus - 200 @@ -3870,9 +3855,6 @@ border-radius: 5; 22 - - Qt::StrongFocus - 200 @@ -6759,9 +6741,6 @@ border-radius: 5; 22 - - Qt::StrongFocus - 200 @@ -6854,9 +6833,6 @@ border-radius: 5; 22 - - Qt::StrongFocus - 200 @@ -6949,9 +6925,6 @@ border-radius: 5; 22 - - Qt::StrongFocus - 200 @@ -7063,9 +7036,6 @@ border-radius: 5; 22 - - Qt::StrongFocus - 200 @@ -7142,9 +7112,6 @@ border-radius: 5; 22 - - Qt::StrongFocus - 200 @@ -7221,9 +7188,6 @@ border-radius: 5; 22 - - Qt::StrongFocus - 200 @@ -10220,9 +10184,6 @@ Angle 22 - - Qt::StrongFocus - 200 @@ -10313,9 +10274,6 @@ Angle 22 - - Qt::StrongFocus - 200 @@ -10406,9 +10364,6 @@ Angle 22 - - Qt::StrongFocus - 200 @@ -10504,9 +10459,6 @@ Rate 22 - - Qt::StrongFocus - 200 @@ -10583,9 +10535,6 @@ Rate 22 - - Qt::StrongFocus - 200 @@ -10662,9 +10611,6 @@ Rate 22 - - Qt::StrongFocus - 200 @@ -10761,9 +10707,6 @@ Attitude 22 - - Qt::StrongFocus - 200 @@ -10840,9 +10783,6 @@ Attitude 22 - - Qt::StrongFocus - 200 @@ -10919,9 +10859,6 @@ Attitude 22 - - Qt::StrongFocus - 200 @@ -14663,9 +14600,6 @@ border-radius: 5; 22 - - Qt::StrongFocus - Slowly raise Kp until you start seeing clear oscillations when you fly. Then lower the value by 20% or so. @@ -14674,7 +14608,7 @@ Then lower the value by 20% or so. - 5 + 6 0.000100000000000 @@ -14711,9 +14645,6 @@ Then lower the value by 20% or so. 22 - - Qt::StrongFocus - Slowly raise Kp until you start seeing clear oscillations when you fly. Then lower the value by 20% or so. @@ -14722,7 +14653,7 @@ Then lower the value by 20% or so. - 5 + 6 0.000100000000000 @@ -14759,9 +14690,6 @@ Then lower the value by 20% or so. 22 - - Qt::StrongFocus - Slowly raise Kp until you start seeing clear oscillations when you fly. Then lower the value by 20% or so. @@ -14772,7 +14700,7 @@ You can usually go for higher values for Yaw factors. - 5 + 6 0.000100000000000 @@ -14844,9 +14772,6 @@ You can usually go for higher values for Yaw factors. 22 - - Qt::StrongFocus - As a rule of thumb, you can set the Ki at roughly the same value as the Kp. @@ -14855,7 +14780,7 @@ value as the Kp. - 5 + 6 0.000100000000000 @@ -14908,9 +14833,6 @@ value as the Kp. 22 - - Qt::StrongFocus - As a rule of thumb, you can set the Ki at roughly the same value as the Kp. @@ -14919,7 +14841,7 @@ value as the Kp. - 5 + 6 0.000100000000000 @@ -14972,9 +14894,6 @@ value as the Kp. 22 - - Qt::StrongFocus - As a rule of thumb, you can set the Ki at roughly the same value as the Kp. @@ -14983,7 +14902,7 @@ value as the Kp. - 5 + 6 0.000100000000000 @@ -15051,9 +14970,6 @@ value as the Kp. 22 - - Qt::StrongFocus - @@ -15064,7 +14980,7 @@ value as the Kp. 6 - 0.000001000000000 + 1.000000000000000 @@ -15098,9 +15014,6 @@ value as the Kp. 22 - - Qt::StrongFocus - @@ -15108,7 +15021,7 @@ value as the Kp. 6 - 0.000001000000000 + 1.000000000000000 @@ -15142,9 +15055,6 @@ value as the Kp. 22 - - Qt::StrongFocus - @@ -15155,7 +15065,7 @@ value as the Kp. 6 - 0.000001000000000 + 1.000000000000000 @@ -15193,7 +15103,7 @@ value as the Kp. - K_i*ILimit + ILimit Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -15220,9 +15130,6 @@ value as the Kp. 22 - - Qt::StrongFocus - @@ -15232,11 +15139,8 @@ value as the Kp. 6 - - 1.000000000000000 - - 0.000010000000000 + 1.000000000000000 @@ -15270,20 +15174,14 @@ value as the Kp. 22 - - Qt::StrongFocus - 6 - - 1.000000000000000 - - 0.000010000000000 + 1.000000000000000 @@ -15317,9 +15215,6 @@ value as the Kp. 22 - - Qt::StrongFocus - @@ -15329,11 +15224,8 @@ value as the Kp. 6 - - 1.000000000000000 - - 0.000010000000000 + 1.000000000000000 @@ -18230,10 +18122,7 @@ border-radius: 5; - 2 - - - 1000.000000000000000 + 6 0.100000000000000 @@ -18274,10 +18163,7 @@ border-radius: 5; - 2 - - - 1000.000000000000000 + 6 0.100000000000000 @@ -18321,10 +18207,7 @@ border-radius: 5; - 2 - - - 1000.000000000000000 + 6 0.100000000000000 @@ -18376,6 +18259,50 @@ border-radius: 5; + + + + + 0 + 0 + + + + + 0 + 22 + + + + + 16777215 + 22 + + + + + + + + + + 6 + + + 0.100000000000000 + + + + objname:StabilizationSettings + fieldname:RollPI + element:Ki + haslimits:no + scale:1 + buttongroup:5,20 + + + + @@ -18416,10 +18343,7 @@ border-radius: 5; - 2 - - - 1000.000000000000000 + 6 0.100000000000000 @@ -18479,10 +18403,7 @@ border-radius: 5; - 2 - - - 1000.000000000000000 + 6 0.100000000000000 @@ -18523,7 +18444,7 @@ border-radius: 5; - K_i*ILimit + ILimit Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -18557,10 +18478,7 @@ border-radius: 5; - 2 - - - 1000.000000000000000 + 6 0.100000000000000 @@ -18601,10 +18519,7 @@ border-radius: 5; - 2 - - - 1000.000000000000000 + 6 0.100000000000000 @@ -18648,10 +18563,7 @@ border-radius: 5; - 2 - - - 1000.000000000000000 + 6 0.100000000000000 @@ -18668,53 +18580,6 @@ border-radius: 5; - - - - - 0 - 0 - - - - - 0 - 22 - - - - - 16777215 - 22 - - - - - - - - - - 2 - - - 1000.000000000000000 - - - 0.100000000000000 - - - - objname:StabilizationSettings - fieldname:RollPI - element:Ki - haslimits:no - scale:1 - buttongroup:5,20 - - - - @@ -21547,9 +21412,6 @@ angle(deg) 22 - - Qt::StrongFocus - @@ -21560,7 +21422,7 @@ angle(deg) 0 - 360.000000000000000 + 1000000.000000000000000 1.000000000000000 @@ -21596,9 +21458,6 @@ angle(deg) 22 - - Qt::StrongFocus - @@ -21606,7 +21465,7 @@ angle(deg) 0 - 360.000000000000000 + 1000000.000000000000000 1.000000000000000 @@ -21678,9 +21537,6 @@ rate(deg/s) 22 - - Qt::StrongFocus - @@ -21691,7 +21547,7 @@ rate(deg/s) 0 - 10000.000000000000000 + 1000000.000000000000000 1.000000000000000 @@ -21744,9 +21600,6 @@ rate(deg/s) 22 - - Qt::StrongFocus - @@ -21754,7 +21607,7 @@ rate(deg/s) 0 - 10000.000000000000000 + 1000000.000000000000000 1.000000000000000 @@ -21807,9 +21660,6 @@ rate(deg/s) 22 - - Qt::StrongFocus - @@ -21820,7 +21670,7 @@ rate(deg/s) 0 - 10000.000000000000000 + 1000000.000000000000000 1.000000000000000 @@ -21889,9 +21739,6 @@ rate(deg/s) 22 - - Qt::StrongFocus - @@ -21902,7 +21749,7 @@ rate(deg/s) 0 - 10000.000000000000000 + 1000000.000000000000000 1.000000000000000 @@ -21939,9 +21786,6 @@ rate(deg/s) 22 - - Qt::StrongFocus - @@ -21949,7 +21793,7 @@ rate(deg/s) 0 - 10000.000000000000000 + 1000000.000000000000000 1.000000000000000 @@ -21986,9 +21830,6 @@ rate(deg/s) 22 - - Qt::StrongFocus - @@ -21999,7 +21840,7 @@ rate(deg/s) 0 - 10000.000000000000000 + 1000000.000000000000000 1.000000000000000 @@ -22036,9 +21877,6 @@ rate(deg/s) 22 - - Qt::StrongFocus - @@ -22049,7 +21887,7 @@ rate(deg/s) 0 - 360.000000000000000 + 1000000.000000000000000 1.000000000000000 @@ -24864,9 +24702,6 @@ border-radius: 5; 22 - - Qt::StrongFocus - GyroTau is a gyro filter, the higher the factor the more filtering is applied to the gyros @@ -24880,7 +24715,7 @@ border-radius: 5; 1000000.000000000000000 - 0.010000000000000 + 1.000000000000000 @@ -24913,9 +24748,6 @@ border-radius: 5; 22 - - Qt::StrongFocus - The proportional term for the accelerometer, the higher this term the more weight the accel is given @@ -24929,7 +24761,7 @@ border-radius: 5; 1000000.000000000000000 - 0.010000000000000 + 1.000000000000000 @@ -24962,9 +24794,6 @@ border-radius: 5; 22 - - Qt::StrongFocus - The intergral term for the accelerometer within the filter @@ -24978,7 +24807,7 @@ border-radius: 5; 1000000.000000000000000 - 0.000100000000000 + 1.000000000000000 diff --git a/ground/openpilotgcs/src/plugins/uavobjects/uavobjecttemplate.m b/ground/openpilotgcs/src/plugins/uavobjects/uavobjecttemplate.m index a01b2ad27..c494c529b 100644 --- a/ground/openpilotgcs/src/plugins/uavobjects/uavobjecttemplate.m +++ b/ground/openpilotgcs/src/plugins/uavobjects/uavobjecttemplate.m @@ -89,8 +89,8 @@ fclose(fid); $(CLEANUPCODE) if strcmpi(outputType,'mat') - [pathstr, name, ext] = fileparts(logfile); - save([fullfile(pathstr, name) '.mat'] $(SAVEOBJECTSCODE)); + matfile = strrep(logfile,'opl','mat'); + save(matfile $(SAVEOBJECTSCODE)); else $(EXPORTCSVCODE); end From dddbd77a8916823d64602d09d9149ad7af030c74 Mon Sep 17 00:00:00 2001 From: Laura Sebesta Date: Tue, 17 Apr 2012 18:48:47 -0400 Subject: [PATCH 8/8] Changed all to StrongFocus. Added limits to Ki*ILimit --- .../src/plugins/config/stabilization.ui | 128 ++++++++++++++++-- 1 file changed, 118 insertions(+), 10 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/stabilization.ui b/ground/openpilotgcs/src/plugins/config/stabilization.ui index d8db8322c..5c79c104f 100755 --- a/ground/openpilotgcs/src/plugins/config/stabilization.ui +++ b/ground/openpilotgcs/src/plugins/config/stabilization.ui @@ -6,8 +6,8 @@ 0 0 - 732 - 685 + 738 + 748 @@ -495,8 +495,8 @@ 0 - -267 - 667 + 0 + 673 880 @@ -11885,8 +11885,8 @@ border-radius: 4; 0 - -466 - 667 + -403 + 673 1079 @@ -14732,6 +14732,9 @@ border-radius: 5; 22 + + Qt::StrongFocus + Slowly raise Kp until you start seeing clear oscillations when you fly. Then lower the value by 20% or so. @@ -14777,6 +14780,9 @@ Then lower the value by 20% or so. 22 + + Qt::StrongFocus + Slowly raise Kp until you start seeing clear oscillations when you fly. Then lower the value by 20% or so. @@ -14822,6 +14828,9 @@ Then lower the value by 20% or so. 22 + + Qt::StrongFocus + Slowly raise Kp until you start seeing clear oscillations when you fly. Then lower the value by 20% or so. @@ -14904,6 +14913,9 @@ You can usually go for higher values for Yaw factors. 22 + + Qt::StrongFocus + As a rule of thumb, you can set the Ki at roughly the same value as the Kp. @@ -14965,6 +14977,9 @@ value as the Kp. 22 + + Qt::StrongFocus + As a rule of thumb, you can set the Ki at roughly the same value as the Kp. @@ -15026,6 +15041,9 @@ value as the Kp. 22 + + Qt::StrongFocus + As a rule of thumb, you can set the Ki at roughly the same value as the Kp. @@ -15102,6 +15120,9 @@ value as the Kp. 22 + + Qt::StrongFocus + @@ -15146,6 +15167,9 @@ value as the Kp. 22 + + Qt::StrongFocus + @@ -15187,6 +15211,9 @@ value as the Kp. 22 + + Qt::StrongFocus + @@ -15262,6 +15289,9 @@ value as the Kp. 22 + + Qt::StrongFocus + @@ -15271,8 +15301,11 @@ value as the Kp. 6 + + 1.000000000000000 + - 0.0010000000000 + 0.001000000000000 @@ -15306,14 +15339,20 @@ value as the Kp. 22 + + Qt::StrongFocus + 6 + + 1.000000000000000 + - 0.00100000000000 + 0.001000000000000 @@ -15347,6 +15386,9 @@ value as the Kp. 22 + + Qt::StrongFocus + @@ -15356,8 +15398,11 @@ value as the Kp. 6 + + 1.000000000000000 + - 0.00100000000000 + 0.001000000000000 @@ -18247,6 +18292,9 @@ border-radius: 5; 22 + + Qt::StrongFocus + @@ -18291,6 +18339,9 @@ border-radius: 5; 22 + + Qt::StrongFocus + @@ -18332,6 +18383,9 @@ border-radius: 5; 22 + + Qt::StrongFocus + @@ -18411,6 +18465,9 @@ border-radius: 5; 22 + + Qt::StrongFocus + @@ -18471,6 +18528,9 @@ border-radius: 5; 22 + + Qt::StrongFocus + @@ -18528,6 +18588,9 @@ border-radius: 5; 22 + + Qt::StrongFocus + @@ -18603,6 +18666,9 @@ border-radius: 5; 22 + + Qt::StrongFocus + @@ -18647,6 +18713,9 @@ border-radius: 5; 22 + + Qt::StrongFocus + @@ -18688,6 +18757,9 @@ border-radius: 5; 22 + + Qt::StrongFocus + @@ -21544,6 +21616,9 @@ angle(deg) 22 + + Qt::StrongFocus + @@ -21590,6 +21665,9 @@ angle(deg) 22 + + Qt::StrongFocus + @@ -21669,6 +21747,9 @@ rate(deg/s) 22 + + Qt::StrongFocus + @@ -21732,6 +21813,9 @@ rate(deg/s) 22 + + Qt::StrongFocus + @@ -21792,6 +21876,9 @@ rate(deg/s) 22 + + Qt::StrongFocus + @@ -21871,6 +21958,9 @@ rate(deg/s) 22 + + Qt::StrongFocus + @@ -21918,6 +22008,9 @@ rate(deg/s) 22 + + Qt::StrongFocus + @@ -21962,6 +22055,9 @@ rate(deg/s) 22 + + Qt::StrongFocus + @@ -22009,6 +22105,9 @@ rate(deg/s) 22 + + Qt::StrongFocus + @@ -24834,6 +24933,9 @@ border-radius: 5; 22 + + Qt::StrongFocus + GyroTau is a gyro filter, the higher the factor the more filtering is applied to the gyros @@ -24880,6 +24982,9 @@ border-radius: 5; 22 + + Qt::StrongFocus + The proportional term for the accelerometer, the higher this term the more weight the accel is given @@ -24926,6 +25031,9 @@ border-radius: 5; 22 + + Qt::StrongFocus + The intergral term for the accelerometer within the filter @@ -25817,13 +25925,13 @@ border-radius: 4; pushButton_3 rateRollKp_3 ratePitchKp_4 + rateYawKp_3 rateRollKi_3 ratePitchKi_4 rateYawKi_3 rateRollILimit_3 ratePitchILimit_4 rateYawILimit_3 - rateYawKp_3 pushButton_5 GyroTau AccelKp