diff --git a/ground/openpilotgcs/src/plugins/config/airframe.ui b/ground/openpilotgcs/src/plugins/config/airframe.ui index 343581f3c..00268ff57 100644 --- a/ground/openpilotgcs/src/plugins/config/airframe.ui +++ b/ground/openpilotgcs/src/plugins/config/airframe.ui @@ -73,8 +73,25 @@ + + #groupBox,#groupBox_2,#groupBox_3,#groupBox_6,#elevonMixBox{ +background-color: qlineargradient(spread:pad, x1:0.507, y1:0.869318, x2:0.507, y2:0.0965909, stop:0 rgba(243, 243, 243, 255), stop:1 rgba(250, 250, 250, 255)); +border: 1px outset #999; +border-radius: 3; +font:bold; +} + +QGroupBox::title { + subcontrol-origin: margin; + subcontrol-position: top center; /* position at the top center */ + padding: 0 3px; + background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, + stop: 0 #FFOECE, stop: 1 #FFFFFF); + top: 5px; + } + - 1 + 2 @@ -126,34 +143,7 @@ - - - - - - 75 - true - - - - Channel Assignment - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - + @@ -167,29 +157,29 @@ - 0 + 230 100 - Output channel assignments + Output Channel Assignments - + Engine - + Select output channel for the engine - + @@ -202,14 +192,14 @@ - + Select output channel for the first aileron (or elevon) - + false @@ -225,7 +215,7 @@ - + false @@ -235,7 +225,7 @@ - + @@ -248,14 +238,14 @@ - + Select output channel for the first elevator - + false @@ -271,7 +261,7 @@ - + false @@ -281,34 +271,47 @@ - + Rudder 1 - + Select output channel for the first rudder - + Rudder 2 - + Select output channel for a secondary rudder + + + + Qt::Vertical + + + + 20 + 20 + + + + @@ -324,6 +327,22 @@ Elevon Mix + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 0 + 20 + + + + @@ -336,13 +355,29 @@ 0 + + 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 12px; +margin:1px; + Rudder % + + Qt::AlignCenter + + + + 0 + 0 + + 100 @@ -359,6 +394,9 @@ 50 + + Qt::AlignCenter + @@ -373,13 +411,29 @@ 0 + + 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 12px; +margin:1px; + Pitch % + + Qt::AlignCenter + + + + 0 + 0 + + 100 @@ -396,6 +450,9 @@ 50 + + Qt::AlignCenter + @@ -430,6 +487,22 @@ Throttle Curve + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 20 + + + + @@ -636,6 +709,13 @@ Typical values are 100% for + configuration and 50% for X configuration on quads + + 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 12px; +margin:1px; + R @@ -677,6 +757,13 @@ Typical values are 100% for + configuration and 50% for X configuration on quads + + 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 12px; +margin:1px; + P @@ -724,6 +811,13 @@ Typical value is 50% for + or X configuration on quads. false + + 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 12px; +margin:1px; + Y @@ -786,6 +880,22 @@ Typical value is 50% for + or X configuration on quads. Throtte Curve + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 10 + + + + @@ -869,6 +979,13 @@ Typical value is 50% for + or X configuration on quads. + + 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 12px; +margin:1px; + channel: @@ -928,62 +1045,106 @@ Typical value is 50% for + or X configuration on quads. 3 - + + + 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 12px; +margin:1px; + 1 - + Assign your motor output channels using the drawing above as a reference. Respect propeller rotation. - + + + 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 12px; +margin:1px; + 2 - + Assign your motor output channels using the drawing above as a reference. Respect propeller rotation. - + + + 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 12px; +margin:1px; + 3 - + Assign your motor output channels using the drawing above as a reference. Respect propeller rotation. - + + + 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 12px; +margin:1px; + 4 - + Assign your motor output channels using the drawing above as a reference. Respect propeller rotation. + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 0 + 20 + + + + @@ -994,14 +1155,21 @@ Typical value is 50% for + or X configuration on quads. 3 - + + + 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 12px; +margin:1px; + 5 - + false @@ -1017,14 +1185,21 @@ Typical value is 50% for + or X configuration on quads. - + + + 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 12px; +margin:1px; + 6 - + false @@ -1034,14 +1209,21 @@ Typical value is 50% for + or X configuration on quads. - + + + 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 12px; +margin:1px; + 7 - + false @@ -1051,14 +1233,21 @@ Typical value is 50% for + or X configuration on quads. - + + + 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 12px; +margin:1px; + 8 - + false @@ -1068,6 +1257,22 @@ Typical value is 50% for + or X configuration on quads. + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 20 + + + + @@ -2013,12 +2218,12 @@ 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:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; 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-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 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-family:'Lucida Grande'; font-size:13pt;">Beware: Feed Forward Tuning will launch all engines around mid-throttle, you have been warned!</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Lucida Grande'; font-size:13pt;">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> diff --git a/ground/openpilotgcs/src/plugins/config/camerastabilization.ui b/ground/openpilotgcs/src/plugins/config/camerastabilization.ui index fb27f1654..b734ce54f 100644 --- a/ground/openpilotgcs/src/plugins/config/camerastabilization.ui +++ b/ground/openpilotgcs/src/plugins/config/camerastabilization.ui @@ -16,6 +16,23 @@ + + #groupBox_5,#groupBox{ +background-color: qlineargradient(spread:pad, x1:0.507, y1:0.869318, x2:0.507, y2:0.0965909, stop:0 rgba(243, 243, 243, 255), stop:1 rgba(250, 250, 250, 255)); +border: 1px outset #999; +border-radius: 3; +font:bold; +} + +QGroupBox::title { + subcontrol-origin: margin; + subcontrol-position: top center; /* position at the top center */ + padding: 0 3px; + background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, + stop: 0 #FFOECE, stop: 1 #FFFFFF); + top: 5px; + } + QFrame::NoFrame @@ -28,7 +45,7 @@ 0 0 702 - 488 + 484 @@ -87,7 +104,7 @@ Basic Settings (Stabilization) - + Camera yaw angle for 100% output value, deg. @@ -103,7 +120,7 @@ have to define channel output range using Output configuration tab. - + Camera pitch angle for 100% output value, deg. @@ -119,7 +136,7 @@ have to define channel output range using Output configuration tab. - + Camera roll angle for 100% output value, deg. @@ -135,7 +152,7 @@ have to define channel output range using Output configuration tab. - + Yaw output channel for camera gimbal @@ -147,7 +164,7 @@ have to define channel output range using Output configuration tab. - + Pitch output channel for camera gimbal @@ -159,7 +176,7 @@ have to define channel output range using Output configuration tab. - + Roll output channel for camera gimbal @@ -171,22 +188,29 @@ have to define channel output range using Output configuration tab. - + Output Channel - + Output Range - + + + 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 12px; +margin:1px; + Yaw @@ -195,8 +219,15 @@ have to define channel output range using Output configuration tab. - + + + 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 12px; +margin:1px; + Pitch @@ -205,8 +236,15 @@ have to define channel output range using Output configuration tab. - + + + 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 12px; +margin:1px; + Roll @@ -215,6 +253,19 @@ have to define channel output range using Output configuration tab. + + + + Qt::Vertical + + + + 20 + 40 + + + + @@ -252,8 +303,15 @@ have to define channel output range using Output configuration tab. Advanced Settings (Control) - + + + 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 12px; +margin:1px; + Yaw @@ -262,8 +320,15 @@ have to define channel output range using Output configuration tab. - + + + 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 12px; +margin:1px; + Pitch @@ -272,8 +337,15 @@ have to define channel output range using Output configuration tab. - + + + 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 12px; +margin:1px; + Roll @@ -282,7 +354,7 @@ have to define channel output range using Output configuration tab. - + Input channel to control camera yaw @@ -296,7 +368,7 @@ Don't forget to map this channel using Input configuration tab. - + Input channel to control camera pitch @@ -310,7 +382,7 @@ Don't forget to map this channel using Input configuration tab. - + Input channel to control camera roll @@ -324,14 +396,14 @@ Don't forget to map this channel using Input configuration tab. - + Input Channel - + Axis stabilization mode @@ -346,7 +418,7 @@ AxisLock: camera remembers tracking attitude. Input controls the rate of deflect - + Maximum camera yaw deflection for 100% input in Attitude mode, deg. @@ -359,7 +431,7 @@ AxisLock: camera remembers tracking attitude. Input controls the rate of deflect - + Maximum camera yaw rate for 100% input in AxisLock mode, deg/s. @@ -372,7 +444,7 @@ AxisLock: camera remembers tracking attitude. Input controls the rate of deflect - + Input low-pass filter response time for yaw axis, ms. @@ -387,7 +459,7 @@ This option smoothes the stick input. Zero value disables LPF. - + Axis stabilization mode @@ -402,7 +474,7 @@ AxisLock: camera remembers tracking attitude. Input controls the rate of deflect - + Maximum camera pitch deflection for 100% input in Attitude mode, deg. @@ -415,7 +487,7 @@ AxisLock: camera remembers tracking attitude. Input controls the rate of deflect - + Maximum camera pitch rate for 100% input in AxisLock mode, deg/s. @@ -428,7 +500,7 @@ AxisLock: camera remembers tracking attitude. Input controls the rate of deflect - + Input low-pass filter response time for pitch axis, ms. @@ -443,7 +515,7 @@ This option smoothes the stick input. Zero value disables LPF. - + Axis stabilization mode @@ -458,7 +530,7 @@ AxisLock: camera remembers tracking attitude. Input controls the rate of deflect - + Maximum camera roll deflection for 100% input in Attitude mode, deg. @@ -471,7 +543,7 @@ AxisLock: camera remembers tracking attitude. Input controls the rate of deflect - + Maximum camera roll rate for 100% input in AxisLock mode, deg/s. @@ -484,7 +556,7 @@ AxisLock: camera remembers tracking attitude. Input controls the rate of deflect - + Input low-pass filter response time for roll axis, ms. @@ -499,49 +571,49 @@ This option smoothes the stick input. Zero value disables LPF. - + MaxAxisLockRate - + Response Time - + Input Rate - + Input Range - + Stabilization Mode - + (the same value for Roll, Pitch, Yaw) - + Stick input deadband for all axes in AxisLock mode, deg/s. @@ -564,6 +636,19 @@ value. + + + + Qt::Vertical + + + + 20 + 40 + + + + diff --git a/ground/openpilotgcs/src/plugins/config/ccpm.ui b/ground/openpilotgcs/src/plugins/config/ccpm.ui index 77e33e8ca..8bb8a4e27 100644 --- a/ground/openpilotgcs/src/plugins/config/ccpm.ui +++ b/ground/openpilotgcs/src/plugins/config/ccpm.ui @@ -6,7 +6,7 @@ 0 0 - 660 + 850 572 @@ -69,6 +69,23 @@ 300 + + #SwashplateBox,#SwashplateBox_2,#SwashplateBox_3,#SwashplateBox_4,#ccpmSwashImageBox,#SwashLvlInstructionsBox,#SwashLvlccpmSwashImageBox,#SwashLvlccpmSliderBox,#SwashLvlStatusBox,#ThrottleCurveBox,#PitchCurveBox{ +background-color: qlineargradient(spread:pad, x1:0.507, y1:0.869318, x2:0.507, y2:0.0965909, stop:0 rgba(243, 243, 243, 255), stop:1 rgba(250, 250, 250, 255)); +border: 1px outset #999; +border-radius: 3; +font:bold; +} + +QGroupBox::title { + subcontrol-origin: margin; + subcontrol-position: top center; /* position at the top center */ + padding: 0 3px; + background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, + stop: 0 #FFOECE, stop: 1 #FFFFFF); + top: 5px; + } + 0 @@ -215,6 +232,22 @@ + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 20 + + + + @@ -245,7 +278,7 @@ 3 - + true @@ -273,7 +306,7 @@ - + true @@ -298,7 +331,7 @@ - + @@ -320,7 +353,7 @@ - + true @@ -345,7 +378,7 @@ - + @@ -370,7 +403,7 @@ - + @@ -412,7 +445,7 @@ - + @@ -437,7 +470,7 @@ - + @@ -459,7 +492,7 @@ - + @@ -484,7 +517,7 @@ - + true @@ -512,6 +545,22 @@ + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 20 + + + + @@ -548,7 +597,7 @@ 3 - + @@ -579,7 +628,7 @@ - + true @@ -607,7 +656,7 @@ - + @@ -632,7 +681,7 @@ - + true @@ -660,7 +709,7 @@ - + @@ -685,7 +734,7 @@ - + true @@ -716,7 +765,7 @@ - + @@ -747,7 +796,7 @@ - + true @@ -781,7 +830,7 @@ - + @@ -812,7 +861,7 @@ - + @@ -843,6 +892,22 @@ + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 20 + + + + @@ -873,14 +938,14 @@ 3 - + Collective Pass through - + Link Roll/Pitch @@ -890,7 +955,7 @@ - + Link Cyclic/Collective @@ -900,6 +965,22 @@ + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 20 + + + + @@ -960,7 +1041,9 @@ - 11 + 75 + false + true @@ -982,7 +1065,7 @@ 3 - + Qt::Vertical @@ -1068,6 +1151,22 @@ + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 20 + + + + @@ -1107,6 +1206,21 @@ 600 + + + 9 + 75 + true + + + + QGroupBox::title { + 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; +margin:1px; + } + REVO @@ -1117,6 +1231,22 @@ 3 + + + + Qt::Vertical + + + QSizePolicy::Minimum + + + + 20 + 7 + + + + @@ -1230,7 +1360,7 @@ - 50 + 60 100 @@ -1240,6 +1370,21 @@ 600 + + + 9 + 75 + true + + + + QGroupBox::title { + 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; +margin:1px; + } + CCPM @@ -1253,6 +1398,22 @@ 3 + + + + Qt::Vertical + + + QSizePolicy::Minimum + + + + 20 + 7 + + + + @@ -1382,7 +1543,7 @@ - 50 + 70 100 @@ -1392,6 +1553,21 @@ 600 + + + 9 + 75 + true + + + + QGroupBox::title { + 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; +margin:1px; + } + Collective @@ -1405,6 +1581,22 @@ 3 + + + + Qt::Vertical + + + QSizePolicy::Minimum + + + + 20 + 7 + + + + @@ -1505,6 +1697,21 @@ 600 + + + 9 + 75 + true + + + + QGroupBox::title { + 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; +margin:1px; + } + Cyclic @@ -1521,6 +1728,22 @@ 3 + + + + Qt::Vertical + + + QSizePolicy::Minimum + + + + 20 + 7 + + + + @@ -1621,6 +1844,21 @@ 600 + + + 9 + 75 + true + + + + QGroupBox::title { + 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; +margin:1px; + } + Pitch @@ -1634,6 +1872,22 @@ 3 + + + + Qt::Vertical + + + QSizePolicy::Minimum + + + + 20 + 7 + + + + @@ -1734,6 +1988,21 @@ 600 + + + 9 + 75 + true + + + + QGroupBox::title { + 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; +margin:1px; + } + Roll @@ -1747,6 +2016,22 @@ 3 + + + + Qt::Vertical + + + QSizePolicy::Minimum + + + + 20 + 7 + + + + @@ -1865,6 +2150,22 @@ 3 + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 20 + + + + @@ -2087,6 +2388,22 @@ + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 20 + + + + @@ -2121,7 +2438,7 @@ - 50 + 70 100 @@ -2144,11 +2461,34 @@ 3 + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 20 + + + + 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 12px; +margin:1px; + Max @@ -2226,6 +2566,13 @@ 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 12px; +margin:1px; + Min @@ -2301,7 +2648,7 @@ 3 - + Qt::Vertical @@ -2390,6 +2737,22 @@ + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 20 + + + + @@ -2507,6 +2870,13 @@ + + 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 12px; +margin:1px; + Min @@ -2514,6 +2884,13 @@ + + 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 12px; +margin:1px; + Max @@ -2521,6 +2898,13 @@ + + 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 12px; +margin:1px; + Step point diff --git a/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp b/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp index 2789e8967..724057645 100644 --- a/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp @@ -70,7 +70,6 @@ ConfigInputWidget::ConfigInputWidget(QWidget *parent) : ConfigTaskWidget(parent) addUAVObjectToWidgetRelation("ManualControlSettings","ChannelMax",inp->ui->channelMax,index); ++index; } - connect(m_config->configurationWizard,SIGNAL(clicked()),this,SLOT(goToWizard())); connect(m_config->runCalibration,SIGNAL(toggled(bool)),this, SLOT(simpleCalibration(bool))); diff --git a/ground/openpilotgcs/src/plugins/config/input.ui b/ground/openpilotgcs/src/plugins/config/input.ui index 5b591089f..693c284ba 100644 --- a/ground/openpilotgcs/src/plugins/config/input.ui +++ b/ground/openpilotgcs/src/plugins/config/input.ui @@ -16,6 +16,23 @@ + + #groupBox_2,#groupBox{ +background-color: qlineargradient(spread:pad, x1:0.507, y1:0.869318, x2:0.507, y2:0.0965909, stop:0 rgba(243, 243, 243, 255), stop:1 rgba(250, 250, 250, 255)); +border: 1px outset #999; +border-radius: 3; +font:bold; +} + +QGroupBox::title { + subcontrol-origin: margin; + subcontrol-position: top center; /* position at the top center */ + padding: 0 3px; + background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, + stop: 0 #FFOECE, stop: 1 #FFFFFF); + top: 5px; + } + 0 @@ -132,25 +149,6 @@ Flight Mode Switch Settings - - - - 310 - 10 - 201 - 17 - - - - - 75 - true - - - - Warning: avoid "Manual" - - @@ -174,46 +172,36 @@ 30 - 130 - 445 - 155 + 160 + 451 + 141 + + + Configure each stabilization mode for each axis - - - - Roll - - - Qt::AlignBottom|Qt::AlignHCenter - - - - - - - Pitch - - - Qt::AlignBottom|Qt::AlignHCenter - - - - + + + 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 12px; +margin:1px; + Yaw - Qt::AlignBottom|Qt::AlignHCenter + Qt::AlignCenter - + Stabilized1 @@ -223,16 +211,37 @@ - - + + + + + 102 + 0 + + + - - + + + + + 102 + 0 + + + - - + + + + + 102 + 0 + + + - + Stabilized2 @@ -242,16 +251,16 @@ - + - + - + - + Stabilized3 @@ -261,26 +270,76 @@ - + - + - + + + + + 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 12px; +margin:1px; + + + Roll + + + Qt::AlignCenter + + + + + + + Qt::Vertical + + + + 20 + 20 + + + + + + + + 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 12px; +margin:1px; + + + Pitch + + + Qt::AlignCenter + + + 30 - 0 - 261 + 30 + 451 121 + + + FlightMode Switch Positions @@ -395,6 +454,28 @@ if you have not done so already. 100 + + + + 270 + 30 + 141 + 31 + + + + + 75 + true + + + + Warning: avoid "Manual" + + + true + + diff --git a/ground/openpilotgcs/src/plugins/config/inputchannelform.cpp b/ground/openpilotgcs/src/plugins/config/inputchannelform.cpp index b8faa0fcb..095575eb1 100644 --- a/ground/openpilotgcs/src/plugins/config/inputchannelform.cpp +++ b/ground/openpilotgcs/src/plugins/config/inputchannelform.cpp @@ -23,6 +23,7 @@ inputChannelForm::inputChannelForm(QWidget *parent,bool showlegend) : delete ui->legend4; delete ui->legend5; } + connect(ui->channelMin,SIGNAL(valueChanged(int)),this,SLOT(minMaxUpdated())); connect(ui->channelMax,SIGNAL(valueChanged(int)),this,SLOT(minMaxUpdated())); connect(ui->channelGroup,SIGNAL(currentIndexChanged(int)),this,SLOT(groupUpdated())); diff --git a/ground/openpilotgcs/src/plugins/config/inputchannelform.ui b/ground/openpilotgcs/src/plugins/config/inputchannelform.ui index 6e3395aab..e609a51ca 100644 --- a/ground/openpilotgcs/src/plugins/config/inputchannelform.ui +++ b/ground/openpilotgcs/src/plugins/config/inputchannelform.ui @@ -6,8 +6,8 @@ 0 0 - 543 - 49 + 767 + 58 @@ -36,7 +36,7 @@ - 10 + 80 0 @@ -92,28 +92,31 @@ true + + + 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; +margin:5px; +font:bold; + Function - - - - - - true - - - Number - - - - - - - true - - - Type + + Qt::AlignCenter @@ -122,9 +125,32 @@ true + + + 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; +margin:5px; +font:bold; + Max + + Qt::AlignCenter + @@ -132,9 +158,32 @@ true + + + 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; +margin:5px; +font:bold; + Min + + Qt::AlignCenter + @@ -143,14 +192,31 @@ true - + 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; +margin:5px; +font:bold; + Neutral + + Qt::AlignCenter + @@ -265,6 +331,72 @@ + + + + true + + + + 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; +margin:5px; +font:bold; + + + Number + + + Qt::AlignCenter + + + + + + + true + + + + 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; +margin:5px; +font:bold; + + + Type + + + Qt::AlignCenter + + + diff --git a/ground/openpilotgcs/src/plugins/config/outputchannelform.ui b/ground/openpilotgcs/src/plugins/config/outputchannelform.ui index cb1fd73f2..622b76c5d 100644 --- a/ground/openpilotgcs/src/plugins/config/outputchannelform.ui +++ b/ground/openpilotgcs/src/plugins/config/outputchannelform.ui @@ -6,7 +6,7 @@ 0 0 - 605 + 813 56 @@ -58,7 +58,7 @@ - 90 + 110 0 @@ -190,9 +190,26 @@ 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 + @@ -203,22 +220,56 @@ 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 + @@ -229,47 +280,86 @@ 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 - - - 25 - 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 - - - 25 - 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; Link + + Qt::AlignCenter + @@ -296,20 +386,28 @@ 0 - - - 20 - 0 - + + + 75 + false + true + Qt::LeftToRight + + 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; + # - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignCenter 0 diff --git a/ground/openpilotgcs/src/plugins/config/stabilization.ui b/ground/openpilotgcs/src/plugins/config/stabilization.ui index 8e70bde12..7aa5d053b 100755 --- a/ground/openpilotgcs/src/plugins/config/stabilization.ui +++ b/ground/openpilotgcs/src/plugins/config/stabilization.ui @@ -11753,7 +11753,7 @@ border-radius: 4; 0 - -402 + 0 626 1026 diff --git a/ground/openpilotgcs/src/plugins/config/txpid.ui b/ground/openpilotgcs/src/plugins/config/txpid.ui index 7931315f0..3bfce4cd7 100644 --- a/ground/openpilotgcs/src/plugins/config/txpid.ui +++ b/ground/openpilotgcs/src/plugins/config/txpid.ui @@ -28,7 +28,7 @@ 0 0 702 - 497 + 489 @@ -93,12 +93,36 @@ Up to 3 separate PID options (or option pairs) can be selected and updated.100 + + #groupBox_6{ +background-color: qlineargradient(spread:pad, x1:0.507, y1:0.869318, x2:0.507, y2:0.0965909, stop:0 rgba(243, 243, 243, 255), stop:1 rgba(250, 250, 250, 255)); +border: 1px outset #999; +border-radius: 3; +font:bold; +} + +QGroupBox::title { + subcontrol-origin: margin; + subcontrol-position: top center; /* position at the top center */ + padding: 0 3px; + background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, + stop: 0 #FFOECE, stop: 1 #FFFFFF); + top: 5px; + } + Module Settings - + + + 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 12px; +margin:1px; + PID option @@ -107,8 +131,15 @@ Up to 3 separate PID options (or option pairs) can be selected and updated. - + + + 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 12px; +margin:1px; + Control Source @@ -117,8 +148,15 @@ Up to 3 separate PID options (or option pairs) can be selected and updated. - + + + 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 12px; +margin:1px; + Min @@ -127,8 +165,15 @@ Up to 3 separate PID options (or option pairs) can be selected and updated. - + + + 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 12px; +margin:1px; + Max @@ -137,14 +182,14 @@ Up to 3 separate PID options (or option pairs) can be selected and updated. - + Instance 1 - + Select PID option or option pair to update. @@ -152,7 +197,7 @@ Set to Disabled if not used. - + Select input used as a control source for this instance. @@ -172,7 +217,7 @@ used, for instance, to decrease PID value when increasing Throttle. - + Minimum PID value mapped to Accessory channel = 0 or @@ -186,7 +231,7 @@ Throttle channel lesser or equal to Throttle Min value. - + Maximum PID value mapped to Accessory channel = 1 or @@ -200,14 +245,14 @@ Throttle channel greater or equal to Throttle Max value. - + Instance 2 - + Select PID option or option pair to update. @@ -215,7 +260,7 @@ Set to Disabled if not used. - + Select input used as a control source for this instance. @@ -235,7 +280,7 @@ used, for instance, to decrease PID value when increasing Throttle. - + Minimum PID value mapped to Accessory channel = 0 or @@ -249,7 +294,7 @@ Throttle channel lesser or equal to Throttle Min value. - + Maximum PID value mapped to Accessory channel = 1 or @@ -263,14 +308,14 @@ Throttle channel greater or equal to Throttle Max value. - + Instance 3 - + Select PID option or option pair to update. @@ -278,7 +323,7 @@ Set to Disabled if not used. - + Select input used as a control source for this instance. @@ -298,7 +343,7 @@ used, for instance, to decrease PID value when increasing Throttle. - + Minimum PID value mapped to Accessory channel = 0 or @@ -312,7 +357,7 @@ Throttle channel lesser or equal to Throttle Min value. - + Maximum PID value mapped to Accessory channel = 1 or @@ -326,14 +371,14 @@ Throttle channel greater or equal to Throttle Max value. - + Update Mode - + PID values update mode which can be set to: @@ -349,14 +394,14 @@ only when system is armed without disabling the module. - + Throttle Range - + Throttle channel lower bound mapped to PID Min value @@ -369,7 +414,7 @@ only when system is armed without disabling the module. - + Throttle channel upper bound mapped to PID Max value @@ -382,8 +427,15 @@ only when system is armed without disabling the module. - + + + 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 12px; +margin:1px; + Min @@ -392,8 +444,15 @@ only when system is armed without disabling the module. - + + + 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 12px; +margin:1px; + Max @@ -402,7 +461,20 @@ only when system is armed without disabling the module. - + + + + Qt::Vertical + + + + 20 + 20 + + + + + Qt::Vertical @@ -413,7 +485,7 @@ only when system is armed without disabling the module. 20 - 5 + 20