From 70943faec22cbba8b20a1ca2b6f623f960a52d43 Mon Sep 17 00:00:00 2001 From: James Cotton Date: Sat, 16 Jul 2011 03:26:36 -0500 Subject: [PATCH] OP-550 UI Changes to make all fonts consistent in config gadget. Drop in the bucket. --- .../src/plugins/config/airframe.ui | 1085 +++++++---------- .../openpilotgcs/src/plugins/config/ccpm.ui | 87 +- .../plugins/config/configairframewidget.cpp | 16 - .../openpilotgcs/src/plugins/config/input.ui | 303 +---- .../openpilotgcs/src/plugins/config/output.ui | 82 +- .../src/plugins/config/stabilization.ui | 894 +++++++------- 6 files changed, 916 insertions(+), 1551 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/airframe.ui b/ground/openpilotgcs/src/plugins/config/airframe.ui index 66a99e902..4b2b44ce8 100644 --- a/ground/openpilotgcs/src/plugins/config/airframe.ui +++ b/ground/openpilotgcs/src/plugins/config/airframe.ui @@ -44,11 +44,6 @@ - - - 10 - - Select aircraft type here @@ -163,122 +158,168 @@ - - - QFormLayout::AllNonFixedFieldsGrow + + + + 0 + 0 + - - - - Engine - - - - - - - - - - - 60 - 0 - - - - Aileron 1 - - - - - - - - - - false - - - - 60 - 0 - - - - Aileron 2 - - - - - - - false - - - - - - - - 67 - 0 - - - - Elevator 1 - - - - - - - - - - false - - - - 67 - 0 - - - - Elevator 2 - - - - - - - false - - - - - - - Rudder 1 - - - - - - - - - - Rudder 2 - - - - - - - + + + 0 + 100 + + + + Output channel asignmets + + + + + + Engine + + + + + + + Select output channel for the engine + + + + + + + + 60 + 0 + + + + Aileron 1 + + + + + + + Select output channel for the first aileron (or elevon) + + + + + + + false + + + + 60 + 0 + + + + Aileron 2 + + + + + + + false + + + Select output channel for the second aileron (or elevon) + + + + + + + + 67 + 0 + + + + Elevator 1 + + + + + + + Select output channel for the first elevator + + + + + + + false + + + + 67 + 0 + + + + Elevator 2 + + + + + + + false + + + Select output channel for a secondry elevator + + + + + + + Rudder 1 + + + + + + + Select output channel for the first rudder + + + + + + + Rudder 2 + + + + + + + Select output channel for a secondary rudder + + + + + + + + 0 + 0 + + Elevon Mix @@ -361,19 +402,6 @@ - - - - Qt::Vertical - - - - 20 - 40 - - - - @@ -391,67 +419,61 @@ - - - - - - - - 75 - true - - - - Throttle Curve - - - - - - - Reset - - - - - - - - - - 0 - 0 - - - - - 100 - 100 - - - - - 200 - 200 - - - - - 10 - 10 - - - - - - - - Val: 0.00 - - - - + + + + 0 + 100 + + + + Throttle Curve + + + + + + + 0 + 0 + + + + + 100 + 100 + + + + + 200 + 200 + + + + + 10 + 10 + + + + + + + + Reset + + + + + + + Val: 0.00 + + + + + @@ -507,7 +529,7 @@ - + @@ -746,98 +768,65 @@ Typical value is 50% for + or X configuration on quads. - - - QLayout::SetDefaultConstraint + + + Qt::Horizontal - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 75 - true - - - - Throttle Curve - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 10 - - - - Reset - - - - - - - - - - 0 - 0 - - - - - 120 - 120 - - - - background:transparent - - - - - - - Val: 0.00 - - - - + + + 40 + 20 + + + + + + + + Throtte Curve + + + + + + + 0 + 0 + + + + + 120 + 120 + + + + background:transparent + + + + + + + + 0 + 0 + + + + Reset + + + + + + + Val: 0.00 + + + + + @@ -922,7 +911,7 @@ Typical value is 50% for + or X configuration on quads. - Motor output channels: + Motor output channels @@ -948,18 +937,8 @@ Typical value is 50% for + or X configuration on quads. - - - 8 - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans'; font-size:8pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Assign your motor channels using the drawing</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">on the right as a reference. Respect propeller rotation!</p></body></html> + Assign your motor output channels using the drawing above as a reference. Respect propeller rotation. @@ -972,10 +951,8 @@ p, li { white-space: pre-wrap; } - - - 8 - + + Assign your motor output channels using the drawing above as a reference. Respect propeller rotation. @@ -988,10 +965,8 @@ p, li { white-space: pre-wrap; } - - - 8 - + + Assign your motor output channels using the drawing above as a reference. Respect propeller rotation. @@ -1004,10 +979,8 @@ p, li { white-space: pre-wrap; } - - - 8 - + + Assign your motor output channels using the drawing above as a reference. Respect propeller rotation. @@ -1039,10 +1012,8 @@ p, li { white-space: pre-wrap; } 0 - - - 8 - + + Assign your motor output channels using the drawing above as a reference. Respect propeller rotation. @@ -1058,10 +1029,8 @@ p, li { white-space: pre-wrap; } false - - - 8 - + + Assign your motor output channels using the drawing above as a reference. Respect propeller rotation. @@ -1077,10 +1046,8 @@ p, li { white-space: pre-wrap; } false - - - 8 - + + Assign your motor output channels using the drawing above as a reference. Respect propeller rotation. @@ -1096,10 +1063,8 @@ p, li { white-space: pre-wrap; } false - - - 8 - + + Assign your motor output channels using the drawing above as a reference. Respect propeller rotation. @@ -1165,273 +1130,129 @@ p, li { white-space: pre-wrap; } - + - - - 2 - - + + - - - - - - - - 9 - 75 - true - - - - Throttle Curve 1 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 9 - - - - Reset - - - - - - - - - - 0 - 0 - - - - - 100 - 100 - - - - - 200 - 200 - - - - - - - - Val: 0.00 - - - - + + + Throtle Curve 1 + + + + + + + 0 + 0 + + + + + 100 + 100 + + + + + 200 + 200 + + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + Reset + + + + + + + Val: 0.00 + + + + + - - - - - - - - 9 - 75 - true - - - - Throttle Curve 2 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 9 - - - - Reset - - - - - - - - - - 0 - 0 - - - - - 100 - 100 - - - - - 200 - 200 - - - - - - - - Val: 0.00 - - - - + + + Qt::Horizontal + + + + 40 + 20 + + + - - - - - - - FeedForward - - - - - - - - 30 - 0 - - - - 000 - - - - - - - - - 100 - - - Qt::Horizontal - - - - - - - AccelTime - - - - - - - - - - DecelTime - - - - - - - - - - - - MaxAccel - - - - - - - 1000 - - - - - - - - - 500 - - - 2000 - - - 1000 - - - Qt::Horizontal - - - - + + + Throtle Curve 2 + + + + + + + 0 + 0 + + + + + 100 + 100 + + + + + 200 + 200 + + + + + + + + Reset + + + + + + + Val: 0.00 + + + + + - + @@ -1439,11 +1260,6 @@ p, li { white-space: pre-wrap; } 0 - - - 8 - - true @@ -2266,15 +2082,14 @@ p, li { white-space: pre-wrap; } <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> <table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> <tr> <td style="border: none;"> -<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14pt; font-weight:600; color:#ff0000;">SETTING UP FEED FORWARD IS DANGEROUS</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt; font-weight:600;">Beware</span><span style=" font-size:10pt;">: Feed Forward Tuning will launch all engines around mid-throttle, you have been warned!</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt; font-weight:600;">Remove your props initially, and for fine-tuning, make sure your airframe is safely held in place. Wear glasses and protect your face and body.</span></p></td></tr></table></body></html> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:14pt; font-weight:600; color:#ff0000;">SETTING UP FEED FORWARD IS DANGEROUS</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:11pt;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Beware: Feed Forward Tuning will launch all engines around mid-throttle, you have been warned!</p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Remove your props initially, and for fine-tuning, make sure your airframe is safely held in place. Wear glasses and protect your face and body.</p></td></tr></table></body></html> @@ -2386,54 +2201,6 @@ p, li { white-space: pre-wrap; } - - 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) @@ -2467,34 +2234,50 @@ p, li { white-space: pre-wrap; } - customFFSlider + mrPitchMixLevel valueChanged(int) - customFeedForwardValue + label_44 setNum(int) - 115 - 117 + 83 + 228 - 115 - 117 + 82 + 168 - customFFMaxAccel + mrRollMixLevel valueChanged(int) - label_OSD + label_43 setNum(int) - 115 - 117 + 42 + 220 - 115 - 117 + 43 + 171 + + + + + mrYawMixLevel + valueChanged(int) + label_45 + setNum(int) + + + 120 + 254 + + + 121 + 172 diff --git a/ground/openpilotgcs/src/plugins/config/ccpm.ui b/ground/openpilotgcs/src/plugins/config/ccpm.ui index 51a0e09f5..12d501f60 100644 --- a/ground/openpilotgcs/src/plugins/config/ccpm.ui +++ b/ground/openpilotgcs/src/plugins/config/ccpm.ui @@ -48,11 +48,6 @@ - - - 10 - - Select aircraft type here @@ -75,7 +70,7 @@ - 0 + 2 @@ -113,11 +108,6 @@ 16777215 - - - 11 - - Outputs @@ -151,11 +141,6 @@ 16777215 - - - 11 - - @@ -178,11 +163,6 @@ 16777215 - - - 11 - - @@ -252,11 +232,6 @@ 16777215 - - - 11 - - Swashplate Outputs @@ -560,11 +535,6 @@ 16777215 - - - 11 - - Swashplate Servo Angles @@ -890,11 +860,6 @@ 16777215 - - - 11 - - CCPM Options @@ -1216,11 +1181,6 @@ 600 - - - 8 - - REVO @@ -1354,11 +1314,6 @@ 600 - - - 8 - - CCPM @@ -1511,11 +1466,6 @@ 600 - - - 8 - - Collective @@ -1629,11 +1579,6 @@ 600 - - - 8 - - Cyclic @@ -1750,11 +1695,6 @@ 600 - - - 8 - - Pitch @@ -1868,11 +1808,6 @@ 600 - - - 8 - - Roll @@ -2270,11 +2205,6 @@ 600 - - - 8 - - Position @@ -2293,11 +2223,6 @@ true - - - 7 - - Max @@ -2375,11 +2300,6 @@ true - - - 7 - - Min @@ -2816,11 +2736,6 @@ 273 - - - 8 - - Qt::ScrollBarAsNeeded diff --git a/ground/openpilotgcs/src/plugins/config/configairframewidget.cpp b/ground/openpilotgcs/src/plugins/config/configairframewidget.cpp index 274ecf9cb..0044afa62 100644 --- a/ground/openpilotgcs/src/plugins/config/configairframewidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configairframewidget.cpp @@ -1787,15 +1787,6 @@ void ConfigAirframeWidget::updateCustomAirframeUI() } m_aircraft->customThrottle2Curve->initCurve(curveValues); } - // Retrieve Feed Forward: - field = obj->getField(QString("FeedForward")); - m_aircraft->customFFSlider->setValue(field->getDouble()*100); - field = obj->getField(QString("AccelTime")); - m_aircraft->customFFaccel->setValue(field->getDouble()); - field = obj->getField(QString("DecelTime")); - m_aircraft->customFFdecel->setValue(field->getDouble()); - field = obj->getField(QString("MaxAccel")); - m_aircraft->customFFMaxAccel->setValue(field->getDouble()); // Update the table: for (int i=0; i<8; i++) { @@ -2098,13 +2089,6 @@ void ConfigAirframeWidget::sendAircraftUpdate() UAVDataObject* obj = dynamic_cast(getObjectManager()->getObject(QString("MixerSettings"))); UAVObjectField* field = obj->getField(QString("FeedForward")); - field->setDouble((double)m_aircraft->customFFSlider->value()/100); - field = obj->getField(QString("AccelTime")); - field->setDouble(m_aircraft->customFFaccel->value()); - field = obj->getField(QString("DecelTime")); - field->setDouble(m_aircraft->customFFdecel->value()); - field = obj->getField(QString("MaxAccel")); - field->setDouble(m_aircraft->customFFMaxAccel->value()); // Curve is also common to all quads: field = obj->getField("ThrottleCurve1"); diff --git a/ground/openpilotgcs/src/plugins/config/input.ui b/ground/openpilotgcs/src/plugins/config/input.ui index c4986955b..cef9c9abe 100644 --- a/ground/openpilotgcs/src/plugins/config/input.ui +++ b/ground/openpilotgcs/src/plugins/config/input.ui @@ -6,8 +6,8 @@ 0 0 - 560 - 467 + 626 + 532 @@ -89,12 +89,6 @@ - - - MS Shell Dlg 2 - 8 - - 16 @@ -108,14 +102,6 @@ - - - FreeSans - 10 - 75 - true - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> @@ -130,12 +116,6 @@ p, li { white-space: pre-wrap; } - - - FreeSans - 8 - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> @@ -173,12 +153,6 @@ p, li { white-space: pre-wrap; } - - - FreeSans - 8 - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> @@ -205,25 +179,10 @@ reversal capabilities). - - - - MS Shell Dlg 2 - 8 - - - + - - - FreeSans - 10 - 75 - true - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> @@ -238,12 +197,6 @@ p, li { white-space: pre-wrap; } - - - FreeSans - 8 - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> @@ -281,12 +234,6 @@ p, li { white-space: pre-wrap; } - - - FreeSans - 8 - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> @@ -313,25 +260,10 @@ reversal capabilities). - - - - MS Shell Dlg 2 - 8 - - - + - - - FreeSans - 10 - 75 - true - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> @@ -346,12 +278,6 @@ p, li { white-space: pre-wrap; } - - - FreeSans - 8 - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> @@ -389,12 +315,6 @@ p, li { white-space: pre-wrap; } - - - FreeSans - 8 - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> @@ -421,25 +341,10 @@ reversal capabilities). - - - - MS Shell Dlg 2 - 8 - - - + - - - FreeSans - 10 - 75 - true - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> @@ -454,12 +359,6 @@ p, li { white-space: pre-wrap; } - - - FreeSans - 8 - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> @@ -497,12 +396,6 @@ p, li { white-space: pre-wrap; } - - - FreeSans - 8 - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> @@ -529,25 +422,10 @@ reversal capabilities). - - - - MS Shell Dlg 2 - 8 - - - + - - - FreeSans - 10 - 75 - true - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> @@ -562,12 +440,6 @@ p, li { white-space: pre-wrap; } - - - FreeSans - 8 - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> @@ -605,12 +477,6 @@ p, li { white-space: pre-wrap; } - - - FreeSans - 8 - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> @@ -637,25 +503,10 @@ reversal capabilities). - - - - MS Shell Dlg 2 - 8 - - - + - - - FreeSans - 10 - 75 - true - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> @@ -670,12 +521,6 @@ p, li { white-space: pre-wrap; } - - - FreeSans - 8 - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> @@ -713,12 +558,6 @@ p, li { white-space: pre-wrap; } - - - FreeSans - 8 - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> @@ -745,25 +584,10 @@ reversal capabilities). - - - - MS Shell Dlg 2 - 8 - - - + - - - FreeSans - 10 - 75 - true - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> @@ -778,12 +602,6 @@ p, li { white-space: pre-wrap; } - - - FreeSans - 8 - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> @@ -821,12 +639,6 @@ p, li { white-space: pre-wrap; } - - - FreeSans - 8 - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> @@ -853,25 +665,10 @@ reversal capabilities). - - - - MS Shell Dlg 2 - 8 - - - + - - - FreeSans - 10 - 75 - true - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> @@ -886,12 +683,6 @@ p, li { white-space: pre-wrap; } - - - FreeSans - 8 - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> @@ -929,12 +720,6 @@ p, li { white-space: pre-wrap; } - - - FreeSans - 8 - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> @@ -960,14 +745,41 @@ reversal capabilities). - - + + 75 true + + BEWARE: make sure your engines are not connected when running calibration! + + + + + + + + + 75 + true + + + + + + + + + + + + 50 + false + + Start calibrating the RC Inputs. Uncheck/Check to restart calibration. @@ -980,30 +792,6 @@ Neutral should be put at the bottom of the slider for the throttle. - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt; font-weight:600; color:#ff0000;">BEWARE: make sure your engines are not connected when running calibration!</span></p></body></html> - - - - - - - - 75 - true - - - - - - - @@ -1166,9 +954,9 @@ p, li { white-space: pre-wrap; } 100 - 50 + 55 151 - 31 + 26 @@ -1176,9 +964,9 @@ p, li { white-space: pre-wrap; } 100 - 20 + 25 151 - 31 + 26 @@ -1202,9 +990,9 @@ p, li { white-space: pre-wrap; } 100 - 80 + 85 151 - 31 + 26 @@ -1270,7 +1058,7 @@ if you have not done so already. QSlider::TicksBelow - 66 + 100 @@ -1465,7 +1253,6 @@ Applies and Saves all settings to SD ch6Assign ch7Assign receiverType - doRCInputCalibration fmsSlider fmsModePos3 fmsSsPos3Roll diff --git a/ground/openpilotgcs/src/plugins/config/output.ui b/ground/openpilotgcs/src/plugins/config/output.ui index 0084d11ed..9c1fdacca 100644 --- a/ground/openpilotgcs/src/plugins/config/output.ui +++ b/ground/openpilotgcs/src/plugins/config/output.ui @@ -7,7 +7,7 @@ 0 0 659 - 511 + 523 @@ -223,11 +223,6 @@ Leave at 50Hz for fixed wing. true - - - 8 - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> @@ -258,11 +253,6 @@ p, li { white-space: pre-wrap; } true - - - 8 - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> @@ -341,11 +331,6 @@ p, li { white-space: pre-wrap; } true - - - 8 - - 9999 @@ -369,11 +354,6 @@ p, li { white-space: pre-wrap; } true - - - 8 - - 9999 @@ -428,11 +408,6 @@ p, li { white-space: pre-wrap; } true - - - 8 - - 9999 @@ -456,11 +431,6 @@ p, li { white-space: pre-wrap; } true - - - 8 - - 9999 @@ -515,11 +485,6 @@ p, li { white-space: pre-wrap; } true - - - 8 - - 9999 @@ -543,11 +508,6 @@ p, li { white-space: pre-wrap; } true - - - 8 - - 9999 @@ -599,11 +559,6 @@ p, li { white-space: pre-wrap; } - - - 8 - - 9999 @@ -621,11 +576,6 @@ p, li { white-space: pre-wrap; } - - - 8 - - 9999 @@ -677,11 +627,6 @@ p, li { white-space: pre-wrap; } - - - 8 - - 9999 @@ -699,11 +644,6 @@ p, li { white-space: pre-wrap; } - - - 8 - - 9999 @@ -762,11 +702,6 @@ p, li { white-space: pre-wrap; } - - - 8 - - 9999 @@ -784,11 +719,6 @@ p, li { white-space: pre-wrap; } - - - 8 - - 9999 @@ -833,11 +763,6 @@ p, li { white-space: pre-wrap; } - - - 8 - - 9999 @@ -855,11 +780,6 @@ p, li { white-space: pre-wrap; } - - - 8 - - 9999 diff --git a/ground/openpilotgcs/src/plugins/config/stabilization.ui b/ground/openpilotgcs/src/plugins/config/stabilization.ui index 120695b96..5d6316303 100644 --- a/ground/openpilotgcs/src/plugins/config/stabilization.ui +++ b/ground/openpilotgcs/src/plugins/config/stabilization.ui @@ -7,7 +7,7 @@ 0 0 639 - 461 + 611 @@ -15,470 +15,446 @@ - - - - - - - - - - - 75 - true - - - - Rate Stabilization (inner loop) - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Hint: read the tooltips! - - - - - - - - - First, work on rate stabilization. - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - - Roll - - - - - - - Slowly raise Kp until you start seeing clear oscillations when you fly. + + + + 0 + 0 + + + + + 0 + 150 + + + + Rate Stabilization Coefficients (Inner Loop) + + + + + + Kp + + + Qt::AlignCenter + + + + + + + Ki + + + Qt::AlignCenter + + + + + + + ILimit + + + Qt::AlignCenter + + + + + + + Roll + + + + + + + Slowly raise Kp until you start seeing clear oscillations when you fly. Then lower the value by 20% or so. - - - 6 - - - 0.000100000000000 - - - - - - - Pitch - - - - - - - Slowly raise Kp until you start seeing clear oscillations when you fly. -Then lower the value by 20% or so. - - - 6 - - - 0.000100000000000 - - - - - - - Kp - - - Qt::AlignCenter - - - - - - - I factor for rate stabilization is usually very low or even zero. - - - 6 - - - 0.000100000000000 - - - - - - - I factor for rate stabilization is usually very low or even zero. - - - 6 - - - 0.000100000000000 - - - - - - - Ki - - - Qt::AlignCenter - - - - - - - 6 - - - 0.000100000000000 - - - - - - - 6 - - - 0.000100000000000 - - - - - - - ILimit - - - Qt::AlignCenter - - - - - - - If checked, the Roll and Pitch factors will be identical. + + + 6 + + + 0.000100000000000 + + + + + + + I factor for rate stabilization is usually very low or even zero. + + + 6 + + + 0.000100000000000 + + + + + + + 6 + + + 0.000100000000000 + + + + + + + If checked, the Roll and Pitch factors will be identical. When you change one, the other is updated. - - - Link - - - - - - - Yaw - - - - - - - Slowly raise Kp until you start seeing clear oscillations when you fly. + + + Link + + + + + + + Pitch + + + + + + + Slowly raise Kp until you start seeing clear oscillations when you fly. +Then lower the value by 20% or so. + + + 6 + + + 0.000100000000000 + + + + + + + I factor for rate stabilization is usually very low or even zero. + + + 6 + + + 0.000100000000000 + + + + + + + 6 + + + 0.000100000000000 + + + + + + + Yaw + + + + + + + Slowly raise Kp until you start seeing clear oscillations when you fly. Then lower the value by 20% or so. You can usually go for higher values for Yaw factors. - - - 6 - - - 0.000100000000000 - - - - - - - As a rule of thumb, you can set YawRate Ki at roughly the same -value as YawRate Kp. - - - 6 - - - 0.000100000000000 - - - - - - - 6 - - - 0.000100000000000 - - - - - - - - - - - - - 75 - true - - - - Attitude Stabilization (outer loop) - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - - If checked, the Roll and Pitch factors will be identical. -When you change one, the other is updated. - - - Link - - - - - - - Roll - - - - - - - Pitch - - - - - - - Yaw - - - - - - - Once Rate stabilization is done, you should increase the Kp factor until the airframe oscillates again, and go back down 20% or so. - - - - 6 - - - 0.100000000000000 - - - - - - - Once Rate stabilization is done, you should increase the Kp factor until the airframe oscillates again, and go back down 20% or so. - - - - 6 - - - 0.100000000000000 - - - - - - - Once Rate stabilization is done, you should increase the Kp factor until the airframe oscillates again, and go back down 20% or so. - - - - 6 - - - 0.100000000000000 - - - - - - - Ki can usually be almost identical to Kp. - - - 6 - - - 0.100000000000000 - - - - - - - Ki can usually be almost identical to Kp. - - - 6 - - - 0.100000000000000 - - - - - - - Ki can usually be almost identical to Kp. - - - 6 - - - 0.100000000000000 - - - - - - - ILimit can be equal to three to four times Ki, but you can adjust -depending on whether your airframe is well balanced, and your -flying style. - - - 6 - - - 0.100000000000000 - - - - - - - ILimit can be equal to three to four times Ki, but you can adjust -depending on whether your airframe is well balanced, and your -flying style. - - - 6 - - - 0.100000000000000 - - - - - - - ILimit can be equal to three to four times Ki, but you can adjust -depending on whether your airframe is well balanced, and your -flying style. - - - 6 - - - 0.100000000000000 - - - - - - - Kp - - - Qt::AlignCenter - - - - - - - Ki - - - Qt::AlignCenter - - - - - - - ILimit - - - Qt::AlignCenter - - - - - - - + + + 6 + + + 0.000100000000000 + + + + + + As a rule of thumb, you can set YawRate Ki at roughly the same +value as YawRate Kp. + + + 6 + + + 0.000100000000000 + + + + + + + 6 + + + 0.000100000000000 + + + + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 5 + + + + + + + + + 0 + 0 + + + + + 0 + 150 + + + + Attitude Stabization Coefficients (Outer Loop) + + + + + + Once Rate stabilization is done, you should increase the Kp factor until the airframe oscillates again, and go back down 20% or so. + + + + 6 + + + 0.100000000000000 + + + + + + + Ki can usually be almost identical to Kp. + + + 6 + + + 0.100000000000000 + + + + + + + ILimit can be equal to three to four times Ki, but you can adjust +depending on whether your airframe is well balanced, and your +flying style. + + + 6 + + + 0.100000000000000 + + + + + + + Kp + + + Qt::AlignCenter + + + + + + + Ki + + + Qt::AlignCenter + + + + + + + ILimit + + + Qt::AlignCenter + + + + + + + ILimit can be equal to three to four times Ki, but you can adjust +depending on whether your airframe is well balanced, and your +flying style. + + + 6 + + + 0.100000000000000 + + + + + + + Ki can usually be almost identical to Kp. + + + 6 + + + 0.100000000000000 + + + + + + + Once Rate stabilization is done, you should increase the Kp factor until the airframe oscillates again, and go back down 20% or so. + + + + 6 + + + 0.100000000000000 + + + + + + + Once Rate stabilization is done, you should increase the Kp factor until the airframe oscillates again, and go back down 20% or so. + + + + 6 + + + 0.100000000000000 + + + + + + + Yaw + + + + + + + Pitch + + + + + + + Roll + + + + + + + Ki can usually be almost identical to Kp. + + + 6 + + + 0.100000000000000 + + + + + + + ILimit can be equal to three to four times Ki, but you can adjust +depending on whether your airframe is well balanced, and your +flying style. + + + 6 + + + 0.100000000000000 + + + + + + + If checked, the Roll and Pitch factors will be identical. +When you change one, the other is updated. + + + Link + + + + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 10 + + + + + + +