From 528cea9418a1908106fd194e7338e602a523f1fc Mon Sep 17 00:00:00 2001 From: chris pember Date: Tue, 28 Aug 2012 23:27:36 -0700 Subject: [PATCH] almost done fixing any spacing isues, changed the font so its bigger, added some new stylesheet properties to linux and osx --- .../stylesheets/default_linux.qss | 30 + .../stylesheets/default_macos.qss | 91 + .../openpilotgcs/stylesheets/wide_linux.qss | 30 + .../openpilotgcs/stylesheets/wide_macos.qss | 91 + .../src/plugins/config/airframe.ui | 771 ++--- .../src/plugins/config/camerastabilization.ui | 2009 ++++++------ .../src/plugins/config/cc_hw_settings.ui | 775 ++--- .../src/plugins/config/ccattitude.ui | 313 +- .../configcamerastabilizationwidget.cpp | 12 + .../openpilotgcs/src/plugins/config/input.ui | 281 +- .../src/plugins/config/mixercurve.ui | 17 +- .../openpilotgcs/src/plugins/config/output.ui | 252 +- .../src/plugins/config/stabilization.ui | 2832 ++++++----------- .../openpilotgcs/src/plugins/config/txpid.ui | 334 +- 14 files changed, 3824 insertions(+), 4014 deletions(-) diff --git a/ground/openpilotgcs/share/openpilotgcs/stylesheets/default_linux.qss b/ground/openpilotgcs/share/openpilotgcs/stylesheets/default_linux.qss index 3d57edaeb..1c27c3d69 100644 --- a/ground/openpilotgcs/share/openpilotgcs/stylesheets/default_linux.qss +++ b/ground/openpilotgcs/share/openpilotgcs/stylesheets/default_linux.qss @@ -1,2 +1,32 @@ MyListWidget {font-size: 11px;} Utils--StyledBar { background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(0, 0, 0, 255), stop:1 rgba(200, 200, 200, 255));} + + + + + + + + QGroupBox { + border: 1px solid gray; + border-radius: 5px; + margin-top: 1ex; /* leave space at the top for the title */ + font-size: 11px; + font-weight: bold; + } + + QGroupBox::title { + subcontrol-origin: margin; + subcontrol-position: top left; /* position at the top center */ + padding: 0 3px; + + } + + QTabWidget::pane { /* The tab widget frame */ + margin: 1px,1px,1px,1px; + border: 2px solid rgb(196,196,196); + border-radius: 5px; + padding: 0px; + } + + diff --git a/ground/openpilotgcs/share/openpilotgcs/stylesheets/default_macos.qss b/ground/openpilotgcs/share/openpilotgcs/stylesheets/default_macos.qss index 3d57edaeb..22958dbdd 100644 --- a/ground/openpilotgcs/share/openpilotgcs/stylesheets/default_macos.qss +++ b/ground/openpilotgcs/share/openpilotgcs/stylesheets/default_macos.qss @@ -1,2 +1,93 @@ MyListWidget {font-size: 11px;} Utils--StyledBar { background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(0, 0, 0, 255), stop:1 rgba(200, 200, 200, 255));} + + + + + + + QGroupBox { + border: 1px solid gray; + border-radius: 5px; + margin-top: 1ex; /* leave space at the top for the title */ + font-size: 11px; + font-weight: bold; + } + + QGroupBox::title { + subcontrol-origin: margin; + subcontrol-position: top left; /* position at the top center */ + padding: 0 3px; + + } + + QTabWidget::pane { /* The tab widget frame */ + margin: 1px,1px,1px,1px; + border: 2px solid rgb(196,196,196); + border-radius: 5px; + padding: 0px; + } + + QSlider::groove:horizontal { + border: 1px solid rgb(196,196,196); + background: white; + height: 6px; + border-radius: 2px; + margin 2px 2px; + } + QSlider::add-page:horizontal { + background: #fff; + border: 1px solid #777; + height: 1px; + border-radius: 4px; + } + + QSlider::sub-page:horizontal { + background: rgb(249,117,76); + border: 1px solid #777; + height: 1px; + border-radius: 4px; + } + + + QSlider::handle:horizontal { + background: rgb(196,196,196); + width: 18px; + height: 28px; + margin: -2px 0; + border-radius: 3px; + border: 1px solid #777; + } + + + + + QSlider::groove:vertical { + border: 1px solid rgb(196,196,196); + background: white; + width: 6px; + border-radius: 2px; + margin 0px 2px; + } + QSlider::add-page:vertical { + background: #fff; + border: 1px solid #777; + width: 1px; + border-radius: 4px; + } + + QSlider::sub-page:vertical { + background: rgb(249,117,76); + border: 1px solid #777; + width: 1px; + border-radius: 4px; + } + + + QSlider::handle:vertical { + background: rgb(196,196,196); + width: 18px; + margin: -6 0; + border-radius: 3px; + border: 1px solid #777; + } \ No newline at end of file diff --git a/ground/openpilotgcs/share/openpilotgcs/stylesheets/wide_linux.qss b/ground/openpilotgcs/share/openpilotgcs/stylesheets/wide_linux.qss index 3d57edaeb..1c27c3d69 100644 --- a/ground/openpilotgcs/share/openpilotgcs/stylesheets/wide_linux.qss +++ b/ground/openpilotgcs/share/openpilotgcs/stylesheets/wide_linux.qss @@ -1,2 +1,32 @@ MyListWidget {font-size: 11px;} Utils--StyledBar { background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(0, 0, 0, 255), stop:1 rgba(200, 200, 200, 255));} + + + + + + + + QGroupBox { + border: 1px solid gray; + border-radius: 5px; + margin-top: 1ex; /* leave space at the top for the title */ + font-size: 11px; + font-weight: bold; + } + + QGroupBox::title { + subcontrol-origin: margin; + subcontrol-position: top left; /* position at the top center */ + padding: 0 3px; + + } + + QTabWidget::pane { /* The tab widget frame */ + margin: 1px,1px,1px,1px; + border: 2px solid rgb(196,196,196); + border-radius: 5px; + padding: 0px; + } + + diff --git a/ground/openpilotgcs/share/openpilotgcs/stylesheets/wide_macos.qss b/ground/openpilotgcs/share/openpilotgcs/stylesheets/wide_macos.qss index 3d57edaeb..22958dbdd 100644 --- a/ground/openpilotgcs/share/openpilotgcs/stylesheets/wide_macos.qss +++ b/ground/openpilotgcs/share/openpilotgcs/stylesheets/wide_macos.qss @@ -1,2 +1,93 @@ MyListWidget {font-size: 11px;} Utils--StyledBar { background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(0, 0, 0, 255), stop:1 rgba(200, 200, 200, 255));} + + + + + + + QGroupBox { + border: 1px solid gray; + border-radius: 5px; + margin-top: 1ex; /* leave space at the top for the title */ + font-size: 11px; + font-weight: bold; + } + + QGroupBox::title { + subcontrol-origin: margin; + subcontrol-position: top left; /* position at the top center */ + padding: 0 3px; + + } + + QTabWidget::pane { /* The tab widget frame */ + margin: 1px,1px,1px,1px; + border: 2px solid rgb(196,196,196); + border-radius: 5px; + padding: 0px; + } + + QSlider::groove:horizontal { + border: 1px solid rgb(196,196,196); + background: white; + height: 6px; + border-radius: 2px; + margin 2px 2px; + } + QSlider::add-page:horizontal { + background: #fff; + border: 1px solid #777; + height: 1px; + border-radius: 4px; + } + + QSlider::sub-page:horizontal { + background: rgb(249,117,76); + border: 1px solid #777; + height: 1px; + border-radius: 4px; + } + + + QSlider::handle:horizontal { + background: rgb(196,196,196); + width: 18px; + height: 28px; + margin: -2px 0; + border-radius: 3px; + border: 1px solid #777; + } + + + + + QSlider::groove:vertical { + border: 1px solid rgb(196,196,196); + background: white; + width: 6px; + border-radius: 2px; + margin 0px 2px; + } + QSlider::add-page:vertical { + background: #fff; + border: 1px solid #777; + width: 1px; + border-radius: 4px; + } + + QSlider::sub-page:vertical { + background: rgb(249,117,76); + border: 1px solid #777; + width: 1px; + border-radius: 4px; + } + + + QSlider::handle:vertical { + background: rgb(196,196,196); + width: 18px; + margin: -6 0; + border-radius: 3px; + border: 1px solid #777; + } \ No newline at end of file diff --git a/ground/openpilotgcs/src/plugins/config/airframe.ui b/ground/openpilotgcs/src/plugins/config/airframe.ui index 0f1018704..1f69a9e60 100644 --- a/ground/openpilotgcs/src/plugins/config/airframe.ui +++ b/ground/openpilotgcs/src/plugins/config/airframe.ui @@ -6,18 +6,15 @@ 0 0 - 920 - 626 + 800 + 519 Form - - - 12 - - + + 0 @@ -29,20 +26,11 @@ Mixer Settings - - + + 12 - - 12 - - - 12 - - - 0 - - + @@ -134,15 +122,18 @@ 0 0 - 872 - 516 + 746 + 395 - - 12 + + 0 - + + 0 + + 0 @@ -702,9 +693,27 @@ margin:1px; - + + + 24 + + + 0 + + + + 10 + 10 + + + + + 16777215 + 16777215 + + Frame Type @@ -721,7 +730,7 @@ margin:1px; - 40 + 10 13 @@ -737,7 +746,7 @@ margin:1px; - 45 + 25 25 @@ -759,7 +768,7 @@ margin:1px; - 40 + 10 13 @@ -793,8 +802,8 @@ margin:1px; - 120 - 120 + 10 + 10 @@ -831,201 +840,267 @@ margin:1px; - 250 + 16777215 16777215 Mix Level - - - - - - - - - - 30 - 0 - - - - 100 - - - Qt::AlignCenter - - - - - - - - 35 - 0 - - - - Weight of Roll mixing in percent. + + + + + + + + 30 + 0 + + + + 100 + + + Qt::AlignCenter + + + + + + + + 35 + 0 + + + + Weight of Roll mixing in percent. Typical values are 100% for + configuration and 50% for X configuration on quads. - - - 100 - - - 100 - - - Qt::Vertical - - - - - - - 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)); + + + 100 + + + 100 + + + Qt::Vertical + + + + + + + + 0 + 0 + + + + + 30 + 0 + + + + + 30 + 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 - - - - + + + Roll + + + Qt::AlignCenter + + - - - - - - - 0 - 0 - - - - 100 - - - Qt::AlignCenter - - - - - - - - 35 - 0 - - - - Weight of Pitch mixing in percent. + + + + + + + + + 0 + 0 + + + + 100 + + + Qt::AlignCenter + + + + + + + + 35 + 0 + + + + Weight of Pitch mixing in percent. Typical values are 100% for + configuration and 50% for X configuration on quads. - - - 100 - - - 100 - - - Qt::Vertical - - - - - - - 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)); + + + 100 + + + 100 + + + Qt::Vertical + + + + + + + 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 - - - - + + + Pitch + + + Qt::AlignCenter + + - - - - - - - 0 - 0 - - - - 50 - - - Qt::AlignCenter - - - - - - - - 40 - 0 - - - - Weight of Yaw mixing in percent. + + + + + + + + + 0 + 0 + + + + 50 + + + Qt::AlignCenter + + + + + + + + 40 + 0 + + + + Weight of Yaw mixing in percent. Typical value is 50% for + or X configuration on quads. - - - -100 - - - 100 - - - 50 - - - Qt::Vertical - - - - - - - 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)); + + + -100 + + + 100 + + + 50 + + + Qt::Vertical + + + + + + + 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; - - - Yaw - - - Qt::AlignCenter - - - - + + + Yaw + + + Qt::AlignCenter + + + + + + + + + + + Qt::Horizontal + + + + 10 + 20 + + + + + + + + + 0 + 0 + + + + + 75 + true + + + + Mixer OK + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + Qt::Horizontal + + + + 10 + 20 + + + @@ -1042,8 +1117,14 @@ margin:1px; - 300 - 300 + 10 + 10 + + + + + 16777215 + 16777215 @@ -1060,8 +1141,8 @@ margin:1px; - 0 - 0 + 10 + 10 @@ -1072,8 +1153,8 @@ margin:1px; - 300 - 350 + 250 + 250 @@ -1084,7 +1165,7 @@ margin:1px; - + @@ -1095,29 +1176,14 @@ margin:1px; 0 - 124 + 140 Motor output channels - - - 4 - - - 1 - - - 1 - - - 1 - - - 6 - - + + QLayout::SetMaximumSize @@ -1214,7 +1280,7 @@ margin:1px; - + QLayout::SetMaximumSize @@ -1329,10 +1395,26 @@ margin:1px; + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 6 + + + + - + @@ -1348,7 +1430,7 @@ margin:1px; - 250 + 16777215 16777215 @@ -1420,45 +1502,6 @@ margin:1px; - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 75 - true - - - - Mixer OK - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - @@ -2754,8 +2797,8 @@ margin:1px; 0 0 - 872 - 496 + 746 + 383 @@ -3066,16 +3109,16 @@ 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:'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-family:'Ubuntu'; font-size:14pt; font-weight:600; color:#ff0000;">SETTING UP FEED FORWARD REQUIRES CAUTION</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="-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;"><br /></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:'Ubuntu'; font-size:11pt;"><br /></span></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:'Ubuntu'; font-size:11pt;"><br /></span></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> +<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> @@ -3090,112 +3133,80 @@ p, li { white-space: pre-wrap; } - - - - - 0 - 0 - + + + + 4 - - - 0 - 45 - - - - - 16777215 - 45 - - - - - - - - 4 - - - 12 - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - 607 - 13 - - - - - - - - - 0 - 0 - - - - - 25 - 26 - - - - Takes you to the wiki page - - - - - - - :/core/images/helpicon.svg:/core/images/helpicon.svg - - - - 25 - 25 - - - - true - - - - - - - Send to board, but don't save permanently (flash or SD). - - - Apply - - - - - - - Applies and Saves all settings to flash or SD depending on board. - - - Save - - - - - + + + + Qt::Horizontal + + + + 5 + 25 + + + + + + + + + 0 + 0 + + + + + 25 + 25 + + + + Takes you to the wiki page + + + + + + + :/core/images/helpicon.svg:/core/images/helpicon.svg + + + + 25 + 25 + + + + true + + + + + + + Send to board, but don't save permanently (flash or SD). + + + Apply + + + + + + + Applies and Saves all settings to flash or SD depending on board. + + + Save + + + + diff --git a/ground/openpilotgcs/src/plugins/config/camerastabilization.ui b/ground/openpilotgcs/src/plugins/config/camerastabilization.ui index a394820e7..7ff1e742b 100644 --- a/ground/openpilotgcs/src/plugins/config/camerastabilization.ui +++ b/ground/openpilotgcs/src/plugins/config/camerastabilization.ui @@ -6,808 +6,894 @@ 0 0 - 720 - 739 + 983 + 738 Form - + + + -1 + - - - QFrame::NoFrame + + + 0 - - true - - - - - 0 - 0 - 702 - 660 - - + + + Camera Stabilization + + + 0 + + + 12 + + + 0 + + + 0 + - - - Qt::StrongFocus + + + QFrame::NoFrame - - Enable CameraStabilization module + + true - - - - - - After enabling the module, you must power cycle before using and configuring. - - - - - - - Qt::Horizontal - - - - - - - Qt::Vertical - - - QSizePolicy::Preferred - - - - 20 - 10 - - - - - - - - - 0 - 0 - - - - - 0 - 100 - - - - Basic Settings (Stabilization) - - - - - - Qt::StrongFocus - - - Camera yaw angle for 100% output value, deg. + + + + 0 + 0 + 953 + 626 + + + + + 24 + + + + + Module Control + + + + + + Qt::StrongFocus + + + Enable CameraStabilization module + + + + + + + After enabling the module, you must power cycle before using and configuring. + + + + + + + + + + + 0 + 0 + + + + + 0 + 131 + + + + Basic Settings (Stabilization) + + + + + + Qt::StrongFocus + + + Camera yaw angle for 100% output value, deg. This value should be tuned for particular gimbal and servo. You also have to define channel output range using Output configuration tab. - - - 180 - - - 20 - - - - objname:CameraStabSettings - fieldname:OutputRange - element:Yaw - haslimits:no - scale:1 - buttongroup:1 - - - - - - - - Qt::StrongFocus - - - Camera pitch angle for 100% output value, deg. + + + 180 + + + 20 + + + + objname:CameraStabSettings + fieldname:OutputRange + element:Yaw + haslimits:no + scale:1 + buttongroup:1 + + + + + + + + Qt::StrongFocus + + + Camera pitch angle for 100% output value, deg. This value should be tuned for particular gimbal and servo. You also have to define channel output range using Output configuration tab. - - - 180 - - - 20 - - - - objname:CameraStabSettings - fieldname:OutputRange - element:Pitch - haslimits:no - scale:1 - buttongroup:1 - - - - - - - - Qt::StrongFocus - - - Camera roll angle for 100% output value, deg. + + + 180 + + + 20 + + + + objname:CameraStabSettings + fieldname:OutputRange + element:Pitch + haslimits:no + scale:1 + buttongroup:1 + + + + + + + + Qt::StrongFocus + + + Camera roll angle for 100% output value, deg. This value should be tuned for particular gimbal and servo. You also have to define channel output range using Output configuration tab. - - - 180 - - - 20 - - - - objname:CameraStabSettings - fieldname:OutputRange - element:Roll - haslimits:no - scale:1 - buttongroup:1 - - - - - - - - Qt::StrongFocus - - - Yaw output channel for camera gimbal - - - - None + + + 180 + + + 20 + + + + objname:CameraStabSettings + fieldname:OutputRange + element:Roll + haslimits:no + scale:1 + buttongroup:1 + + + + + + + + Qt::StrongFocus + + + Yaw output channel for camera gimbal + + + + None + + + + + + + + Qt::StrongFocus + + + Pitch output channel for camera gimbal + + + + None + + + + + + + + Qt::StrongFocus + + + Roll output channel for camera gimbal + + + + None + + + + + + + + Output Channel + + + + + + + Output Range + + + + + + + + 0 + 16 + + + + + 16777215 + 16 + + + + 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 + + + + + + + + 0 + 16 + + + + + 16777215 + 16 + + + + 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 + 16 + + + + + 16777215 + 16 + + + + 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 + + + + + + + + + + + 0 + 0 + - - - - - - - Qt::StrongFocus - - - Pitch output channel for camera gimbal - - - - None + + + 0 + 266 + - - - - - - - Qt::StrongFocus - - - Roll output channel for camera gimbal - - - - None + + Advanced Settings (Control) - - - - - - - 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)); + + + + + + 0 + 16 + + + + + 16777215 + 16 + + + + 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 - - - - - - - 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)); + + + Yaw + + + Qt::AlignCenter + + + + + + + + 0 + 16 + + + + + 16777215 + 16 + + + + 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 - - - - - - - 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)); + + + Pitch + + + Qt::AlignCenter + + + + + + + + 0 + 16 + + + + + 16777215 + 16 + + + + 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 - - - - - - - - - - - 0 - 0 - - - - - 0 - 204 - - - - 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 - - - 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; - - - Pitch - - - 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 - - - - - - - Qt::StrongFocus - - - Input channel to control camera yaw + + + Roll + + + Qt::AlignCenter + + + + + + + Qt::StrongFocus + + + Input channel to control camera yaw Don't forget to map this channel using Input configuration tab. - - - - objname:CameraStabSettings - fieldname:Input - element:Yaw - buttongroup:1 - - - - - None - - - - - - - - Qt::StrongFocus - - - Input channel to control camera pitch + + + + objname:CameraStabSettings + fieldname:Input + element:Yaw + buttongroup:1 + + + + + None + + + + + + + + Qt::StrongFocus + + + Input channel to control camera pitch Don't forget to map this channel using Input configuration tab. - - - - objname:CameraStabSettings - fieldname:Input - element:Pitch - buttongroup:1 - - - - - None - - - - - - - - Qt::StrongFocus - - - Input channel to control camera roll + + + + objname:CameraStabSettings + fieldname:Input + element:Pitch + buttongroup:1 + + + + + None + + + + + + + + Qt::StrongFocus + + + Input channel to control camera roll Don't forget to map this channel using Input configuration tab. - - - - objname:CameraStabSettings - fieldname:Input - element:Roll - buttongroup:1 - - - - - None - - - - - - - - Input Channel - - - - - - - Qt::StrongFocus - - - Axis stabilization mode + + + + objname:CameraStabSettings + fieldname:Input + element:Roll + buttongroup:1 + + + + + None + + + + + + + + Input Channel + + + + + + + Qt::StrongFocus + + + Axis stabilization mode Attitude: camera tracks level for the axis. Input controls the deflection. AxisLock: camera remembers tracking attitude. Input controls the rate of deflection. - - - - objname:CameraStabSettings - fieldname:StabilizationMode - element:Yaw - buttongroup:1 - - - - - Attitude - - - - - - - - Qt::StrongFocus - - - Maximum camera yaw deflection for 100% input in Attitude mode, deg. - - - 180 - - - 20 - - - - objname:CameraStabSettings - fieldname:InputRange - element:Yaw - haslimits:no - scale:1 - buttongroup:1 - - - - - - - - Qt::StrongFocus - - - Maximum camera yaw rate for 100% input in AxisLock mode, deg/s. - - - 180 - - - 50 - - - - objname:CameraStabSettings - fieldname:InputRate - element:Yaw - haslimits:no - scale:1 - buttongroup:1 - - - - - - - - Qt::StrongFocus - - - Input low-pass filter response time for yaw axis, ms. + + + + objname:CameraStabSettings + fieldname:StabilizationMode + element:Yaw + buttongroup:1 + + + + + Attitude + + + + + + + + Qt::StrongFocus + + + Maximum camera yaw deflection for 100% input in Attitude mode, deg. + + + 180 + + + 20 + + + + objname:CameraStabSettings + fieldname:InputRange + element:Yaw + haslimits:no + scale:1 + buttongroup:1 + + + + + + + + Qt::StrongFocus + + + Maximum camera yaw rate for 100% input in AxisLock mode, deg/s. + + + 180 + + + 50 + + + + objname:CameraStabSettings + fieldname:InputRate + element:Yaw + haslimits:no + scale:1 + buttongroup:1 + + + + + + + + Qt::StrongFocus + + + Input low-pass filter response time for yaw axis, ms. This option smoothes the stick input. Zero value disables LPF. - - - 1000 - - - 150 - - - - objname:CameraStabSettings - fieldname:ResponseTime - element:Yaw - haslimits:no - scale:1 - buttongroup:1 - - - - - - - - Qt::StrongFocus - - - Axis stabilization mode + + + 1000 + + + 150 + + + + objname:CameraStabSettings + fieldname:ResponseTime + element:Yaw + haslimits:no + scale:1 + buttongroup:1 + + + + + + + + Qt::StrongFocus + + + Axis stabilization mode Attitude: camera tracks level for the axis. Input controls the deflection. AxisLock: camera remembers tracking attitude. Input controls the rate of deflection. - - - - objname:CameraStabSettings - fieldname:StabilizationMode - element:Pitch - buttongroup:1 - - - - - Attitude - - - - - - - - Qt::StrongFocus - - - Maximum camera pitch deflection for 100% input in Attitude mode, deg. - - - 180 - - - 20 - - - - objname:CameraStabSettings - fieldname:InputRange - element:Pitch - haslimits:no - scale:1 - buttongroup:1 - - - - - - - - Qt::StrongFocus - - - Maximum camera pitch rate for 100% input in AxisLock mode, deg/s. - - - 180 - - - 50 - - - - objname:CameraStabSettings - fieldname:InputRate - element:Pitch - haslimits:no - scale:1 - buttongroup:1 - - - - - - - - Qt::StrongFocus - - - Input low-pass filter response time for pitch axis, ms. + + + + objname:CameraStabSettings + fieldname:StabilizationMode + element:Pitch + buttongroup:1 + + + + + Attitude + + + + + + + + Qt::StrongFocus + + + Maximum camera pitch deflection for 100% input in Attitude mode, deg. + + + 180 + + + 20 + + + + objname:CameraStabSettings + fieldname:InputRange + element:Pitch + haslimits:no + scale:1 + buttongroup:1 + + + + + + + + Qt::StrongFocus + + + Maximum camera pitch rate for 100% input in AxisLock mode, deg/s. + + + 180 + + + 50 + + + + objname:CameraStabSettings + fieldname:InputRate + element:Pitch + haslimits:no + scale:1 + buttongroup:1 + + + + + + + + Qt::StrongFocus + + + Input low-pass filter response time for pitch axis, ms. This option smoothes the stick input. Zero value disables LPF. - - - 1000 - - - 150 - - - - objname:CameraStabSettings - fieldname:ResponseTime - element:Pitch - haslimits:no - scale:1 - buttongroup:1 - - - - - - - - Qt::StrongFocus - - - Axis stabilization mode + + + 1000 + + + 150 + + + + objname:CameraStabSettings + fieldname:ResponseTime + element:Pitch + haslimits:no + scale:1 + buttongroup:1 + + + + + + + + Qt::StrongFocus + + + Axis stabilization mode Attitude: camera tracks level for the axis. Input controls the deflection. AxisLock: camera remembers tracking attitude. Input controls the rate of deflection. - - - - objname:CameraStabSettings - fieldname:StabilizationMode - element:Roll - buttongroup:1 - - - - - Attitude - - - - - - - - Qt::StrongFocus - - - Maximum camera roll deflection for 100% input in Attitude mode, deg. - - - 180 - - - 20 - - - - objname:CameraStabSettings - fieldname:InputRange - element:Roll - haslimits:no - scale:1 - buttongroup:1 - - - - - - - - Qt::StrongFocus - - - Maximum camera roll rate for 100% input in AxisLock mode, deg/s. - - - 180 - - - 50 - - - - objname:CameraStabSettings - fieldname:InputRate - element:Roll - haslimits:no - scale:1 - buttongroup:1 - - - - - - - - Qt::StrongFocus - - - Input low-pass filter response time for roll axis, ms. + + + + objname:CameraStabSettings + fieldname:StabilizationMode + element:Roll + buttongroup:1 + + + + + Attitude + + + + + + + + Qt::StrongFocus + + + Maximum camera roll deflection for 100% input in Attitude mode, deg. + + + 180 + + + 20 + + + + objname:CameraStabSettings + fieldname:InputRange + element:Roll + haslimits:no + scale:1 + buttongroup:1 + + + + + + + + Qt::StrongFocus + + + Maximum camera roll rate for 100% input in AxisLock mode, deg/s. + + + 180 + + + 50 + + + + objname:CameraStabSettings + fieldname:InputRate + element:Roll + haslimits:no + scale:1 + buttongroup:1 + + + + + + + + Qt::StrongFocus + + + Input low-pass filter response time for roll axis, ms. This option smoothes the stick input. Zero value disables LPF. - - - 1000 - - - 150 - - - - objname:CameraStabSettings - fieldname:ResponseTime - element:Roll - haslimits:no - scale:1 - buttongroup:1 - - - - - - - - MaxAxisLockRate - - - - - - - Response Time - - - - - - - Input Rate - - - - - - - Input Range - - - - - - - Stabilization Mode - - - - - - - (the same value for Roll, Pitch, Yaw) - - - - - - - Qt::StrongFocus - - - Stick input deadband for all axes in AxisLock mode, deg/s. + + + 1000 + + + 150 + + + + objname:CameraStabSettings + fieldname:ResponseTime + element:Roll + haslimits:no + scale:1 + buttongroup:1 + + + + + + + + MaxAxisLockRate + + + + + + + Response Time + + + + + + + Input Rate + + + + + + + Input Range + + + + + + + Stabilization Mode + + + + + + + (the same value for Roll, Pitch, Yaw) + + + + + + + Qt::StrongFocus + + + Stick input deadband for all axes in AxisLock mode, deg/s. When stick input is within the MaxAxisLockRate range, camera tracks current attitude. Otherwise it starts moving according to input with @@ -815,236 +901,263 @@ rate depending on input value. If you have drift in your Tx controls, you may want to increase this value. - - - 1 - - - 0.100000000000000 - - - 1.000000000000000 - - - - objname:CameraStabSettings - fieldname:MaxAxisLockRate - haslimits:no - scale:1 - buttongroup:1 - - - - - + + + 1 + + + 0.100000000000000 + + + 1.000000000000000 + + + + objname:CameraStabSettings + fieldname:MaxAxisLockRate + haslimits:no + scale:1 + buttongroup:1 + + + + + + + + + + + Messages + + + + + + false + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + - - - - Qt::Vertical - - - - 20 - 40 - - - - - + + + 4 + - + + + Qt::Horizontal + + + + 321 + 16 + + + + + + + + + 0 + 0 + + + + + 25 + 25 + + + + + true + + + + + :/core/images/helpicon.svg:/core/images/helpicon.svg + + + + 25 + 25 + + + + Ctrl+S + + + false + + + true + + + + button:help + url:http://wiki.openpilot.org/display/Doc/Camera+Stabilization+Configuration + + - - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 32 - 32 - - - - - true - - - - - - - - :/core/images/helpicon.svg:/core/images/helpicon.svg - - - - 32 - 32 - - - - Ctrl+S - - - false - - - true - - - - button:help - url:http://wiki.openpilot.org/display/Doc/Camera+Stabilization+Configuration - - - - - - - - Load default CameraStabilization settings except output channels into GCS. + + + + 0 + 32 + + + + + 16777215 + 32 + + + + Load default CameraStabilization settings except output channels into GCS. Loaded settings are not applied automatically. You have to click the Apply or Save button afterwards. - - - Reset To Defaults - - - - button:default - buttongroup:1 - - - - - - - - Reloads saved CameraStabilization settings except output channels + + + Reset To Defaults + + + + button:default + buttongroup:1 + + + + + + + + + 0 + 32 + + + + + 16777215 + 32 + + + + Reloads saved CameraStabilization settings except output channels from board into GCS. Useful if you have accidentally changed some settings. Loaded settings are not applied automatically. You have to click the Apply or Save button afterwards. - - - Reload Board Data - - - - button:reload - buttongroup:1 - - - - - - - - Send settings to the board but do not save to the non-volatile memory - - - Apply - - - - button:apply - - - - - - - - Send settings to the board and save to the non-volatile memory - - - Save - - - false - - - - button:save - - - - - + + + Reload Board Data + + + + button:reload + buttongroup:1 + + + + + + + + + 0 + 32 + + + + + 16777215 + 32 + + + + Send settings to the board but do not save to the non-volatile memory + + + Apply + + + + button:apply + + + + + + + + + 0 + 32 + + + + + 16777215 + 32 + + + + Send settings to the board and save to the non-volatile memory + + + Save + + + false + + + + button:save + + + - enableCameraStabilization - rollChannel - pitchChannel - yawChannel - rollOutputRange - pitchOutputRange - yawOutputRange - rollInputChannel - pitchInputChannel - yawInputChannel - rollStabilizationMode - pitchStabilizationMode - yawStabilizationMode - rollInputRange - pitchInputRange - yawInputRange - rollInputRate - pitchInputRate - yawInputRate - rollResponseTime - pitchResponseTime - yawResponseTime - MaxAxisLockRate - camerastabilizationHelp - camerastabilizationSaveRAM - camerastabilizationSaveSD scrollArea diff --git a/ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui b/ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui index eb1ce75ad..383da5b42 100644 --- a/ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui +++ b/ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui @@ -6,14 +6,14 @@ 0 0 - 588 - 746 + 646 + 596 Form - + @@ -107,111 +107,102 @@ 0 0 - 558 - 580 + 616 + 495 - - - - - - - - - - true - - - - - - - - - - - - - MainPort - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - - - - - - - - - FlexiPort - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - USB HID Port - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - - - - - USB VCP Port - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - - - - - RcvrPort - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - + + + + + + 0 + 0 + + + + + 0 + 50 + + + + Messages + + + + + + + 75 + true + + + + + + + Qt::AutoText + + + true + + + + + - + + + + + 0 + 0 + + + + + 500 + 0 + + + + + 500 + 16777215 + + + + + 75 + true + + + + Changes on this page only take effect after board reset or power cycle + + + Qt::AlignCenter + + + true + + + + + + + Qt::Vertical + + + + 20 + 25 + + + + + @@ -286,7 +277,132 @@ - + + + + + + + + + + + + + + + + USB HID Port + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + + + + + + + + + + + true + + + + + + + + + + MainPort + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + + + + + + + + + + + FlexiPort + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + + + + + USB VCP Port + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + + + + + RcvrPort + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + Qt::Vertical @@ -297,39 +413,7 @@ 20 - 20 - - - - - - - - - 75 - true - - - - Changes on this page only take effect after board reset or power cycle - - - Qt::AlignCenter - - - true - - - - - - - Qt::Vertical - - - - 20 - 25 + 10 @@ -343,235 +427,196 @@ - - - - 0 - 0 - + + + 4 - - - 0 - 50 - - - - Messages - - - - - - - 75 - true - - - - - - - Qt::AutoText - - - true - - - - - - - - - - - 0 - 0 - - - - - 0 - 45 - - - - - 16777215 - 45 - - - - - - - - 4 - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - 369 - 16 - - - - - - - - - 0 - 0 - - - - - 25 - 26 - - - - - 25 - 26 - - - - Takes you to the wiki page - - - - - - - :/core/images/helpicon.svg:/core/images/helpicon.svg - - - - 25 - 25 - - - - true - - - - - - - - - - - - 255 - 255 - 255 - - - - - - - 232 - 232 - 232 - - - - - - - - - 255 - 255 - 255 - - - - - - - 232 - 232 - 232 - - - - - - - - - 232 - 232 - 232 - - - - - - - 232 - 232 - 232 - - - - - - - - Send to OpenPilot but don't write in SD. + + + + Qt::Horizontal + + + + 369 + 16 + + + + + + + + + 0 + 0 + + + + + 25 + 26 + + + + + 25 + 25 + + + + Takes you to the wiki page + + + + + + + :/core/images/helpicon.svg:/core/images/helpicon.svg + + + + 25 + 25 + + + + true + + + + + + + + 0 + 32 + + + + + 16777215 + 32 + + + + + + + + + 255 + 255 + 255 + + + + + + + 232 + 232 + 232 + + + + + + + + + 255 + 255 + 255 + + + + + + + 232 + 232 + 232 + + + + + + + + + 232 + 232 + 232 + + + + + + + 232 + 232 + 232 + + + + + + + + Send to OpenPilot but don't write in SD. Beware of not locking yourself out! - - - false - - - - - - Apply - - - false - - - - - - - Applies and Saves all settings to SD. + + + false + + + + + + Apply + + + + 16 + 16 + + + + false + + + + + + + + 0 + 32 + + + + + 16777215 + 32 + + + + Applies and Saves all settings to SD. Beware of not locking yourself out! - - - false - - - - - - Save - - - - - + + + false + + + + + + Save + + + + diff --git a/ground/openpilotgcs/src/plugins/config/ccattitude.ui b/ground/openpilotgcs/src/plugins/config/ccattitude.ui index 74f70c3fa..fab00864f 100644 --- a/ground/openpilotgcs/src/plugins/config/ccattitude.ui +++ b/ground/openpilotgcs/src/plugins/config/ccattitude.ui @@ -6,8 +6,8 @@ 0 0 - 606 - 576 + 730 + 542 @@ -24,9 +24,18 @@ Attitude - + 0 + + 12 + + + 0 + + + 12 + @@ -107,11 +116,14 @@ 0 0 - 576 - 439 + 700 + 418 + + 24 + @@ -186,35 +198,21 @@ Calibration - - - - - Place aircraft very flat, and then click level to compute the accelerometer and gyro bias + + + + + Qt::Horizontal - - true + + + 142 + 20 + - + - - - - Launch horizontal calibration. - - - Level - - - - - - - 0 - - - - + Qt::Vertical @@ -230,7 +228,85 @@ - + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 300 + 0 + + + + 0 + + + + + + + + 500 + 16777215 + + + + Launch horizontal calibration. + + + Level + + + + + + + Qt::Horizontal + + + + 173 + 20 + + + + + + + + Qt::Horizontal + + + + 173 + 20 + + + + + + + + Place aircraft very flat, and then click level to compute the accelerometer and gyro bias + + + true + + + + If enabled, a fast recalibration of gyro zero point will be done @@ -253,7 +329,7 @@ arming it in that case! 20 - 91 + 10 @@ -267,97 +343,88 @@ arming it in that case! - - - - 0 - 0 - + + + 4 - - - 0 - 75 - - - - - - - - - - 4 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 32 - 32 - - - - Takes you to the wiki page - - - - - - - :/core/images/helpicon.svg:/core/images/helpicon.svg - - - - 32 - 32 - - - - true - - - - - - - Apply - - - - - - - Click to permanently save the accel bias in the CopterControl Flash. - - - Save - - - - - - - + + + + Qt::Horizontal + + + + 380 + 20 + + + + + + + + + 0 + 0 + + + + + 25 + 25 + + + + Takes you to the wiki page + + + + + + + :/core/images/helpicon.svg:/core/images/helpicon.svg + + + + 25 + 25 + + + + true + + + + + + + + 0 + 32 + + + + Apply + + + + + + + + 0 + 32 + + + + Click to permanently save the accel bias in the CopterControl Flash. + + + Save + + + + diff --git a/ground/openpilotgcs/src/plugins/config/configcamerastabilizationwidget.cpp b/ground/openpilotgcs/src/plugins/config/configcamerastabilizationwidget.cpp index 9c4470a1d..d3b58496e 100644 --- a/ground/openpilotgcs/src/plugins/config/configcamerastabilizationwidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configcamerastabilizationwidget.cpp @@ -29,11 +29,22 @@ #include "hwsettings.h" #include "mixersettings.h" #include "actuatorcommand.h" +#include +#include ConfigCameraStabilizationWidget::ConfigCameraStabilizationWidget(QWidget *parent) : ConfigTaskWidget(parent) { m_camerastabilization = new Ui_CameraStabilizationWidget(); m_camerastabilization->setupUi(this); + + addApplySaveButtons(m_camerastabilization->camerastabilizationSaveRAM,m_camerastabilization->camerastabilizationSaveSD); + + ExtensionSystem::PluginManager *pm=ExtensionSystem::PluginManager::instance(); + Core::Internal::GeneralSettings * settings=pm->getObject(); + if(!settings->useExpertMode()) + m_camerastabilization->camerastabilizationSaveRAM->setVisible(false); + + // These widgets don't have direct relation to UAVObjects // and need special processing @@ -41,6 +52,7 @@ ConfigCameraStabilizationWidget::ConfigCameraStabilizationWidget(QWidget *parent m_camerastabilization->rollChannel, m_camerastabilization->pitchChannel, m_camerastabilization->yawChannel, + }; const int NUM_OUTPUTS = sizeof(outputs) / sizeof(outputs[0]); diff --git a/ground/openpilotgcs/src/plugins/config/input.ui b/ground/openpilotgcs/src/plugins/config/input.ui index 4dcc31f4f..185a63900 100644 --- a/ground/openpilotgcs/src/plugins/config/input.ui +++ b/ground/openpilotgcs/src/plugins/config/input.ui @@ -6,14 +6,14 @@ 0 0 - 702 - 764 + 716 + 754 Form - + @@ -25,11 +25,20 @@ + 24 + + + 0 + + 12 - + 0 + + 12 + @@ -107,17 +116,29 @@ 0 0 - 672 - 657 + 686 + 630 + + 0 + + + 0 + + + 24 + + + 0 + @@ -658,11 +679,20 @@ font:bold; + 24 + + + 0 + + 12 - + 0 + + 12 + @@ -740,11 +770,17 @@ font:bold; 0 0 - 672 - 795 + 540 + 526 + + 12 + + + 24 + @@ -1183,11 +1219,20 @@ margin:1px; + 24 + + + 0 + + 12 - + 0 + + 12 + @@ -1265,11 +1310,14 @@ margin:1px; 0 0 - 672 - 795 + 529 + 173 + + 24 + @@ -1392,116 +1440,111 @@ margin:1px; - - - - 16777215 - 45 - + + + 4 - - - - - - 4 - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - 483 - 20 - - - - - - - - - 0 - 0 - - - - - 25 - 26 - - - - Takes you to the wiki page - - - - - - - :/core/images/helpicon.svg:/core/images/helpicon.svg - - - - 25 - 25 - - - - true - - - - - - - - 60 - 28 - - - - Send to OpenPilot but don't write in SD. + + + + Qt::Horizontal + + + + 483 + 16 + + + + + + + + + 0 + 0 + + + + + 25 + 25 + + + + Takes you to the wiki page + + + + + + + :/core/images/helpicon.svg:/core/images/helpicon.svg + + + + 25 + 25 + + + + true + + + + + + + + 60 + 32 + + + + + 16777215 + 32 + + + + Send to OpenPilot but don't write in SD. Be sure to set the Neutral position on all sliders before sending! - - - - - - Apply - - - - - - - - 60 - 28 - - - - Be sure to set the Neutral position on all sliders before sending! + + + + + + Apply + + + + + + + + 60 + 32 + + + + + 16777215 + 32 + + + + Be sure to set the Neutral position on all sliders before sending! Applies and Saves all settings to SD - - - - - - Save - - - - - + + + + + + Save + + + + diff --git a/ground/openpilotgcs/src/plugins/config/mixercurve.ui b/ground/openpilotgcs/src/plugins/config/mixercurve.ui index e59882d89..cd47bd04e 100644 --- a/ground/openpilotgcs/src/plugins/config/mixercurve.ui +++ b/ground/openpilotgcs/src/plugins/config/mixercurve.ui @@ -325,6 +325,9 @@ + + 4 + @@ -333,13 +336,19 @@ 40 - 20 + 16 + + + 16777215 + 32 + + Reset @@ -347,6 +356,12 @@ + + + 16777215 + 32 + + Advanced... diff --git a/ground/openpilotgcs/src/plugins/config/output.ui b/ground/openpilotgcs/src/plugins/config/output.ui index f3dd12c27..a30668aee 100644 --- a/ground/openpilotgcs/src/plugins/config/output.ui +++ b/ground/openpilotgcs/src/plugins/config/output.ui @@ -7,13 +7,16 @@ 0 0 811 - 895 + 754 Form - + + + -1 + @@ -33,7 +36,16 @@ 12 - + + 0 + + + 12 + + + 0 + + 0 @@ -114,10 +126,13 @@ 0 0 781 - 788 + 642 + + -1 + @@ -133,7 +148,7 @@ - + Output Update Speed @@ -922,128 +937,117 @@ margin:1px; - - - - 0 - 0 - + + + 4 - - - 0 - 45 - - - - - - - - 4 - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - 592 - 20 - - - - - - - - - 0 - 0 - - - - - 25 - 26 - - - - - 25 - 26 - - - - Takes you to the wiki page - - - - - - - :/core/images/helpicon.svg:/core/images/helpicon.svg - - - - 25 - 25 - - - - true - - - - - - - - 60 - 28 - - - - Send to OpenPilot but don't write in SD. + + + + Qt::Horizontal + + + + 592 + 16 + + + + + + + + + 0 + 0 + + + + + 0 + 25 + + + + + 25 + 25 + + + + Takes you to the wiki page + + + + + + + :/core/images/helpicon.svg:/core/images/helpicon.svg + + + + 25 + 25 + + + + true + + + + + + + + 60 + 32 + + + + + 16777215 + 32 + + + + Send to OpenPilot but don't write in SD. Be sure to set the Neutral position on all sliders before sending! - - - - - - Apply - - - - - - - - 60 - 28 - - - - Be sure to set the Neutral position on all sliders before sending! + + + + + + Apply + + + + + + + + 71 + 32 + + + + + 16777215 + 32 + + + + Be sure to set the Neutral position on all sliders before sending! Applies and Saves all settings to SD - - - - - - Save - - - - - + + + + + + Save + + + + diff --git a/ground/openpilotgcs/src/plugins/config/stabilization.ui b/ground/openpilotgcs/src/plugins/config/stabilization.ui index 739a2329e..344fdaeec 100755 --- a/ground/openpilotgcs/src/plugins/config/stabilization.ui +++ b/ground/openpilotgcs/src/plugins/config/stabilization.ui @@ -6,8 +6,8 @@ 0 0 - 864 - 635 + 978 + 837 @@ -454,12 +454,15 @@ + 16 + + 12 - + 0 0 @@ -479,6 +482,9 @@ false + + + QTabWidget::North @@ -502,9 +508,18 @@ 12 - + 0 + + 5 + + + 0 + + + 12 + @@ -597,13 +612,25 @@ 0 0 - 834 - 532 + 948 + 720 - 12 + 24 + + + 11 + + + 0 + + + 11 + + + 0 @@ -6768,7 +6795,7 @@ border-radius: 5; 20 - 12 + 6 @@ -6787,6 +6814,9 @@ border-radius: 5; 62 + + + Integral @@ -6852,9 +6882,18 @@ border-radius: 5; 12 - + 0 + + 12 + + + 0 + + + 12 + @@ -6932,14 +6971,17 @@ border-radius: 5; 0 0 - 819 - 579 + 948 + 713 true + + 24 + @@ -13371,7 +13413,7 @@ border-radius: 5; 0 - 190 + 195 @@ -16675,6 +16717,19 @@ border-radius: 5; + + + + Qt::Vertical + + + + 20 + 40 + + + + @@ -16702,9 +16757,18 @@ border-radius: 5; 12 - + 0 + + 12 + + + 0 + + + 12 + @@ -16785,11 +16849,14 @@ border-radius: 5; 0 0 - 830 - 543 + 948 + 713 + + 24 + @@ -16810,10 +16877,7 @@ border-radius: 5; Weak Leveling / Axis Lock - - - 4 - + @@ -16866,327 +16930,573 @@ border-radius: 5; - - - - 0 - 60 - - - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 125 - 125 - 125 - - - - - - - 166 - 166 - 166 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 0 - - - - - - - - - 69 - 69 - 69 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 125 - 125 - 125 - - - - - - - 166 - 166 - 166 - - - - - - - 69 - 69 - 69 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 0 - - - - - - - - - 125 - 125 - 125 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 125 - 125 - 125 - - - - - - - 166 - 166 - 166 - - - - - - - 125 - 125 - 125 - - - - - - - 125 - 125 - 125 - - - - - - - 0 - 0 - 0 - - - - - - - - - - - true - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - + + + + 0 + + + 12 + + + 12 + + + 12 + + + - + 0 0 - 25 - 22 + 144 + 16 175 - 22 + 16777215 - - Qt::StrongFocus + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 58 + 58 + 58 + + + + + + + 48 + 48 + 48 + + + + + + + 19 + 19 + 19 + + + + + + + 26 + 26 + 26 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 0 + 0 + 0 + + + + + + + 19 + 19 + 19 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 58 + 58 + 58 + + + + + + + 48 + 48 + 48 + + + + + + + 19 + 19 + 19 + + + + + + + 26 + 26 + 26 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 0 + 0 + 0 + + + + + + + 19 + 19 + 19 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 58 + 58 + 58 + + + + + + + 48 + 48 + 48 + + + + + + + 19 + 19 + 19 + + + + + + + 26 + 26 + 26 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + + + 74 + 74 + 74 + + + + + 36 + 36 + 36 + + + + + + + + + 0 + 0 + 0 + + + + + + + 39 + 39 + 39 + + + + + + + 255 + 255 + 220 + + + + + + + 0 + 0 + 0 + + + + + - - + + + 75 + true + + + + 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; + + + Weak Leveling Kp - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 0 - - - 0.000000000000000 - - - 360.000000000000000 - - - 1.000000000000000 - - - 1.000000000000000 - - - - objname:StabilizationSettings - fieldname:MaxAxisLock - haslimits:no - scale:1 - buttongroup:10 - + Qt::AlignCenter @@ -18302,187 +18612,6 @@ border-radius: 5; - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 90 - 11 - - - - - - - - - 0 - 0 - - - - - 5 - 22 - - - - - 175 - 22 - - - - Qt::StrongFocus - - - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 2 - - - 0.010000000000000 - - - 360.000000000000000 - - - 0.010000000000000 - - - - objname:StabilizationSettings - fieldname:WeakLevelingKp - haslimits:no - scale:1 - buttongroup:10 - - - - - - - - - 0 - 0 - - - - - 25 - 22 - - - - - 175 - 22 - - - - Qt::StrongFocus - - - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 0 - - - 1.000000000000000 - - - 360.000000000000000 - - - 1.000000000000000 - - - - objname:StabilizationSettings - fieldname:MaxWeakLevelingRate - haslimits:no - scale:1 - buttongroup:10 - - - - - - - - - 0 - 0 - - - - - 25 - 22 - - - - - 175 - 22 - - - - Qt::StrongFocus - - - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 0 - - - 1.000000000000000 - - - 360.000000000000000 - - - 1.000000000000000 - - - - objname:StabilizationSettings - fieldname:MaxAxisLockRate - haslimits:no - scale:1 - buttongroup:10 - - - - @@ -19039,564 +19168,79 @@ border-radius: 5; - - + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 90 + 11 + + + + + + - + 0 0 - 144 - 16 + 5 + 22 175 - 16777215 + 22 - - - - - - - 255 - 255 - 255 - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - 0 - 0 - 0 - - - - - - - 19 - 19 - 19 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - 0 - 0 - 0 - - - - - - - 19 - 19 - 19 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - 58 - 58 - 58 - - - - - - - 48 - 48 - 48 - - - - - - - 19 - 19 - 19 - - - - - - - 26 - 26 - 26 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - - - 74 - 74 - 74 - - - - - 36 - 36 - 36 - - - - - - - - - 0 - 0 - 0 - - - - - - - 39 - 39 - 39 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - + + Qt::StrongFocus - - - 75 - true - - - - 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; - - - Weak Leveling Kp + - Qt::AlignCenter + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 2 + + + 0.010000000000000 + + + 360.000000000000000 + + + 0.010000000000000 + + + + objname:StabilizationSettings + fieldname:WeakLevelingKp + haslimits:no + scale:1 + buttongroup:10 + - - + + Qt::Horizontal @@ -19608,6 +19252,132 @@ border-radius: 5; + + + + + 0 + 0 + + + + + 25 + 22 + + + + + 175 + 22 + + + + Qt::StrongFocus + + + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 0 + + + 1.000000000000000 + + + 360.000000000000000 + + + 1.000000000000000 + + + + objname:StabilizationSettings + fieldname:MaxWeakLevelingRate + haslimits:no + scale:1 + buttongroup:10 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + + 25 + 22 + + + + + 175 + 22 + + + + Qt::StrongFocus + + + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 0 + + + 0.000000000000000 + + + 360.000000000000000 + + + 1.000000000000000 + + + 1.000000000000000 + + + + objname:StabilizationSettings + fieldname:MaxAxisLock + haslimits:no + scale:1 + buttongroup:10 + + + + @@ -19621,6 +19391,74 @@ border-radius: 5; + + + + + 0 + 0 + + + + + 25 + 22 + + + + + 175 + 22 + + + + Qt::StrongFocus + + + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 0 + + + 1.000000000000000 + + + 360.000000000000000 + + + 1.000000000000000 + + + + objname:StabilizationSettings + fieldname:MaxAxisLockRate + haslimits:no + scale:1 + buttongroup:10 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + @@ -19937,7 +19775,7 @@ border-radius: 5; - true + false @@ -23075,7 +22913,7 @@ border-radius: 5; - true + false @@ -25014,739 +24852,190 @@ automatically every 300ms, which will help for fast tuning. - - - - 0 - 0 - + + + 4 - - - 0 - 25 - - - - - 16777215 - 45 - - - - - - - - - 0 - 0 - 0 - - - - - - - - - 243 - 243 - 243 - - - - - 250 - 250 - 250 - - - - - - - - - 255 - 255 - 255 - - - - - - - 251 - 251 - 251 - - - - - - - 124 - 124 - 124 - - - - - - - 165 - 165 - 165 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - - - 243 - 243 - 243 - - - - - 250 - 250 - 250 - - - - - - - - - - - 243 - 243 - 243 - - - - - 250 - 250 - 250 - - - - - - - - - 0 - 0 - 0 - - - - - - - 251 - 251 - 251 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 0 - 0 - 0 - - - - - - - - - 243 - 243 - 243 - - - - - 250 - 250 - 250 - - - - - - - - - 255 - 255 - 255 - - - - - - - 251 - 251 - 251 - - - - - - - 124 - 124 - 124 - - - - - - - 165 - 165 - 165 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - - - 243 - 243 - 243 - - - - - 250 - 250 - 250 - - - - - - - - - - - 243 - 243 - 243 - - - - - 250 - 250 - 250 - - - - - - - - - 0 - 0 - 0 - - - - - - - 251 - 251 - 251 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 124 - 124 - 124 - - - - - - - - - 243 - 243 - 243 - - - - - 250 - 250 - 250 - - - - - - - - - 255 - 255 - 255 - - - - - - - 251 - 251 - 251 - - - - - - - 124 - 124 - 124 - - - - - - - 165 - 165 - 165 - - - - - - - 124 - 124 - 124 - - - - - - - 255 - 255 - 255 - - - - - - - 124 - 124 - 124 - - - - - - - - - 243 - 243 - 243 - - - - - 250 - 250 - 250 - - - - - - - - - - - 243 - 243 - 243 - - - - - 250 - 250 - 250 - - - - - - - - - 0 - 0 - 0 - - - - - - - 248 - 248 - 248 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - false - - - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - 4 - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - 450 - 20 - - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 25 - 26 - - - - Takes you to the wiki page - - - - - - - - - - :/core/images/helpicon.svg:/core/images/helpicon.svg - - - - 25 - 25 - - - - true - - - - button:help - url:http://wiki.openpilot.org/x/DAO9 - - - - - - - - - 0 - 0 - - - - - 140 - 32 - - - - - 16777215 - 16777215 - - - - Reloads the saved settings into GCS. + + + + Qt::Horizontal + + + + 450 + 16 + + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 25 + 25 + + + + Takes you to the wiki page + + + + + + + + + + :/core/images/helpicon.svg:/core/images/helpicon.svg + + + + 25 + 25 + + + + true + + + + button:help + url:http://wiki.openpilot.org/x/DAO9 + + + + + + + + + 0 + 0 + + + + + 140 + 32 + + + + + 16777215 + 32 + + + + Reloads the saved settings into GCS. Useful if you have accidentally changed some settings. - - - - - - Reload Board Data - - - - 16 - 16 - - - - - button:reload - buttongroup:10 - - - - - - - - - 0 - 0 - - - - - 78 - 32 - - - - - 16777215 - 16777215 - - - - Send settings to the board but do not save to the non-volatile memory - - - - - - Apply - - - - button:apply - - - - - - - - - 0 - 0 - - - - - 71 - 32 - - - - - 16777215 - 16777215 - - - - Send settings to the board and save to the non-volatile memory - - - - - - Save - - - - button:save - - - - - - + + + + + + Reload Board Data + + + + 16 + 16 + + + + + button:reload + buttongroup:10 + + + + + + + + + 0 + 0 + + + + + 78 + 32 + + + + + 16777215 + 32 + + + + Send settings to the board but do not save to the non-volatile memory + + + + + + Apply + + + + button:apply + + + + + + + + + 0 + 0 + + + + + 71 + 32 + + + + + 16777215 + 32 + + + + Send settings to the board and save to the non-volatile memory + + + + + + Save + + + + button:save + + + + + @@ -25815,7 +25104,6 @@ Useful if you have accidentally changed some settings. rateYawILimit_3 checkBox_3 checkBox_2 - pushButton_6 WeakLevelingKp WeakLevelingRate MaAxisLock diff --git a/ground/openpilotgcs/src/plugins/config/txpid.ui b/ground/openpilotgcs/src/plugins/config/txpid.ui index 914ac344e..57d82447f 100644 --- a/ground/openpilotgcs/src/plugins/config/txpid.ui +++ b/ground/openpilotgcs/src/plugins/config/txpid.ui @@ -7,13 +7,16 @@ 0 0 789 - 715 + 615 TxPID + + -1 + @@ -25,9 +28,18 @@ + -1 + + + 0 + + 12 - + + 0 + + 0 @@ -108,14 +120,17 @@ 0 0 759 - 543 + 503 + + 24 + - + Module Control @@ -148,22 +163,6 @@ Up to 3 separate PID options (or option pairs) can be selected and updated. - - - - Qt::Vertical - - - QSizePolicy::Preferred - - - - 20 - 10 - - - - @@ -668,6 +667,22 @@ margin:1px; + + + + Messages + + + + + + + + + + + + @@ -690,169 +705,124 @@ margin:1px; - - - Messages + + + 4 - - - - - - - - - - - - - - - - 0 - 0 - - - - - 0 - 45 - - - - - 16777215 - 45 - - - - - - - - 4 - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - 570 - 13 - - - - - - - - - 0 - 0 - - - - - 25 - 25 - - - - - 25 - 25 - - - - - 0 - 0 - - - - false - - - - - - - :/core/images/helpicon.svg:/core/images/helpicon.svg - - - - 25 - 25 - - - - false - - - false - - - true - - - - button:help - url:http://wiki.openpilot.org/x/DACiAQ - - - - - - - - - 78 - 32 - - - - Send settings to the board but do not save to the non-volatile memory - - - - - - Apply - - - - - - - - 71 - 32 - - - - Send settings to the board and save to the non-volatile memory - - - - - - Save - - - false - - - - - + + + + Qt::Horizontal + + + + 570 + 16 + + + + + + + + + 0 + 0 + + + + + 25 + 25 + + + + + 25 + 25 + + + + + 0 + 0 + + + + false + + + + + + + :/core/images/helpicon.svg:/core/images/helpicon.svg + + + + 25 + 25 + + + + false + + + false + + + true + + + + button:help + url:http://wiki.openpilot.org/x/DACiAQ + + + + + + + + + 78 + 32 + + + + Send settings to the board but do not save to the non-volatile memory + + + + + + Apply + + + + + + + + 71 + 32 + + + + Send settings to the board and save to the non-volatile memory + + + + + + Save + + + false + + + +