diff --git a/ground/openpilotgcs/src/plugins/config/camerastabilization.ui b/ground/openpilotgcs/src/plugins/config/camerastabilization.ui index e71d0c5b4..14f2aa74a 100755 --- a/ground/openpilotgcs/src/plugins/config/camerastabilization.ui +++ b/ground/openpilotgcs/src/plugins/config/camerastabilization.ui @@ -6,22 +6,37 @@ 0 0 - 789 - 615 + 942 + 692 + + + 0 + 0 + + + + + 0 + 0 + + Form - - 6 - 12 + + + 0 + 0 + + 0 @@ -35,6 +50,12 @@ + + + 0 + 0 + + QFrame::NoFrame @@ -46,19 +67,37 @@ 0 0 - 742 - 560 + 912 + 598 - 6 + 12 12 + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + Module Control @@ -86,7 +125,7 @@ - + 0 0 @@ -94,7 +133,13 @@ 0 - 131 + 130 + + + + + 16777215 + 16777215 @@ -340,7 +385,7 @@ margin:1px; - + 0 0 @@ -348,13 +393,22 @@ margin:1px; 0 - 266 + 250 + + + + + 16777215 + 16777215 Advanced Settings (Control) + + -1 + @@ -924,6 +978,18 @@ value. + + + 0 + 71 + + + + + 16777215 + 16777215 + + Messages @@ -946,6 +1012,9 @@ value. Qt::Vertical + + QSizePolicy::Expanding + 20 diff --git a/ground/openpilotgcs/src/plugins/config/input.ui b/ground/openpilotgcs/src/plugins/config/input.ui index 1e5ff4e4e..212b33f5f 100755 --- a/ground/openpilotgcs/src/plugins/config/input.ui +++ b/ground/openpilotgcs/src/plugins/config/input.ui @@ -6,8 +6,8 @@ 0 0 - 680 - 671 + 880 + 613 @@ -20,7 +20,7 @@ - 0 + 1 @@ -107,17 +107,17 @@ 0 0 - 650 - 571 + 824 + 513 - - 6 - 12 + + 6 + @@ -508,26 +508,297 @@ 0 0 - 650 - 571 + 852 + 521 - + 12 + + + + + + + Configure each stabilization mode for each axis + + + + 12 + + + 9 + + + + + Qt::Horizontal + + + QSizePolicy::Minimum + + + + 5 + 20 + + + + + + + + Qt::StrongFocus + + + + + + + + 0 + 20 + + + + + 16777215 + 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; + + + Yaw + + + Qt::AlignCenter + + + + + + + Qt::Horizontal + + + + 5 + 20 + + + + + + + + Stabilized1 + + + Qt::AlignCenter + + + + + + + Qt::Horizontal + + + + 5 + 20 + + + + + + + + Qt::StrongFocus + + + + + + + Stabilized2 + + + Qt::AlignCenter + + + + + + + Qt::StrongFocus + + + + + + + Qt::StrongFocus + + + + + + + + 0 + 20 + + + + + 16777215 + 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 + + + + + + + + 0 + 20 + + + + + 16777215 + 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; + + + Roll + + + Qt::AlignCenter + + + + + + + Qt::StrongFocus + + + + + + + + 102 + 0 + + + + Qt::StrongFocus + + + + + + + Qt::StrongFocus + + + + + + + + 102 + 0 + + + + Qt::StrongFocus + + + + + + + + 102 + 0 + + + + Qt::StrongFocus + + + + + + + Stabilized3 + + + Qt::AlignCenter + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + 0 - 195 + 230 16777215 - 195 + 230 @@ -699,7 +970,7 @@ 16777215 - 140 + 160 @@ -742,6 +1013,9 @@ Setup the flight mode channel on the RC Input tab if you have not done so alread + + 3 + @@ -921,194 +1195,17 @@ channel value for each flight mode. Qt::Vertical + + QSizePolicy::Expanding + 20 - 100 + 20 - - - - - - - Configure each stabilization mode for each axis - - - - 0 - - - 12 - - - - - Stabilized3 - - - Qt::AlignCenter - - - - - - - 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 - - - - - - - - 102 - 0 - - - - Qt::StrongFocus - - - - - - - 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 - - - - - - - Qt::StrongFocus - - - - - - - Qt::StrongFocus - - - - - - - Qt::StrongFocus - - - - - - - Stabilized1 - - - Qt::AlignCenter - - - - - - - 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::AlignCenter - - - - - - - Qt::StrongFocus - - - - - - - - 102 - 0 - - - - Qt::StrongFocus - - - - - - - Qt::StrongFocus - - - - - - - Qt::StrongFocus - - - - - - - Stabilized2 - - - Qt::AlignCenter - - - - - - - - 102 - 0 - - - - Qt::StrongFocus - - - - - - @@ -1200,8 +1297,8 @@ margin:1px; 0 0 - 650 - 571 + 824 + 513 diff --git a/ground/openpilotgcs/src/plugins/config/stabilization.ui b/ground/openpilotgcs/src/plugins/config/stabilization.ui index 6777d0800..f56c8348e 100755 --- a/ground/openpilotgcs/src/plugins/config/stabilization.ui +++ b/ground/openpilotgcs/src/plugins/config/stabilization.ui @@ -7,7 +7,7 @@ 0 0 965 - 797 + 713 @@ -453,9 +453,6 @@ false - - 6 - 12 @@ -505,9 +502,6 @@ Basic - - 6 - 0 @@ -604,23 +598,14 @@ 0 0 935 - 714 + 619 12 - - 12 - - - 5 - - - 12 - - + 12 @@ -640,7 +625,7 @@ 16777215 - 181 + 195 @@ -653,12 +638,12 @@ false - - 12 - 6 + + 12 + @@ -3496,7 +3481,7 @@ value as the Kp. 16777215 - 181 + 195 @@ -4023,12 +4008,12 @@ value as the Kp. Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - 12 - 6 + + 12 + @@ -6866,9 +6851,6 @@ border-radius: 5; Advanced - - 6 - 0 @@ -6952,17 +6934,14 @@ border-radius: 5; 0 0 - 935 - 714 + 920 + 644 true - - 6 - 12 @@ -6977,7 +6956,7 @@ border-radius: 5; 0 - 210 + 0 @@ -7510,12 +7489,12 @@ border-radius: 5; false - - 12 - 6 + + 12 + @@ -10299,7 +10278,7 @@ Then lower the value by 20% or so. 0 - 170 + 0 @@ -13429,7 +13408,7 @@ border-radius: 5; 0 - 195 + 0 @@ -13959,12 +13938,12 @@ border-radius: 5; Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - 12 - 6 + + 12 + @@ -16792,9 +16771,6 @@ border-radius: 5; Expert - - 6 - 0 @@ -16882,13 +16858,10 @@ border-radius: 5; 0 0 935 - 714 + 619 - - 6 - 12 @@ -16903,7 +16876,7 @@ border-radius: 5; 0 - 150 + 0 @@ -19508,19 +19481,19 @@ border-radius: 5; 0 - 180 + 0 Integral Limits - - 12 - 6 + + 12 + @@ -21916,7 +21889,7 @@ border-radius: 5; 0 - 150 + 0