From 030736f89ccd2c0c8be7e7e56a31476665776568 Mon Sep 17 00:00:00 2001 From: Fredrik Larson Date: Sun, 24 Aug 2014 07:37:59 +1000 Subject: [PATCH] First draft of totally reworked FixedWing layout for the config plugin --- .../src/plugins/config/airframe_fixedwing.ui | 970 ++++++++++-------- 1 file changed, 555 insertions(+), 415 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/airframe_fixedwing.ui b/ground/openpilotgcs/src/plugins/config/airframe_fixedwing.ui index 200e1496a..492fcafde 100644 --- a/ground/openpilotgcs/src/plugins/config/airframe_fixedwing.ui +++ b/ground/openpilotgcs/src/plugins/config/airframe_fixedwing.ui @@ -13,7 +13,7 @@ Form - + 0 @@ -26,8 +26,310 @@ 0 - - + + + + + 10 + 10 + + + + + 16777215 + 16777215 + + + + Airframe + + + + 9 + + + 9 + + + 9 + + + 9 + + + + + + 0 + 0 + + + + + 10 + 10 + + + + background:transparent + + + QFrame::NoFrame + + + QFrame::Plain + + + + + + + + + + + 0 + 0 + + + + + 10 + 10 + + + + + 16777215 + 16777215 + + + + Throttle Curve + + + + 9 + + + 9 + + + 9 + + + 9 + + + + + + 0 + 0 + + + + + 10 + 10 + + + + + 10 + 10 + + + + + 50 + 50 + + + + + + + + + + + + 16777215 + 16777215 + + + + Elevon Mix + + + + 9 + + + 9 + + + 9 + + + 9 + + + 0 + + + + + + + + 0 + 0 + + + + + 40 + 0 + + + + + 16777215 + 16777215 + + + + 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 + + + + + + + + 40 + 0 + + + + Weight of Roll mixing in percent. +Typical values are 100% for + configuration and 50% for X configuration on quads. + + + 100 + + + 50 + + + Qt::Vertical + + + + + + + + 40 + 0 + + + + 50 + + + Qt::AlignCenter + + + + + + + + + + + + 40 + 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 + + + + + + + + 40 + 0 + + + + Weight of Pitch mixing in percent. +Typical values are 100% for + configuration and 50% for X configuration on quads. + + + 100 + + + 50 + + + Qt::Vertical + + + + + + + + 40 + 0 + + + + 50 + + + Qt::AlignCenter + + + + + + + + + + + + QLayout::SetFixedSize + @@ -42,414 +344,55 @@ - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - 0 - 0 - - - - - - - - 0 - - - + - + 0 0 - 230 - 100 + 25 + 25 - - Output Channel Assignments + + + 16777215 + 25 + + + + Select the Multirotor frame type here. - - - QFormLayout::AllNonFixedFieldsGrow - - - - - Engine - - - - - - - Select output channel for the engine - - - - - - - - 60 - 0 - - - - Aileron 1 - - - - - - - Select output channel for the first aileron (or elevon) - - - - - - - true - - - - 60 - 0 - - - - Aileron 2 - - - - - - - true - - - Select output channel for the second aileron (or elevon) - - - - - - - - 67 - 0 - - - - Elevator 1 - - - - - - - Select output channel for the first elevator - - - - - - - true - - - - 67 - 0 - - - - Elevator 2 - - - - - - - true - - - Select output channel for a secondary elevator - - - - - - - Rudder 1 - - - - - - - Select output channel for the first rudder - - - - - - - Rudder 2 - - - - - - - Select output channel for a secondary rudder - - - - - - - - 0 - 0 - - - - Elevon Mix - - - - - - - - - - - 65 - 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 - - - 50 - - - Qt::Vertical - - - - - - - 50 - - - Qt::AlignCenter - - - - - - - - - - - - 65 - 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 - - - 50 - - - Qt::Vertical - - - - - - - 50 - - - Qt::AlignCenter - - - - - - - - - - - - - - - 0 - 100 - - - - Throttle Curve - - - - - - - 1 - 1 - - - - - 0 - 0 - - - - - 500 - 500 - - - - - 10 - 10 - - - - - 300 - 350 - - - - - - - - - + Qt::Horizontal - 0 - 20 + 10 + 13 - - - - Qt::Vertical - - - - 20 - 40 - - - - - - + + - + Qt::Horizontal - 40 + 10 20 @@ -457,6 +400,12 @@ margin:1px; + + + 0 + 0 + + 75 @@ -466,10 +415,234 @@ margin:1px; Mixer OK + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + 0 + 0 + + + + + 0 + 140 + + + + Output Channel Assignments + + + + 9 + + + 9 + + + 9 + + + 9 + + + + + QLayout::SetMaximumSize + + + QFormLayout::AllNonFixedFieldsGrow + + + 6 + + + + + 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; + + + Elevator 2 + + + + + + + true + + + + 0 + 0 + + + + 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; + + + Rudder 1 + + + + + + + true + + + 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; + + + Rudder 2 + + + + + + + true + + + Assign your motor output channels using the drawing above as a reference. Respect propeller rotation. + + + + + + + + + QLayout::SetMaximumSize + + + QFormLayout::AllNonFixedFieldsGrow + + + 6 + + + + + 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; + + + Motor + + + + + + + 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; + + + Aileron 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; + + + Aileron 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; + + + Elevator 1 + + + + + + + Assign your motor output channels using the drawing above as a reference. Respect propeller rotation. + + + + + + + + @@ -481,38 +654,5 @@ margin:1px; - - - elevonSlider1 - valueChanged(int) - elevonSliderLabel1 - setNum(int) - - - 124 - 126 - - - 124 - 126 - - - - - elevonSlider2 - valueChanged(int) - elevonSliderLabel2 - setNum(int) - - - 362 - 299 - - - 124 - 126 - - - - +