rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-06 21:54:15 +01:00
Code Issues Releases Activity

LP-245: config: all buttons (help, apply, save, ...) are now handled through autobinding

Browse Source
This commit is contained in:
Philippe Renon 2016-09-20 01:05:13 +02:00 committed by Philippe Renon
parent a9e3e91f92
commit f930e85175
45 changed files with 467 additions and 465 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ground/gcs/src/plugins/config/airframe.ui
View File

@ -218,7 +218,7 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QPushButton" name="airframeHelp"> <widget class="QPushButton" name="helpButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -250,26 +250,35 @@
<property name="flat"> <property name="flat">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="objrelation" stdset="0">
<string>button:help</string>
</property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="saveAircraftToRAM"> <widget class="QPushButton" name="applyButton">
<property name="toolTip"> <property name="toolTip">
<string>Send to board, but don't save permanently (flash or SD).</string> <string>Send to board, but don't save permanently (flash or SD).</string>
</property> </property>
<property name="text"> <property name="text">
<string>Apply</string> <string>Apply</string>
</property> </property>
<property name="objrelation" stdset="0">
<string>button:apply</string>
</property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="saveAircraftToSD"> <widget class="QPushButton" name="saveButton">
<property name="toolTip"> <property name="toolTip">
<string>Applies and Saves all settings to flash or SD depending on board.</string> <string>Applies and Saves all settings to flash or SD depending on board.</string>
</property> </property>
<property name="text"> <property name="text">
<string>Save</string> <string>Save</string>
</property> </property>
<property name="objrelation" stdset="0">
<string>button:save</string>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>
@ -287,9 +296,9 @@
<tabstops> <tabstops>
<tabstop>nameEdit</tabstop> <tabstop>nameEdit</tabstop>
<tabstop>vehicleSetupWizardButton</tabstop> <tabstop>vehicleSetupWizardButton</tabstop>
<tabstop>airframeHelp</tabstop> <tabstop>helpButton</tabstop>
<tabstop>saveAircraftToRAM</tabstop> <tabstop>applyButton</tabstop>
<tabstop>saveAircraftToSD</tabstop> <tabstop>saveButton</tabstop>
</tabstops> </tabstops>
<resources> <resources>
<include location="../coreplugin/core.qrc"/> <include location="../coreplugin/core.qrc"/>

118
ground/gcs/src/plugins/config/autotune.ui
View File

@ -23,7 +23,16 @@
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<property name="margin"> <property name="leftMargin">
<number>12</number>
</property>
<property name="topMargin">
<number>12</number>
</property>
<property name="rightMargin">
<number>12</number>
</property>
<property name="bottomMargin">
<number>12</number> <number>12</number>
</property> </property>
<item> <item>
@ -36,11 +45,38 @@
<string>Pre-Autotune</string> <string>Pre-Autotune</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_5"> <layout class="QGridLayout" name="gridLayout_5">
<property name="margin"> <property name="leftMargin">
<number>12</number>
</property>
<property name="topMargin">
<number>12</number>
</property>
<property name="rightMargin">
<number>12</number>
</property>
<property name="bottomMargin">
<number>12</number> <number>12</number>
</property> </property>
<item row="3" column="0" colspan="3"> <item row="3" column="0" colspan="3">
<widget class="QTextEdit" name="textEdit"> <widget class="QTextEdit" name="textEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
@ -51,9 +87,9 @@
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt; &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Lucida Grande'; font-size:20pt; font-weight:600; color:#ff0000;&quot;&gt;WARNING:&lt;/span&gt;&lt;/p&gt; &lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Lucida Grande'; font-size:20pt; font-weight:600; color:#ff0000;&quot;&gt;WARNING:&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-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:'Lucida Grande'; font-size:13pt;&quot;&gt;&lt;/p&gt; &lt;p style=&quot;-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:'Lucida Grande'; font-size:13pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Lucida Grande'; font-size:13pt;&quot;&gt;&lt;br /&gt;&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Lucida Grande'; font-size:13pt;&quot;&gt;&lt;br /&gt;&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Lucida Grande'; font-size:13pt;&quot;&gt;&lt;br /&gt;&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Lucida Grande'; font-size:13pt;&quot;&gt;&lt;br /&gt;&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Lucida Grande'; font-size:13pt;&quot;&gt;This is an experimental plugin for the GCS that is going to make your aircraft shake, etc, so test with lots of space and be &lt;/span&gt;&lt;span style=&quot; font-family:'Lucida Grande'; font-size:13pt; font-weight:600;&quot;&gt;very very wary&lt;/span&gt;&lt;span style=&quot; font-family:'Lucida Grande'; font-size:13pt;&quot;&gt; for it creating bad tuning values.  Basically there is no reason to think this will work at all.&lt;br /&gt;&lt;br /&gt;To use autotuning, here are the steps:&lt;br /&gt;&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Lucida Grande'; font-size:13pt;&quot;&gt;This is an experimental plugin for the GCS that is going to make your aircraft shake, etc, so test with lots of space and be &lt;/span&gt;&lt;span style=&quot; font-family:'Lucida Grande'; font-size:13pt; font-weight:600;&quot;&gt;very very wary&lt;/span&gt;&lt;span style=&quot; font-family:'Lucida Grande'; font-size:13pt;&quot;&gt; for it creating bad tuning values.  Basically there is no reason to think this will work at all.&lt;br /&gt;&lt;br /&gt;To use autotuning, here are the steps:&lt;br /&gt;&lt;/span&gt;&lt;/p&gt;
@ -99,7 +135,16 @@ p, li { white-space: pre-wrap; }
<string>Autotune Setup</string> <string>Autotune Setup</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QVBoxLayout" name="verticalLayout_3">
<property name="margin"> <property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
@ -182,8 +227,8 @@ p, li { white-space: pre-wrap; }
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>709</width> <width>526</width>
<height>605</height> <height>510</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -199,7 +244,16 @@ p, li { white-space: pre-wrap; }
<property name="spacing"> <property name="spacing">
<number>12</number> <number>12</number>
</property> </property>
<property name="margin"> <property name="leftMargin">
<number>12</number>
</property>
<property name="topMargin">
<number>12</number>
</property>
<property name="rightMargin">
<number>12</number>
</property>
<property name="bottomMargin">
<number>12</number> <number>12</number>
</property> </property>
<item> <item>
@ -601,7 +655,45 @@ will alter settings for the next autotuning flight</string>
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QPushButton" name="stabilizationReloadBoardData_6"> <widget class="QPushButton" name="helpButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>25</width>
<height>25</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>25</width>
<height>25</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../coreplugin/core.qrc">
<normaloff>:/core/images/helpicon.svg</normaloff>:/core/images/helpicon.svg</iconset>
</property>
<property name="iconSize">
<size>
<width>25</width>
<height>25</height>
</size>
</property>
<property name="objrelation" stdset="0">
<string>button:help</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="reloadButton">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
@ -627,7 +719,7 @@ Useful if you have accidentally changed some settings.</string>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="saveStabilizationToRAM_6"> <widget class="QPushButton" name="applyButton">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
@ -651,7 +743,7 @@ Useful if you have accidentally changed some settings.</string>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="saveStabilizationToSD_6"> <widget class="QPushButton" name="saveButton">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
@ -678,6 +770,8 @@ Useful if you have accidentally changed some settings.</string>
</item> </item>
</layout> </layout>
</widget> </widget>
<resources/> <resources>
<include location="../coreplugin/core.qrc"/>
</resources>
<connections/> <connections/>
</ui> </ui>

20
ground/gcs/src/plugins/config/camerastabilization.ui
View File

@ -72,7 +72,7 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>-103</y> <y>0</y>
<width>748</width> <width>748</width>
<height>811</height> <height>811</height>
</rect> </rect>
@ -1321,7 +1321,7 @@ The same value is used for all axes.</string>
</spacer> </spacer>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QPushButton" name="camerastabilizationHelp"> <widget class="QPushButton" name="helpButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -1369,7 +1369,7 @@ The same value is used for all axes.</string>
</widget> </widget>
</item> </item>
<item row="0" column="2"> <item row="0" column="2">
<widget class="QPushButton" name="camerastabilizationResetToDefaults"> <widget class="QPushButton" name="defaultButton">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
@ -1400,7 +1400,7 @@ Apply or Save button afterwards.</string>
</widget> </widget>
</item> </item>
<item row="0" column="3"> <item row="0" column="3">
<widget class="QPushButton" name="pushButton"> <widget class="QPushButton" name="reloadButton">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
@ -1433,7 +1433,7 @@ Apply or Save button afterwards.</string>
</widget> </widget>
</item> </item>
<item row="0" column="4"> <item row="0" column="4">
<widget class="QPushButton" name="camerastabilizationSaveRAM"> <widget class="QPushButton" name="applyButton">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
@ -1460,7 +1460,7 @@ Apply or Save button afterwards.</string>
</widget> </widget>
</item> </item>
<item row="0" column="5"> <item row="0" column="5">
<widget class="QPushButton" name="camerastabilizationSaveSD"> <widget class="QPushButton" name="saveButton">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
@ -1528,10 +1528,10 @@ Apply or Save button afterwards.</string>
<tabstop>yawDecelTime</tabstop> <tabstop>yawDecelTime</tabstop>
<tabstop>gimbalType</tabstop> <tabstop>gimbalType</tabstop>
<tabstop>maxAccel</tabstop> <tabstop>maxAccel</tabstop>
<tabstop>camerastabilizationResetToDefaults</tabstop> <tabstop>defaultButton</tabstop>
<tabstop>pushButton</tabstop> <tabstop>reloadButton</tabstop>
<tabstop>camerastabilizationSaveRAM</tabstop> <tabstop>applyButton</tabstop>
<tabstop>camerastabilizationSaveSD</tabstop> <tabstop>saveButton</tabstop>
</tabstops> </tabstops>
<resources> <resources>
<include location="../coreplugin/core.qrc"/> <include location="../coreplugin/core.qrc"/>

15
ground/gcs/src/plugins/config/cc_hw_settings.ui
View File

@ -456,7 +456,7 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QPushButton" name="cchwHelp"> <widget class="QPushButton" name="helpButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -494,10 +494,13 @@
<property name="flat"> <property name="flat">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="objrelation" stdset="0">
<string>button:help</string>
</property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="saveTelemetryToRAM"> <widget class="QPushButton" name="applyButton">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
@ -596,10 +599,13 @@ Beware of not locking yourself out!</string>
<property name="checkable"> <property name="checkable">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="objrelation" stdset="0">
<string>button:apply</string>
</property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="saveTelemetryToSD"> <widget class="QPushButton" name="saveButton">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
@ -625,6 +631,9 @@ Beware of not locking yourself out!</string>
<property name="text"> <property name="text">
<string>Save</string> <string>Save</string>
</property> </property>
<property name="objrelation" stdset="0">
<string>button:save</string>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>

13
ground/gcs/src/plugins/config/ccattitude.ui
View File

@ -117,7 +117,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>758</width> <width>758</width>
<height>486</height> <height>480</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
@ -550,7 +550,7 @@ A setting of 0.00 disables the filter.</string>
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QPushButton" name="ccAttitudeHelp"> <widget class="QPushButton" name="helpButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -582,6 +582,9 @@ A setting of 0.00 disables the filter.</string>
<property name="flat"> <property name="flat">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="objrelation" stdset="0">
<string>button:help</string>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -595,6 +598,9 @@ A setting of 0.00 disables the filter.</string>
<property name="text"> <property name="text">
<string>Apply</string> <string>Apply</string>
</property> </property>
<property name="objrelation" stdset="0">
<string>button:apply</string>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -611,6 +617,9 @@ A setting of 0.00 disables the filter.</string>
<property name="text"> <property name="text">
<string>Save</string> <string>Save</string>
</property> </property>
<property name="objrelation" stdset="0">
<string>button:save</string>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>

13
ground/gcs/src/plugins/config/cfg_vehicletypes/configccpmwidget.cpp
View File

@ -29,6 +29,9 @@
#include "ui_airframe_ccpm.h" #include "ui_airframe_ccpm.h"
#include <extensionsystem/pluginmanager.h>
#include <uavobjectutilmanager.h>
#include "mixersettings.h" #include "mixersettings.h"
#include "systemsettings.h" #include "systemsettings.h"
#include "actuatorcommand.h" #include "actuatorcommand.h"
@ -1417,6 +1420,16 @@ void ConfigCcpmWidget::SwashLvlFinishButtonPressed()
ccpmSwashplateUpdate(); ccpmSwashplateUpdate();
} }
void ConfigCcpmWidget::saveObjectToSD(UAVObject *obj)
{
// saveObjectToSD is now handled by the UAVUtils plugin in one
// central place (and one central queue)
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
UAVObjectUtilManager *utilMngr = pm->getObject<UAVObjectUtilManager>();
utilMngr->saveObjectToSD(obj);
}
int ConfigCcpmWidget::ShowDisclaimer(int messageID) int ConfigCcpmWidget::ShowDisclaimer(int messageID)
{ {
QMessageBox msgBox; QMessageBox msgBox;

2
ground/gcs/src/plugins/config/cfg_vehicletypes/configccpmwidget.h
View File

@ -112,6 +112,8 @@ private:
QString updateConfigObjects(); QString updateConfigObjects();
void saveObjectToSD(UAVObject *obj);
private slots: private slots:
virtual void setupUI(QString airframeType); virtual void setupUI(QString airframeType);
virtual bool throwConfigError(int typeInt); virtual bool throwConfigError(int typeInt);

32
ground/gcs/src/plugins/config/config_cc_hw_widget.cpp
View File

@ -31,17 +31,14 @@
#include "ui_cc_hw_settings.h" #include "ui_cc_hw_settings.h"
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <uavobjectutilmanager.h>
#include "hwsettings.h" #include "hwsettings.h"
#include <QDebug> #include <QDebug>
#include <QStringList> #include <QStringList>
#include <QWidget> #include <QWidget>
#include <QTextEdit> #include <QSvgRenderer>
#include <QVBoxLayout>
#include <QPushButton>
#include <QDesktopServices>
#include <QUrl>
ConfigCCHWWidget::ConfigCCHWWidget(QWidget *parent) : ConfigTaskWidget(parent) ConfigCCHWWidget::ConfigCCHWWidget(QWidget *parent) : ConfigTaskWidget(parent)
{ {
@ -49,16 +46,10 @@ ConfigCCHWWidget::ConfigCCHWWidget(QWidget *parent) : ConfigTaskWidget(parent)
m_telemetry->setupUi(this); m_telemetry->setupUi(this);
// must be done before auto binding ! // must be done before auto binding !
// setWikiURL(""); setWikiURL("CC+Hardware+Configuration");
addAutoBindings(); addAutoBindings();
connect(m_telemetry->cchwHelp, SIGNAL(clicked()), this, SLOT(openHelp()));
addApplySaveButtons(m_telemetry->saveTelemetryToRAM, m_telemetry->saveTelemetryToSD);
m_telemetry->saveTelemetryToRAM->setVisible(expertMode());
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance(); ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
UAVObjectUtilManager *utilMngr = pm->getObject<UAVObjectUtilManager>(); UAVObjectUtilManager *utilMngr = pm->getObject<UAVObjectUtilManager>();
int id = utilMngr->getBoardModel(); int id = utilMngr->getBoardModel();
@ -101,8 +92,6 @@ ConfigCCHWWidget::ConfigCCHWWidget(QWidget *parent) : ConfigTaskWidget(parent)
} else { } else {
addWidgetBinding("GPSSettings", "DataProtocol", m_telemetry->gpsProtocol); addWidgetBinding("GPSSettings", "DataProtocol", m_telemetry->gpsProtocol);
} }
enableSaveButtons(false);
} }
ConfigCCHWWidget::~ConfigCCHWWidget() ConfigCCHWWidget::~ConfigCCHWWidget()
@ -145,17 +134,6 @@ void ConfigCCHWWidget::widgetsContentsChanged()
void ConfigCCHWWidget::enableSaveButtons(bool enable) void ConfigCCHWWidget::enableSaveButtons(bool enable)
{ {
m_telemetry->saveTelemetryToRAM->setEnabled(enable); m_telemetry->applyButton->setEnabled(enable);
m_telemetry->saveTelemetryToSD->setEnabled(enable); m_telemetry->saveButton->setEnabled(enable);
} }
void ConfigCCHWWidget::openHelp()
{
QDesktopServices::openUrl(QUrl(QString(WIKI_URL_ROOT) + QString("CC+Hardware+Configuration"),
QUrl::StrictMode));
}
/**
* @}
* @}
*/

11
ground/gcs/src/plugins/config/config_cc_hw_widget.h
View File

@ -29,16 +29,10 @@
#define CONFIGCCHWWIDGET_H #define CONFIGCCHWWIDGET_H
#include "../uavobjectwidgetutils/configtaskwidget.h" #include "../uavobjectwidgetutils/configtaskwidget.h"
#include "extensionsystem/pluginmanager.h"
#include "uavobjectmanager.h"
#include "uavobject.h"
#include "smartsavebutton.h"
#include <QWidget>
#include <QList>
#include <QSvgRenderer>
class Ui_CC_HW_Widget; class Ui_CC_HW_Widget;
class QWidget;
class QSvgRenderer;
class ConfigCCHWWidget : public ConfigTaskWidget { class ConfigCCHWWidget : public ConfigTaskWidget {
Q_OBJECT Q_OBJECT
@ -47,7 +41,6 @@ public:
ConfigCCHWWidget(QWidget *parent = 0); ConfigCCHWWidget(QWidget *parent = 0);
~ConfigCCHWWidget(); ~ConfigCCHWWidget();
private slots: private slots:
void openHelp();
void refreshValues(); void refreshValues();
void widgetsContentsChanged(); void widgetsContentsChanged();
void enableSaveButtons(bool enable); void enableSaveButtons(bool enable);

7
ground/gcs/src/plugins/config/configcamerastabilizationwidget.cpp
View File

@ -55,10 +55,6 @@ ConfigCameraStabilizationWidget::ConfigCameraStabilizationWidget(QWidget *parent
disableMouseWheelEvents(); disableMouseWheelEvents();
addApplySaveButtons(ui->camerastabilizationSaveRAM, ui->camerastabilizationSaveSD);
ui->camerastabilizationSaveRAM->setVisible(expertMode());
// These widgets don't have direct relation to UAVObjects // These widgets don't have direct relation to UAVObjects
// and need special processing // and need special processing
QComboBox *outputs[] = { ui->rollChannel, ui->pitchChannel, ui->yawChannel, }; QComboBox *outputs[] = { ui->rollChannel, ui->pitchChannel, ui->yawChannel, };
@ -163,8 +159,7 @@ void ConfigCameraStabilizationWidget::refreshWidgetsValuesImpl(UAVObject *obj)
void ConfigCameraStabilizationWidget::updateObjectsFromWidgetsImpl() void ConfigCameraStabilizationWidget::updateObjectsFromWidgetsImpl()
{ {
// Save state of the module enable checkbox first. // Save state of the module enable checkbox first.
// Do not use setData() member on whole object, if possible, since it triggers // Do not use setData() member on whole object, if possible, since it triggers unnecessary UAVObect update.
// unnessesary UAVObect update.
quint8 enableModule = ui->enableCameraStabilization->isChecked() ? quint8 enableModule = ui->enableCameraStabilization->isChecked() ?
HwSettings::OPTIONALMODULES_ENABLED : HwSettings::OPTIONALMODULES_DISABLED; HwSettings::OPTIONALMODULES_ENABLED : HwSettings::OPTIONALMODULES_DISABLED;
HwSettings *hwSettings = HwSettings::GetInstance(getObjectManager()); HwSettings *hwSettings = HwSettings::GetInstance(getObjectManager());

3
ground/gcs/src/plugins/config/configcamerastabilizationwidget.h
View File

@ -28,8 +28,7 @@
#define CONFIGCAMERASTABILIZATIONWIDGET_H #define CONFIGCAMERASTABILIZATIONWIDGET_H
#include "../uavobjectwidgetutils/configtaskwidget.h" #include "../uavobjectwidgetutils/configtaskwidget.h"
#include "extensionsystem/pluginmanager.h"
#include "uavobjectmanager.h"
#include "uavobject.h" #include "uavobject.h"
#include "camerastabsettings.h" #include "camerastabsettings.h"

19
ground/gcs/src/plugins/config/configccattitudewidget.cpp
View File

@ -29,7 +29,7 @@
#include "ui_ccattitude.h" #include "ui_ccattitude.h"
#include "utils/coordinateconversions.h" #include <utils/coordinateconversions.h>
#include <calibration/calibrationutils.h> #include <calibration/calibrationutils.h>
#include "attitudesettings.h" #include "attitudesettings.h"
@ -37,11 +37,8 @@
#include "accelgyrosettings.h" #include "accelgyrosettings.h"
#include "gyrostate.h" #include "gyrostate.h"
#include <QMutexLocker>
#include <QMessageBox> #include <QMessageBox>
#include <QDebug> #include <QDebug>
#include <QDesktopServices>
#include <QUrl>
ConfigCCAttitudeWidget::ConfigCCAttitudeWidget(QWidget *parent) : ConfigCCAttitudeWidget::ConfigCCAttitudeWidget(QWidget *parent) :
ConfigTaskWidget(parent), accelUpdates(0), gyroUpdates(0) ConfigTaskWidget(parent), accelUpdates(0), gyroUpdates(0)
@ -50,16 +47,10 @@ ConfigCCAttitudeWidget::ConfigCCAttitudeWidget(QWidget *parent) :
ui->setupUi(this); ui->setupUi(this);
// must be done before auto binding ! // must be done before auto binding !
// setWikiURL(""); setWikiURL("CC+Attitude+Configuration");
addAutoBindings(); addAutoBindings();
connect(ui->ccAttitudeHelp, SIGNAL(clicked()), this, SLOT(openHelp()));
addApplySaveButtons(ui->applyButton, ui->saveButton);
ui->applyButton->setVisible(expertMode());
addUAVObject("AttitudeSettings"); addUAVObject("AttitudeSettings");
addUAVObject("AccelGyroSettings"); addUAVObject("AccelGyroSettings");
@ -218,12 +209,6 @@ void ConfigCCAttitudeWidget::startAccelCalibration()
connect(&timer, SIGNAL(timeout()), this, SLOT(timeout())); connect(&timer, SIGNAL(timeout()), this, SLOT(timeout()));
} }
void ConfigCCAttitudeWidget::openHelp()
{
QDesktopServices::openUrl(QUrl(QString(WIKI_URL_ROOT) + QString("CC+Attitude+Configuration"),
QUrl::StrictMode));
}
void ConfigCCAttitudeWidget::setAccelFiltering(bool active) void ConfigCCAttitudeWidget::setAccelFiltering(bool active)
{ {
Q_UNUSED(active); Q_UNUSED(active);

5
ground/gcs/src/plugins/config/configccattitudewidget.h
View File

@ -28,8 +28,7 @@
#define CCATTITUDEWIDGET_H #define CCATTITUDEWIDGET_H
#include "../uavobjectwidgetutils/configtaskwidget.h" #include "../uavobjectwidgetutils/configtaskwidget.h"
#include "extensionsystem/pluginmanager.h"
#include "uavobjectmanager.h"
#include "uavobject.h" #include "uavobject.h"
#include <QWidget> #include <QWidget>
@ -51,7 +50,6 @@ private slots:
void sensorsUpdated(UAVObject *obj); void sensorsUpdated(UAVObject *obj);
void timeout(); void timeout();
void startAccelCalibration(); void startAccelCalibration();
void openHelp();
void setAccelFiltering(bool active); void setAccelFiltering(bool active);
private: private:
@ -67,6 +65,7 @@ private:
QList<double> x_gyro_accum, y_gyro_accum, z_gyro_accum; QList<double> x_gyro_accum, y_gyro_accum, z_gyro_accum;
static const int NUM_SENSOR_UPDATES = 300; static const int NUM_SENSOR_UPDATES = 300;
protected: protected:
virtual void enableControls(bool enable); virtual void enableControls(bool enable);
}; };

31
ground/gcs/src/plugins/config/configinputwidget.cpp
View File

@ -37,21 +37,15 @@
#include "failsafechannelform.h" #include "failsafechannelform.h"
#include "ui_failsafechannelform.h" #include "ui_failsafechannelform.h"
#include <utils/stylehelper.h> #include <uavobjectmanager.h>
#include <uavobjecthelper.h> #include <uavobjecthelper.h>
#include <utils/stylehelper.h>
#include <systemalarms.h> #include <systemalarms.h>
#include <QDebug> #include <QDebug>
#include <QStringList>
#include <QWidget> #include <QWidget>
#include <QTextEdit>
#include <QVBoxLayout>
#include <QPushButton>
#include <QDesktopServices>
#include <QUrl>
#include <QMessageBox> #include <QMessageBox>
#include <QEventLoop>
#include <QGraphicsSvgItem> #include <QGraphicsSvgItem>
#include <QSvgRenderer> #include <QSvgRenderer>
@ -87,15 +81,10 @@ ConfigInputWidget::ConfigInputWidget(QWidget *parent) :
ui->setupUi(this); ui->setupUi(this);
// must be done before auto binding ! // must be done before auto binding !
// setWikiURL(""); setWikiURL("Input+Configuration");
addAutoBindings(); addAutoBindings();
connect(ui->inputHelp, SIGNAL(clicked()), this, SLOT(openHelp()));
addApplySaveButtons(ui->saveRCInputToRAM, ui->saveRCInputToSD);
ui->saveRCInputToRAM->setVisible(expertMode());
connect(this, SIGNAL(enableControlsChanged(bool)), this, SLOT(enableControlsChanged(bool))); connect(this, SIGNAL(enableControlsChanged(bool)), this, SLOT(enableControlsChanged(bool)));
manualCommandObj = ManualControlCommand::GetInstance(getObjectManager()); manualCommandObj = ManualControlCommand::GetInstance(getObjectManager());
@ -493,12 +482,6 @@ void ConfigInputWidget::resizeEvent(QResizeEvent *event)
wizardUi->graphicsView->fitInView(m_txBackground, Qt::KeepAspectRatio); wizardUi->graphicsView->fitInView(m_txBackground, Qt::KeepAspectRatio);
} }
void ConfigInputWidget::openHelp()
{
QDesktopServices::openUrl(QUrl(QString(WIKI_URL_ROOT) + QString("Input+Configuration"),
QUrl::StrictMode));
}
void ConfigInputWidget::goToWizard() void ConfigInputWidget::goToWizard()
{ {
QMessageBox msgBox; QMessageBox msgBox;
@ -1953,8 +1936,8 @@ void ConfigInputWidget::simpleCalibration(bool enable)
{ {
if (enable) { if (enable) {
ui->configurationWizard->setEnabled(false); ui->configurationWizard->setEnabled(false);
ui->saveRCInputToRAM->setEnabled(false); ui->applyButton->setEnabled(false);
ui->saveRCInputToSD->setEnabled(false); ui->saveButton->setEnabled(false);
ui->runCalibration->setText(tr("Stop Manual Calibration")); ui->runCalibration->setText(tr("Stop Manual Calibration"));
throttleError = false; throttleError = false;
@ -2031,8 +2014,8 @@ void ConfigInputWidget::simpleCalibration(bool enable)
actuatorSettingsObj->setData(memento.actuatorSettingsData); actuatorSettingsObj->setData(memento.actuatorSettingsData);
ui->configurationWizard->setEnabled(true); ui->configurationWizard->setEnabled(true);
ui->saveRCInputToRAM->setEnabled(true); ui->applyButton->setEnabled(true);
ui->saveRCInputToSD->setEnabled(true); ui->saveButton->setEnabled(true);
ui->runCalibration->setText(tr("Start Manual Calibration")); ui->runCalibration->setText(tr("Start Manual Calibration"));
disconnect(manualCommandObj, SIGNAL(objectUnpacked(UAVObject *)), this, SLOT(updateCalibration())); disconnect(manualCommandObj, SIGNAL(objectUnpacked(UAVObject *)), this, SLOT(updateCalibration()));

4
ground/gcs/src/plugins/config/configinputwidget.h
View File

@ -29,8 +29,7 @@
#define CONFIGINPUTWIDGET_H #define CONFIGINPUTWIDGET_H
#include "uavobjectwidgetutils/configtaskwidget.h" #include "uavobjectwidgetutils/configtaskwidget.h"
#include "extensionsystem/pluginmanager.h"
#include "uavobjectmanager.h"
#include "uavobject.h" #include "uavobject.h"
#include "manualcontrolcommand.h" #include "manualcontrolcommand.h"
@ -212,7 +211,6 @@ private slots:
void wzCancel(); void wzCancel();
void goToWizard(); void goToWizard();
void disableWizardButton(int); void disableWizardButton(int);
void openHelp();
void identifyControls(); void identifyControls();
void identifyLimits(); void identifyLimits();
void moveTxControls(); void moveTxControls();

3
ground/gcs/src/plugins/config/configoplinkwidget.cpp
View File

@ -56,9 +56,6 @@ ConfigOPLinkWidget::ConfigOPLinkWidget(QWidget *parent) : ConfigTaskWidget(paren
disableMouseWheelEvents(); disableMouseWheelEvents();
addApplySaveButtons(m_oplink->Apply, m_oplink->Save);
m_oplink->Apply->setVisible(expertMode());
connect(this, SIGNAL(connected()), this, SLOT(connected())); connect(this, SIGNAL(connected()), this, SLOT(connected()));
oplinkStatusObj = dynamic_cast<OPLinkStatus *>(getObject("OPLinkStatus")); oplinkStatusObj = dynamic_cast<OPLinkStatus *>(getObject("OPLinkStatus"));

18
ground/gcs/src/plugins/config/configoutputwidget.cpp
View File

@ -49,11 +49,7 @@
#include <QStringList> #include <QStringList>
#include <QWidget> #include <QWidget>
#include <QTextEdit> #include <QTextEdit>
#include <QVBoxLayout>
#include <QPushButton>
#include <QMessageBox> #include <QMessageBox>
#include <QDesktopServices>
#include <QUrl>
ConfigOutputWidget::ConfigOutputWidget(QWidget *parent) : ConfigTaskWidget(parent) ConfigOutputWidget::ConfigOutputWidget(QWidget *parent) : ConfigTaskWidget(parent)
{ {
@ -61,16 +57,10 @@ ConfigOutputWidget::ConfigOutputWidget(QWidget *parent) : ConfigTaskWidget(paren
m_ui->setupUi(this); m_ui->setupUi(this);
// must be done before auto binding ! // must be done before auto binding !
// setWikiURL(""); setWikiURL("Output+Configuration");
addAutoBindings(); addAutoBindings();
// Connect the help button
connect(m_ui->outputHelp, SIGNAL(clicked()), this, SLOT(openHelp()));
addApplySaveButtons(m_ui->saveRCOutputToRAM, m_ui->saveRCOutputToSD);
m_ui->saveRCOutputToRAM->setVisible(expertMode());
m_ui->gvFrame->setVisible(false); m_ui->gvFrame->setVisible(false);
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance(); ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
@ -490,12 +480,6 @@ void ConfigOutputWidget::updateAlwaysStabilizeStatus()
} }
} }
void ConfigOutputWidget::openHelp()
{
QDesktopServices::openUrl(QUrl(QString(WIKI_URL_ROOT) + QString("Output+Configuration"),
QUrl::StrictMode));
}
void ConfigOutputWidget::onBankTypeChange() void ConfigOutputWidget::onBankTypeChange()
{ {
QComboBox *bankModeCombo = qobject_cast<QComboBox *>(sender()); QComboBox *bankModeCombo = qobject_cast<QComboBox *>(sender());

1
ground/gcs/src/plugins/config/configoutputwidget.h
View File

@ -112,7 +112,6 @@ private slots:
void stopTests(); void stopTests();
void runChannelTests(bool state); void runChannelTests(bool state);
void sendChannelTest(int index, int value); void sendChannelTest(int index, int value);
void openHelp();
void onBankTypeChange(); void onBankTypeChange();
}; };

16
ground/gcs/src/plugins/config/configrevohwwidget.cpp
View File

@ -34,9 +34,6 @@
#include "hwsettings.h" #include "hwsettings.h"
#include <QDebug> #include <QDebug>
#include <QDesktopServices>
#include <QUrl>
#include <QMessageBox>
ConfigRevoHWWidget::ConfigRevoHWWidget(QWidget *parent) : ConfigTaskWidget(parent) ConfigRevoHWWidget::ConfigRevoHWWidget(QWidget *parent) : ConfigTaskWidget(parent)
{ {
@ -44,14 +41,11 @@ ConfigRevoHWWidget::ConfigRevoHWWidget(QWidget *parent) : ConfigTaskWidget(paren
m_ui->setupUi(this); m_ui->setupUi(this);
// must be done before auto binding ! // must be done before auto binding !
// setWikiURL(""); setWikiURL("Revolution+Configuration");
addAutoBindings(); addAutoBindings();
connect(m_ui->cchwHelp, SIGNAL(clicked()), this, SLOT(openHelp())); addUAVObject("HwSettings");
addApplySaveButtons(m_ui->saveTelemetryToRAM, m_ui->saveTelemetryToSD);
m_ui->saveTelemetryToRAM->setVisible(expertMode());
addWidgetBinding("HwSettings", "RM_FlexiPort", m_ui->cbFlexi); addWidgetBinding("HwSettings", "RM_FlexiPort", m_ui->cbFlexi);
addWidgetBinding("HwSettings", "RM_MainPort", m_ui->cbMain); addWidgetBinding("HwSettings", "RM_MainPort", m_ui->cbMain);
@ -476,9 +470,3 @@ void ConfigRevoHWWidget::rcvrPortChanged(int index)
break; break;
} }
} }
void ConfigRevoHWWidget::openHelp()
{
QDesktopServices::openUrl(QUrl(QString(WIKI_URL_ROOT) + QString("Revolution+Configuration"),
QUrl::StrictMode));
}

1
ground/gcs/src/plugins/config/configrevohwwidget.h
View File

@ -58,7 +58,6 @@ private slots:
void flexiPortChanged(int index); void flexiPortChanged(int index);
void mainPortChanged(int index); void mainPortChanged(int index);
void rcvrPortChanged(int index); void rcvrPortChanged(int index);
void openHelp();
}; };
#endif // CONFIGREVOHWWIDGET_H #endif // CONFIGREVOHWWIDGET_H

21
ground/gcs/src/plugins/config/configrevohwwidget.ui
View File

@ -121,9 +121,9 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>-148</y> <y>0</y>
<width>796</width> <width>796</width>
<height>804</height> <height>807</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
@ -548,7 +548,7 @@
<string/> <string/>
</property> </property>
<property name="pixmap"> <property name="pixmap">
<pixmap resource="configgadget.qrc">:/configgadget/images/revolution_top.png</pixmap> <pixmap>:/configgadget/images/revolution_top.png</pixmap>
</property> </property>
<property name="scaledContents"> <property name="scaledContents">
<bool>false</bool> <bool>false</bool>
@ -739,7 +739,7 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QPushButton" name="cchwHelp"> <widget class="QPushButton" name="helpButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -777,10 +777,13 @@
<property name="flat"> <property name="flat">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="objrelation" stdset="0">
<string>button:help</string>
</property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="saveTelemetryToRAM"> <widget class="QPushButton" name="applyButton">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
@ -879,10 +882,13 @@ Beware of not locking yourself out!</string>
<property name="checkable"> <property name="checkable">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="objrelation" stdset="0">
<string>button:apply</string>
</property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="saveTelemetryToSD"> <widget class="QPushButton" name="saveButton">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
@ -908,6 +914,9 @@ Beware of not locking yourself out!</string>
<property name="text"> <property name="text">
<string>Save</string> <string>Save</string>
</property> </property>
<property name="objrelation" stdset="0">
<string>button:save</string>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>

16
ground/gcs/src/plugins/config/configrevonanohwwidget.cpp
View File

@ -34,9 +34,6 @@
#include "hwsettings.h" #include "hwsettings.h"
#include <QDebug> #include <QDebug>
#include <QDesktopServices>
#include <QUrl>
#include <QMessageBox>
ConfigRevoNanoHWWidget::ConfigRevoNanoHWWidget(QWidget *parent) : ConfigTaskWidget(parent) ConfigRevoNanoHWWidget::ConfigRevoNanoHWWidget(QWidget *parent) : ConfigTaskWidget(parent)
{ {
@ -44,14 +41,11 @@ ConfigRevoNanoHWWidget::ConfigRevoNanoHWWidget(QWidget *parent) : ConfigTaskWidg
m_ui->setupUi(this); m_ui->setupUi(this);
// must be done before auto binding ! // must be done before auto binding !
// setWikiURL(""); setWikiURL("Revo+Nano+Configuration");
addAutoBindings(); addAutoBindings();
connect(m_ui->cchwHelp, SIGNAL(clicked()), this, SLOT(openHelp())); addUAVObject("HwSettings");
addApplySaveButtons(m_ui->saveTelemetryToRAM, m_ui->saveTelemetryToSD);
m_ui->saveTelemetryToRAM->setVisible(expertMode());
addWidgetBinding("HwSettings", "RM_FlexiPort", m_ui->cbFlexi); addWidgetBinding("HwSettings", "RM_FlexiPort", m_ui->cbFlexi);
addWidgetBinding("HwSettings", "RM_MainPort", m_ui->cbMain); addWidgetBinding("HwSettings", "RM_MainPort", m_ui->cbMain);
@ -266,9 +260,3 @@ void ConfigRevoNanoHWWidget::rcvrPortChanged(int index)
Q_UNUSED(index); Q_UNUSED(index);
/* Nano has no USART at rcvrPort */ /* Nano has no USART at rcvrPort */
} }
void ConfigRevoNanoHWWidget::openHelp()
{
QDesktopServices::openUrl(QUrl(QString(WIKI_URL_ROOT) + QString("Revo+Nano+Configuration"),
QUrl::StrictMode));
}

1
ground/gcs/src/plugins/config/configrevonanohwwidget.h
View File

@ -58,7 +58,6 @@ private slots:
void flexiPortChanged(int index); void flexiPortChanged(int index);
void mainPortChanged(int index); void mainPortChanged(int index);
void rcvrPortChanged(int index); void rcvrPortChanged(int index);
void openHelp();
}; };
#endif // CONFIGREVONANOHWWIDGET_H #endif // CONFIGREVONANOHWWIDGET_H

17
ground/gcs/src/plugins/config/configrevonanohwwidget.ui
View File

@ -254,7 +254,7 @@
<string/> <string/>
</property> </property>
<property name="pixmap"> <property name="pixmap">
<pixmap resource="configgadget.qrc">:/configgadget/images/nano_top.png</pixmap> <pixmap>:/configgadget/images/nano_top.png</pixmap>
</property> </property>
<property name="scaledContents"> <property name="scaledContents">
<bool>false</bool> <bool>false</bool>
@ -459,7 +459,7 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QPushButton" name="cchwHelp"> <widget class="QPushButton" name="helpButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -497,10 +497,13 @@
<property name="flat"> <property name="flat">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="objrelation" stdset="0">
<string>button:help</string>
</property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="saveTelemetryToRAM"> <widget class="QPushButton" name="applyButton">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
@ -599,10 +602,13 @@ Beware of not locking yourself out!</string>
<property name="checkable"> <property name="checkable">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="objrelation" stdset="0">
<string>button:apply</string>
</property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="saveTelemetryToSD"> <widget class="QPushButton" name="saveButton">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
@ -628,6 +634,9 @@ Beware of not locking yourself out!</string>
<property name="text"> <property name="text">
<string>Save</string> <string>Save</string>
</property> </property>
<property name="objrelation" stdset="0">
<string>button:save</string>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>

35
ground/gcs/src/plugins/config/configrevowidget.cpp
View File

@ -29,7 +29,9 @@
#include "ui_revosensors.h" #include "ui_revosensors.h"
#include <uavobjectmanager.h>
#include <uavobjecthelper.h> #include <uavobjecthelper.h>
#include <attitudestate.h> #include <attitudestate.h>
#include <attitudesettings.h> #include <attitudesettings.h>
#include <revocalibration.h> #include <revocalibration.h>
@ -42,22 +44,13 @@
#include "calibration.h" #include "calibration.h"
#include "calibration/calibrationutils.h" #include "calibration/calibrationutils.h"
#include "math.h" #include <math.h>
#include <QDebug>
#include <QTimer>
#include <QStringList>
#include <QWidget>
#include <QTextEdit>
#include <QVBoxLayout>
#include <QPushButton>
#include <QMessageBox>
#include <QThread>
#include <QErrorMessage>
#include <QDesktopServices>
#include <QUrl>
#include <iostream> #include <iostream>
#include <math.h> #include <QDebug>
#include <QStringList>
#include <QWidget>
#include <QThread>
// #define DEBUG // #define DEBUG
@ -82,16 +75,10 @@ ConfigRevoWidget::ConfigRevoWidget(QWidget *parent) :
m_ui->tabWidget->setCurrentIndex(0); m_ui->tabWidget->setCurrentIndex(0);
// must be done before auto binding ! // must be done before auto binding !
// setWikiURL(""); setWikiURL("Revo+Attitude+Configuration");
addAutoBindings(); addAutoBindings();
// Connect the help button
connect(m_ui->attitudeHelp, SIGNAL(clicked()), this, SLOT(openHelp()));
addApplySaveButtons(m_ui->revoCalSettingsSaveRAM, m_ui->revoCalSettingsSaveSD);
m_ui->revoCalSettingsSaveRAM->setVisible(expertMode());
// Initialization of the visual help // Initialization of the visual help
m_ui->calibrationVisualHelp->setScene(new QGraphicsScene(this)); m_ui->calibrationVisualHelp->setScene(new QGraphicsScene(this));
m_ui->calibrationVisualHelp->setRenderHint(QPainter::HighQualityAntialiasing, true); m_ui->calibrationVisualHelp->setRenderHint(QPainter::HighQualityAntialiasing, true);
@ -701,9 +688,3 @@ void ConfigRevoWidget::updateMagStatus()
m_ui->magStatusSource->setToolTip(""); m_ui->magStatusSource->setToolTip("");
} }
} }
void ConfigRevoWidget::openHelp()
{
QDesktopServices::openUrl(QUrl(QString(WIKI_URL_ROOT) + QString("Revo+Attitude+Configuration"),
QUrl::StrictMode));
}

4
ground/gcs/src/plugins/config/configrevowidget.h
View File

@ -29,8 +29,7 @@
#define CONFIGREVOWIDGET_H #define CONFIGREVOWIDGET_H
#include "configtaskwidget.h" #include "configtaskwidget.h"
#include "extensionsystem/pluginmanager.h"
#include "uavobjectmanager.h"
#include "uavobject.h" #include "uavobject.h"
#include "calibration/thermal/thermalcalibrationmodel.h" #include "calibration/thermal/thermalcalibrationmodel.h"
@ -102,7 +101,6 @@ private slots:
float getMagError(float mag[3]); float getMagError(float mag[3]);
void updateVisualHelp(); void updateVisualHelp();
void openHelp();
protected: protected:
void showEvent(QShowEvent *event); void showEvent(QShowEvent *event);

16
ground/gcs/src/plugins/config/configsparky2hwwidget.cpp
View File

@ -34,9 +34,6 @@
#include "hwsettings.h" #include "hwsettings.h"
#include <QDebug> #include <QDebug>
#include <QDesktopServices>
#include <QUrl>
#include <QMessageBox>
ConfigSparky2HWWidget::ConfigSparky2HWWidget(QWidget *parent) : ConfigTaskWidget(parent) ConfigSparky2HWWidget::ConfigSparky2HWWidget(QWidget *parent) : ConfigTaskWidget(parent)
{ {
@ -44,14 +41,11 @@ ConfigSparky2HWWidget::ConfigSparky2HWWidget(QWidget *parent) : ConfigTaskWidget
m_ui->setupUi(this); m_ui->setupUi(this);
// must be done before auto binding ! // must be done before auto binding !
// setWikiURL(""); setWikiURL("Sparky2+Configuration");
addAutoBindings(); addAutoBindings();
connect(m_ui->cchwHelp, SIGNAL(clicked()), this, SLOT(openHelp())); addUAVObject("HwSettings");
addApplySaveButtons(m_ui->saveTelemetryToRAM, m_ui->saveTelemetryToSD);
m_ui->saveTelemetryToRAM->setVisible(expertMode());
addWidgetBinding("HwSettings", "SPK2_FlexiPort", m_ui->cbFlexi); addWidgetBinding("HwSettings", "SPK2_FlexiPort", m_ui->cbFlexi);
addWidgetBinding("HwSettings", "SPK2_MainPort", m_ui->cbMain); addWidgetBinding("HwSettings", "SPK2_MainPort", m_ui->cbMain);
@ -263,9 +257,3 @@ void ConfigSparky2HWWidget::mainPortChanged(int index)
break; break;
} }
} }
void ConfigSparky2HWWidget::openHelp()
{
QDesktopServices::openUrl(QUrl(QString(WIKI_URL_ROOT) + QString("Sparky2+Configuration"),
QUrl::StrictMode));
}

1
ground/gcs/src/plugins/config/configsparky2hwwidget.h
View File

@ -57,7 +57,6 @@ private slots:
void usbHIDPortChanged(int index); void usbHIDPortChanged(int index);
void flexiPortChanged(int index); void flexiPortChanged(int index);
void mainPortChanged(int index); void mainPortChanged(int index);
void openHelp();
}; };
#endif // CONFIGSPARKY2HWWIDGET_H #endif // CONFIGSPARKY2HWWIDGET_H

23
ground/gcs/src/plugins/config/configsparky2hwwidget.ui
View File

@ -121,9 +121,9 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>-258</y> <y>0</y>
<width>794</width> <width>796</width>
<height>927</height> <height>731</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
@ -434,7 +434,7 @@
<string/> <string/>
</property> </property>
<property name="pixmap"> <property name="pixmap">
<pixmap resource="configgadget.qrc">:/configgadget/images/sparky2_top.png</pixmap> <pixmap>:/configgadget/images/sparky2_top.png</pixmap>
</property> </property>
<property name="scaledContents"> <property name="scaledContents">
<bool>false</bool> <bool>false</bool>
@ -555,7 +555,7 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QPushButton" name="cchwHelp"> <widget class="QPushButton" name="helpButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -593,10 +593,13 @@
<property name="flat"> <property name="flat">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="objrelation" stdset="0">
<string>button:help</string>
</property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="saveTelemetryToRAM"> <widget class="QPushButton" name="applyButton">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
@ -695,10 +698,13 @@ Beware of not locking yourself out!</string>
<property name="checkable"> <property name="checkable">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="objrelation" stdset="0">
<string>button:apply</string>
</property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="saveTelemetryToSD"> <widget class="QPushButton" name="saveButton">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
@ -724,6 +730,9 @@ Beware of not locking yourself out!</string>
<property name="text"> <property name="text">
<string>Save</string> <string>Save</string>
</property> </property>
<property name="objrelation" stdset="0">
<string>button:save</string>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>

14
ground/gcs/src/plugins/config/configstabilizationwidget.cpp
View File

@ -29,7 +29,9 @@
#include "ui_stabilization.h" #include "ui_stabilization.h"
#include <uavobjectmanager.h>
#include "objectpersistence.h" #include "objectpersistence.h"
#include "altitudeholdsettings.h" #include "altitudeholdsettings.h"
#include "stabilizationsettings.h" #include "stabilizationsettings.h"
@ -41,14 +43,8 @@
#include <QDebug> #include <QDebug>
#include <QStringList> #include <QStringList>
#include <QWidget> #include <QWidget>
#include <QTextEdit>
#include <QVBoxLayout>
#include <QPushButton>
#include <QDesktopServices>
#include <QUrl>
#include <QList> #include <QList>
#include <QTabBar> #include <QTabBar>
#include <QMessageBox>
#include <QToolButton> #include <QToolButton>
#include <QMenu> #include <QMenu>
#include <QAction> #include <QAction>
@ -60,15 +56,14 @@ ConfigStabilizationWidget::ConfigStabilizationWidget(QWidget *parent) : ConfigTa
ui->setupUi(this); ui->setupUi(this);
// must be done before auto binding ! // must be done before auto binding !
setupStabBanksGUI();
setWikiURL("Stabilization+Configuration"); setWikiURL("Stabilization+Configuration");
setupStabBanksGUI();
addAutoBindings(); addAutoBindings();
disableMouseWheelEvents(); disableMouseWheelEvents();
ui->saveStabilizationToRAM_6->setVisible(expertMode());
connect(this, SIGNAL(enableControlsChanged(bool)), this, SLOT(enableControlsChanged(bool))); connect(this, SIGNAL(enableControlsChanged(bool)), this, SLOT(enableControlsChanged(bool)));
setupExpoPlot(); setupExpoPlot();
@ -113,7 +108,6 @@ ConfigStabilizationWidget::ConfigStabilizationWidget(QWidget *parent) : ConfigTa
addWidget(ui->pushButton_20); addWidget(ui->pushButton_20);
addWidget(ui->pushButton_21); addWidget(ui->pushButton_21);
addWidget(ui->pushButton_22); addWidget(ui->pushButton_22);
addWidget(ui->pushButton_23);
addWidget(ui->basicResponsivenessGroupBox); addWidget(ui->basicResponsivenessGroupBox);
addWidget(ui->basicResponsivenessCheckBox); addWidget(ui->basicResponsivenessCheckBox);

5
ground/gcs/src/plugins/config/configstabilizationwidget.h
View File

@ -29,11 +29,8 @@
#define CONFIGSTABILIZATIONWIDGET_H #define CONFIGSTABILIZATIONWIDGET_H
#include "../uavobjectwidgetutils/configtaskwidget.h" #include "../uavobjectwidgetutils/configtaskwidget.h"
#include "extensionsystem/pluginmanager.h"
#include "uavobjectmanager.h"
#include "uavobject.h"
#include "stabilizationsettings.h" #include "uavobject.h"
#include "qwt/src/qwt_plot_curve.h" #include "qwt/src/qwt_plot_curve.h"
#include "qwt/src/qwt_plot_grid.h" #include "qwt/src/qwt_plot_grid.h"

83
ground/gcs/src/plugins/config/configtxpidwidget.cpp
View File

@ -50,19 +50,7 @@ ConfigTxPIDWidget::ConfigTxPIDWidget(QWidget *parent) : ConfigTaskWidget(parent)
disableMouseWheelEvents(); disableMouseWheelEvents();
addApplySaveButtons(m_txpid->Apply, m_txpid->Save); addUAVObject("HwSettings");
m_txpid->Apply->setVisible(expertMode());
// Cannot use addUAVObjectToWidgetRelation() for OptionaModules enum because
// QCheckBox returns bool (0 or -1) and this value is then set to enum instead
// or enum options
connect(HwSettings::GetInstance(getObjectManager()), SIGNAL(objectUpdated(UAVObject *)), this, SLOT(refreshValues()));
connect(m_txpid->Apply, SIGNAL(clicked()), this, SLOT(applySettings()));
connect(m_txpid->Save, SIGNAL(clicked()), this, SLOT(saveSettings()));
connect(m_txpid->PID1, SIGNAL(currentIndexChanged(int)), this, SLOT(updateSpinBoxProperties(int)));
connect(m_txpid->PID2, SIGNAL(currentIndexChanged(int)), this, SLOT(updateSpinBoxProperties(int)));
connect(m_txpid->PID3, SIGNAL(currentIndexChanged(int)), this, SLOT(updateSpinBoxProperties(int)));
addWidgetBinding("TxPIDSettings", "BankNumber", m_txpid->pidBank, 0, 1, true); addWidgetBinding("TxPIDSettings", "BankNumber", m_txpid->pidBank, 0, 1, true);
@ -92,10 +80,14 @@ ConfigTxPIDWidget::ConfigTxPIDWidget(QWidget *parent) : ConfigTaskWidget(parent)
addWidgetBinding("TxPIDSettings", "UpdateMode", m_txpid->UpdateMode); addWidgetBinding("TxPIDSettings", "UpdateMode", m_txpid->UpdateMode);
connect(this, SIGNAL(widgetContentsChanged(QWidget *)), this, SLOT(processLinkedWidgets(QWidget *)));
addWidget(m_txpid->TxPIDEnable); addWidget(m_txpid->TxPIDEnable);
addWidget(m_txpid->enableAutoCalcYaw); addWidget(m_txpid->enableAutoCalcYaw);
connect(m_txpid->PID1, SIGNAL(currentIndexChanged(int)), this, SLOT(updateSpinBoxProperties(int)));
connect(m_txpid->PID2, SIGNAL(currentIndexChanged(int)), this, SLOT(updateSpinBoxProperties(int)));
connect(m_txpid->PID3, SIGNAL(currentIndexChanged(int)), this, SLOT(updateSpinBoxProperties(int)));
connect(this, SIGNAL(widgetContentsChanged(QWidget *)), this, SLOT(processLinkedWidgets(QWidget *)));
} }
ConfigTxPIDWidget::~ConfigTxPIDWidget() ConfigTxPIDWidget::~ConfigTxPIDWidget()
@ -103,6 +95,41 @@ ConfigTxPIDWidget::~ConfigTxPIDWidget()
// Do nothing // Do nothing
} }
/*
* This overridden function refreshes widgets which have no direct relation
* to any of UAVObjects. It saves their dirty state first because update comes
* from UAVObjects, and then restores it.
*/
void ConfigTxPIDWidget::refreshWidgetsValuesImpl(UAVObject *obj)
{
Q_UNUSED(obj);
// Set module enable checkbox from OptionalModules UAVObject item.
// It needs special processing because ConfigTaskWidget uses TRUE/FALSE
// for QCheckBox, but OptionalModules uses Enabled/Disabled enum values.
HwSettings *hwSettings = HwSettings::GetInstance(getObjectManager());
HwSettings::DataFields hwSettingsData = hwSettings->getData();
m_txpid->TxPIDEnable->setChecked(
hwSettingsData.OptionalModules[HwSettings::OPTIONALMODULES_TXPID] == HwSettings::OPTIONALMODULES_ENABLED);
}
/*
* This overridden function updates UAVObjects which have no direct relation
* to any of widgets.
*/
void ConfigTxPIDWidget::updateObjectsFromWidgetsImpl()
{
// Save state of the module enable checkbox first.
// Do not use setData() member on whole object, if possible, since it triggers unnecessary UAVObect update.
quint8 enableModule = m_txpid->TxPIDEnable->isChecked() ?
HwSettings::OPTIONALMODULES_ENABLED : HwSettings::OPTIONALMODULES_DISABLED;
HwSettings *hwSettings = HwSettings::GetInstance(getObjectManager());
hwSettings->setOptionalModules(HwSettings::OPTIONALMODULES_TXPID, enableModule);
}
static bool isResponsivenessOption(int pidOption) static bool isResponsivenessOption(int pidOption)
{ {
switch (pidOption) { switch (pidOption) {
@ -437,32 +464,6 @@ void ConfigTxPIDWidget::updateSpinBoxProperties(int selectedPidOption)
maxPID->setValue(value); maxPID->setValue(value);
} }
void ConfigTxPIDWidget::refreshValues()
{
HwSettings *hwSettings = HwSettings::GetInstance(getObjectManager());
HwSettings::DataFields hwSettingsData = hwSettings->getData();
m_txpid->TxPIDEnable->setChecked(
hwSettingsData.OptionalModules[HwSettings::OPTIONALMODULES_TXPID] == HwSettings::OPTIONALMODULES_ENABLED);
}
void ConfigTxPIDWidget::applySettings()
{
HwSettings *hwSettings = HwSettings::GetInstance(getObjectManager());
HwSettings::DataFields hwSettingsData = hwSettings->getData();
hwSettingsData.OptionalModules[HwSettings::OPTIONALMODULES_TXPID] =
m_txpid->TxPIDEnable->isChecked() ? HwSettings::OPTIONALMODULES_ENABLED : HwSettings::OPTIONALMODULES_DISABLED;
hwSettings->setData(hwSettingsData);
}
void ConfigTxPIDWidget::saveSettings()
{
applySettings();
UAVObject *obj = HwSettings::GetInstance(getObjectManager());
saveObjectToSD(obj);
}
void ConfigTxPIDWidget::processLinkedWidgets(QWidget *widget) void ConfigTxPIDWidget::processLinkedWidgets(QWidget *widget)
{ {
Q_UNUSED(widget); Q_UNUSED(widget);

9
ground/gcs/src/plugins/config/configtxpidwidget.h
View File

@ -37,15 +37,18 @@ class ConfigTxPIDWidget : public ConfigTaskWidget {
public: public:
ConfigTxPIDWidget(QWidget *parent = 0); ConfigTxPIDWidget(QWidget *parent = 0);
~ConfigTxPIDWidget(); ~ConfigTxPIDWidget();
protected:
virtual void refreshWidgetsValuesImpl(UAVObject *obj);
virtual void updateObjectsFromWidgetsImpl();
private: private:
Ui_TxPIDWidget *m_txpid; Ui_TxPIDWidget *m_txpid;
private slots: private slots:
void processLinkedWidgets(QWidget *widget); void processLinkedWidgets(QWidget *widget);
void updateSpinBoxProperties(int selectedPidOption); void updateSpinBoxProperties(int selectedPidOption);
float getDefaultValueForPidOption(int pidOption); float getDefaultValueForPidOption(int pidOption);
void refreshValues();
void applySettings();
void saveSettings();
}; };
#endif // CONFIGTXPIDWIDGET_H #endif // CONFIGTXPIDWIDGET_H

20
ground/gcs/src/plugins/config/configvehicletypewidget.cpp
View File

@ -46,11 +46,7 @@
#include <QTimer> #include <QTimer>
#include <QWidget> #include <QWidget>
#include <QTextEdit> #include <QTextEdit>
#include <QVBoxLayout>
#include <QPushButton>
#include <math.h> #include <math.h>
#include <QDesktopServices>
#include <QUrl>
/** /**
Static function to get currently assigned channelDescriptions Static function to get currently assigned channelDescriptions
@ -120,17 +116,12 @@ ConfigVehicleTypeWidget::ConfigVehicleTypeWidget(QWidget *parent) : ConfigTaskWi
m_aircraft->setupUi(this); m_aircraft->setupUi(this);
// must be done before auto binding ! // must be done before auto binding !
setWikiURL("TxPID"); setWikiURL("Vehicle+Configuration");
addAutoBindings(); addAutoBindings();
disableMouseWheelEvents(); disableMouseWheelEvents();
connect(m_aircraft->airframeHelp, SIGNAL(clicked()), this, SLOT(openHelp()));
addApplySaveButtons(m_aircraft->saveAircraftToRAM, m_aircraft->saveAircraftToSD);
m_aircraft->saveAircraftToRAM->setVisible(expertMode());
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance(); ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
ConfigGadgetFactory *configGadgetFactory = pm->getObject<ConfigGadgetFactory>(); ConfigGadgetFactory *configGadgetFactory = pm->getObject<ConfigGadgetFactory>();
connect(m_aircraft->vehicleSetupWizardButton, SIGNAL(clicked()), configGadgetFactory, SIGNAL(onOpenVehicleConfigurationWizard())); connect(m_aircraft->vehicleSetupWizardButton, SIGNAL(clicked()), configGadgetFactory, SIGNAL(onOpenVehicleConfigurationWizard()));
@ -351,12 +342,3 @@ VehicleConfig *ConfigVehicleTypeWidget::createVehicleConfigWidget(int frameCateg
} }
return vehicleConfig; return vehicleConfig;
} }
/**
Opens the wiki from the user's default browser
*/
void ConfigVehicleTypeWidget::openHelp()
{
QDesktopServices::openUrl(QUrl(QString(WIKI_URL_ROOT) + QString("Vehicle+Configuration"),
QUrl::StrictMode));
}

1
ground/gcs/src/plugins/config/configvehicletypewidget.h
View File

@ -80,7 +80,6 @@ private:
private slots: private slots:
void switchAirframeType(int index); void switchAirframeType(int index);
void openHelp();
}; };
#endif // CONFIGVEHICLETYPEWIDGET_H #endif // CONFIGVEHICLETYPEWIDGET_H

37
ground/gcs/src/plugins/config/input.ui
View File

@ -116,8 +116,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1220</width> <width>1228</width>
<height>655</height> <height>669</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
@ -547,8 +547,8 @@ font:bold;</string>
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1220</width> <width>773</width>
<height>655</height> <height>587</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="gridLayout_7" rowstretch="1,0,0,0"> <layout class="QGridLayout" name="gridLayout_7" rowstretch="1,0,0,0">
@ -2319,8 +2319,8 @@ font:bold;</string>
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1220</width> <width>616</width>
<height>655</height> <height>351</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_5"> <layout class="QVBoxLayout" name="verticalLayout_5">
@ -2591,8 +2591,8 @@ The failsafe is triggered differently for different receivers. Failsafe should a
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1220</width> <width>564</width>
<height>655</height> <height>159</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
@ -2761,7 +2761,7 @@ Set to 0 to disable (recommended for soaring fixed wings).</string>
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QPushButton" name="inputHelp"> <widget class="QPushButton" name="helpButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -2793,10 +2793,13 @@ Set to 0 to disable (recommended for soaring fixed wings).</string>
<property name="flat"> <property name="flat">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="objrelation" stdset="0">
<string>button:help</string>
</property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="saveRCInputToRAM"> <widget class="QPushButton" name="applyButton">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
@ -2819,10 +2822,13 @@ Be sure to set the Neutral position on all sliders before sending!</string>
<property name="text"> <property name="text">
<string>Apply</string> <string>Apply</string>
</property> </property>
<property name="objrelation" stdset="0">
<string>button:apply</string>
</property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="saveRCInputToSD"> <widget class="QPushButton" name="saveButton">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
@ -2845,6 +2851,9 @@ Applies and Saves all settings to SD</string>
<property name="text"> <property name="text">
<string>Save</string> <string>Save</string>
</property> </property>
<property name="objrelation" stdset="0">
<string>button:save</string>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>
@ -2856,9 +2865,9 @@ Applies and Saves all settings to SD</string>
<tabstop>deadband</tabstop> <tabstop>deadband</tabstop>
<tabstop>armControl</tabstop> <tabstop>armControl</tabstop>
<tabstop>armTimeout</tabstop> <tabstop>armTimeout</tabstop>
<tabstop>inputHelp</tabstop> <tabstop>helpButton</tabstop>
<tabstop>saveRCInputToRAM</tabstop> <tabstop>applyButton</tabstop>
<tabstop>saveRCInputToSD</tabstop> <tabstop>saveButton</tabstop>
</tabstops> </tabstops>
<resources> <resources>
<include location="../coreplugin/core.qrc"/> <include location="../coreplugin/core.qrc"/>

20
ground/gcs/src/plugins/config/oplink.ui
View File

@ -49,8 +49,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>947</width> <width>949</width>
<height>575</height> <height>566</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
@ -1874,7 +1874,7 @@ Leave blank to use autogenerated Device ID.</string>
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QPushButton" name="pushButton"> <widget class="QPushButton" name="helpButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -1917,17 +1917,20 @@ Leave blank to use autogenerated Device ID.</string>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="Apply"> <widget class="QPushButton" name="applyButton">
<property name="toolTip"> <property name="toolTip">
<string>Send settings to the board but do not save to the non-volatile memory.</string> <string>Send settings to the board but do not save to the non-volatile memory.</string>
</property> </property>
<property name="text"> <property name="text">
<string>Apply</string> <string>Apply</string>
</property> </property>
<property name="objrelation" stdset="0">
<string>button:apply</string>
</property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="Save"> <widget class="QPushButton" name="saveButton">
<property name="toolTip"> <property name="toolTip">
<string>Send settings to the board and save to the non-volatile memory.</string> <string>Send settings to the board and save to the non-volatile memory.</string>
</property> </property>
@ -1937,6 +1940,9 @@ Leave blank to use autogenerated Device ID.</string>
<property name="checked"> <property name="checked">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="objrelation" stdset="0">
<string>button:save</string>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>
@ -1946,8 +1952,8 @@ Leave blank to use autogenerated Device ID.</string>
<tabstops> <tabstops>
<tabstop>FirmwareVersion</tabstop> <tabstop>FirmwareVersion</tabstop>
<tabstop>SerialNumber</tabstop> <tabstop>SerialNumber</tabstop>
<tabstop>Apply</tabstop> <tabstop>applyButton</tabstop>
<tabstop>Save</tabstop> <tabstop>saveButton</tabstop>
</tabstops> </tabstops>
<resources> <resources>
<include location="../coreplugin/core.qrc"/> <include location="../coreplugin/core.qrc"/>

21
ground/gcs/src/plugins/config/output.ui
View File

@ -123,7 +123,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>743</width> <width>743</width>
<height>662</height> <height>668</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_3" stretch="0,0,0"> <layout class="QVBoxLayout" name="verticalLayout_3" stretch="0,0,0">
@ -969,7 +969,7 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QPushButton" name="outputHelp"> <widget class="QPushButton" name="helpButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -1007,10 +1007,13 @@
<property name="flat"> <property name="flat">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="objrelation" stdset="0">
<string>button:help</string>
</property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="saveRCOutputToRAM"> <widget class="QPushButton" name="applyButton">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
@ -1033,10 +1036,13 @@ Be sure to set the Neutral position on all sliders before sending!</string>
<property name="text"> <property name="text">
<string>Apply</string> <string>Apply</string>
</property> </property>
<property name="objrelation" stdset="0">
<string>button:apply</string>
</property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="saveRCOutputToSD"> <widget class="QPushButton" name="saveButton">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
@ -1059,6 +1065,9 @@ Applies and Saves all settings to SD</string>
<property name="text"> <property name="text">
<string>Save</string> <string>Save</string>
</property> </property>
<property name="objrelation" stdset="0">
<string>button:save</string>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>
@ -1066,8 +1075,8 @@ Applies and Saves all settings to SD</string>
</layout> </layout>
</widget> </widget>
<tabstops> <tabstops>
<tabstop>saveRCOutputToRAM</tabstop> <tabstop>applyButton</tabstop>
<tabstop>saveRCOutputToSD</tabstop> <tabstop>saveButton</tabstop>
</tabstops> </tabstops>
<resources> <resources>
<include location="../coreplugin/core.qrc"/> <include location="../coreplugin/core.qrc"/>

87
ground/gcs/src/plugins/config/revosensors.ui
View File

@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>935</width> <width>954</width>
<height>726</height> <height>726</height>
</rect> </rect>
</property> </property>
@ -438,8 +438,8 @@
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt; &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> &lt;p style=&quot;-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:'MS Shell Dlg 2'; font-weight:600;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="textInteractionFlags"> <property name="textInteractionFlags">
<set>Qt::NoTextInteraction</set> <set>Qt::NoTextInteraction</set>
@ -1157,10 +1157,10 @@ font:bold;</string>
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt; &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;The bargraphs show the difference between the onboard and auxiliary magnetometer measurements. &lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Cantarell';&quot;&gt;The bargraphs show the difference between the onboard and auxiliary magnetometer measurements. &lt;/span&gt;&lt;/p&gt;
&lt;p align=&quot;justify&quot; style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;When the auxiliary magnetometer rotation is set correctlly, all bargraphs should show all zero (bargraph centered) &lt;a name=&quot;result_box&quot;&gt;&lt;/a&gt;whatever the vehicle's orientation.&lt;/p&gt; &lt;p align=&quot;justify&quot; style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Cantarell';&quot;&gt;When the auxiliary magnetometer rotation is set correctlly, all bargraphs should show all zero (bargraph centered) &lt;/span&gt;&lt;a name=&quot;result_box&quot;&gt;&lt;/a&gt;&lt;span style=&quot; font-family:'Cantarell';&quot;&gt;w&lt;/span&gt;&lt;span style=&quot; font-family:'Cantarell';&quot;&gt;hatever the vehicle's orientation.&lt;/span&gt;&lt;/p&gt;
&lt;p align=&quot;justify&quot; style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;This assumes both magnetometers are calibrated and without alarm.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> &lt;p align=&quot;justify&quot; style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Cantarell';&quot;&gt;This assumes both magnetometers are calibrated and without alarm.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="textInteractionFlags"> <property name="textInteractionFlags">
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set> <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
@ -1707,38 +1707,38 @@ font:bold;</string>
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt; &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:14pt; font-weight:600;&quot;&gt;Help&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:14pt; font-weight:600;&quot;&gt;Help&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt; &lt;p style=&quot;-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:'MS Shell Dlg 2';&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;Steps 1, 2 and 3 are necessary.&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2';&quot;&gt;Steps 1, 2 and 3 are necessary.&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;Step 4 is optional but may help achieve the best possible results.&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2';&quot;&gt;Step 4 is optional but may help achieve the best possible results.&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt; &lt;p style=&quot;-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:'MS Shell Dlg 2';&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:12pt; font-weight:600; font-style:italic;&quot;&gt;Step 1: Accelerometer and Magnetometer calibration&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600; font-style:italic;&quot;&gt;Step 1: Accelerometer and Magnetometer calibration&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt; &lt;p style=&quot;-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:'MS Shell Dlg 2';&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;This step will calibrate the scale for the Magnetometer and the Accelerometer sensors. &lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2';&quot;&gt;This step will calibrate the scale for the Magnetometer and the Accelerometer sensors. &lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;Press &lt;/span&gt;&lt;span style=&quot; font-size:11pt; font-style:italic;&quot;&gt;Start&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt; to begin, and follow the instructions for each step. &lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2';&quot;&gt;Press &lt;/span&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-style:italic;&quot;&gt;Start&lt;/span&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2';&quot;&gt; to begin, and follow the instructions for each step. &lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;For best results with the accelerometer calibration, it is advised that it be performed with a free unmounted flight controller as this allows one to accurately position the board for each orientation in the sequence.&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2';&quot;&gt;For best results with the accelerometer calibration, it is advised that it be performed with a free unmounted flight controller as this allows one to accurately position the board for each orientation in the sequence.&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt; &lt;p style=&quot;-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:'MS Shell Dlg 2';&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;The magnetometer calibration must be performed with the board mounted in the airframe in order for the measurements to incorporate any bias produced by local onboard metal/magnetic elements.&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2';&quot;&gt;The magnetometer calibration must be performed with the board mounted in the airframe in order for the measurements to incorporate any bias produced by local onboard metal/magnetic elements.&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt; &lt;p style=&quot;-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:'MS Shell Dlg 2';&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;Note 1: Before the magnetometer or the accelerometer calibration is performed your Home Location must be set. This step is needed in order to determine the local magnetic field vector (Be) and acceleration due to gravity (g_e).&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2';&quot;&gt;Note 1: Before the magnetometer or the accelerometer calibration is performed your Home Location must be set. This step is needed in order to determine the local magnetic field vector (Be) and acceleration due to gravity (g_e).&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt; &lt;p style=&quot;-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:'MS Shell Dlg 2';&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;Note 2: There is no need to align the airframe exactly south, north, east or west during the individual steps. The directions indicated serve only to tell you in which direction the airframe should be positioned relative to some point. One can simply assume that North is in front of you, East is to the right, West is to the left and South is pointing at you.&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2';&quot;&gt;Note 2: There is no need to align the airframe exactly south, north, east or west during the individual steps. The directions indicated serve only to tell you in which direction the airframe should be positioned relative to some point. One can simply assume that North is in front of you, East is to the right, West is to the left and South is pointing at you.&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt; &lt;p style=&quot;-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:'MS Shell Dlg 2';&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:12pt; font-weight:600; font-style:italic;&quot;&gt;Step 2: Board level calibration&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600; font-style:italic;&quot;&gt;Step 2: Board level calibration&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt; &lt;p style=&quot;-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:'MS Shell Dlg 2';&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;This step will ensure that board leveling is accurate. Place the airframe as horizontally as possible (use a spirit level if necessary), then press &lt;/span&gt;&lt;span style=&quot; font-size:11pt; font-style:italic;&quot;&gt;Start&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;. Do not move the airframe at all until the end of the calibration.&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2';&quot;&gt;This step will ensure that board leveling is accurate. Place the airframe as horizontally as possible (use a spirit level if necessary), then press &lt;/span&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-style:italic;&quot;&gt;Start&lt;/span&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2';&quot;&gt;. Do not move the airframe at all until the end of the calibration.&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt; &lt;p style=&quot;-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:'MS Shell Dlg 2';&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:12pt; font-weight:600; font-style:italic;&quot;&gt;Step 3: Gyro bias calculation&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600; font-style:italic;&quot;&gt;Step 3: Gyro bias calculation&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt; &lt;p style=&quot;-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:'MS Shell Dlg 2';&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;This step will allow you to calibrate the gyro measured value when the board is steady. To perform the calibration leave the board/airframe completely stationary and press &lt;/span&gt;&lt;span style=&quot; font-size:11pt; font-style:italic;&quot;&gt;Start&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;. &lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2';&quot;&gt;This step will allow you to calibrate the gyro measured value when the board is steady. To perform the calibration leave the board/airframe completely stationary and press &lt;/span&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-style:italic;&quot;&gt;Start&lt;/span&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2';&quot;&gt;. &lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt; &lt;p style=&quot;-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:'MS Shell Dlg 2';&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:12pt; font-weight:600; font-style:italic;&quot;&gt;Step 4: Thermal calibration&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:12pt; font-weight:600; font-style:italic;&quot;&gt;Step 4: Thermal calibration&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt; &lt;p style=&quot;-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:'MS Shell Dlg 2';&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;The calibration will compute sensors bias variations at different temperatures while the board warms up.&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2';&quot;&gt;The calibration will compute sensors bias variations at different temperatures while the board warms up.&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;This allows a certain amount of correction of those bias variations against temperature changes. It improves altitude hold accuracy and reduces yaw drift.&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2';&quot;&gt;This allows a certain amount of correction of those bias variations against temperature changes. It improves altitude hold accuracy and reduces yaw drift.&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;To perform this calibration disconnect any power from the board and leave it to cool down at room temperature for 15-20 minutes. Then attach the usb connector to the board and press &lt;/span&gt;&lt;span style=&quot; font-size:11pt; font-style:italic;&quot;&gt;Start&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;, leaving the board completely stationary. Wait until complete.&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2';&quot;&gt;To perform this calibration disconnect any power from the board and leave it to cool down at room temperature for 15-20 minutes. Then attach the usb connector to the board and press &lt;/span&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-style:italic;&quot;&gt;Start&lt;/span&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2';&quot;&gt;, leaving the board completely stationary. Wait until complete.&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> &lt;p style=&quot;-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:'MS Shell Dlg 2';&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="textInteractionFlags"> <property name="textInteractionFlags">
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set> <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
@ -1768,7 +1768,7 @@ p, li { white-space: pre-wrap; }
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QPushButton" name="attitudeHelp"> <widget class="QPushButton" name="helpButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -1808,10 +1808,13 @@ p, li { white-space: pre-wrap; }
<property name="flat"> <property name="flat">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="objrelation" stdset="0">
<string>button:help</string>
</property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="revoCalSettingsSaveRAM"> <widget class="QPushButton" name="applyButton">
<property name="toolTip"> <property name="toolTip">
<string>Save settings to the board (RAM only). <string>Save settings to the board (RAM only).
@ -1827,7 +1830,7 @@ specific calibration button on top of the screen.</string>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="revoCalSettingsSaveSD"> <widget class="QPushButton" name="saveButton">
<property name="toolTip"> <property name="toolTip">
<string>Send settings to the board, and save to the non-volatile memory.</string> <string>Send settings to the board, and save to the non-volatile memory.</string>
</property> </property>

32
ground/gcs/src/plugins/config/stabilization.ui
View File

@ -136,8 +136,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>877</width> <width>863</width>
<height>764</height> <height>821</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QVBoxLayout" name="verticalLayout_3">
@ -7932,8 +7932,8 @@ border-radius: 5;</string>
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>877</width> <width>776</width>
<height>765</height> <height>706</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_29"> <layout class="QVBoxLayout" name="verticalLayout_29">
@ -17354,8 +17354,8 @@ border-radius: 5;</string>
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>877</width> <width>797</width>
<height>671</height> <height>604</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_8" stretch="0,0,0,0,0,0"> <layout class="QVBoxLayout" name="verticalLayout_8" stretch="0,0,0,0,0,0">
@ -23200,8 +23200,8 @@ font:bold;</string>
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>877</width> <width>500</width>
<height>671</height> <height>600</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_18"> <layout class="QVBoxLayout" name="verticalLayout_18">
@ -26214,7 +26214,7 @@ border-radius: 5;</string>
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QPushButton" name="pushButton_23"> <widget class="QPushButton" name="helpButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -26263,7 +26263,7 @@ border-radius: 5;</string>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="stabilizationReloadBoardData_6"> <widget class="QPushButton" name="reloadButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -26307,7 +26307,7 @@ Useful if you have accidentally changed some settings.</string>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="saveStabilizationToRAM_6"> <widget class="QPushButton" name="applyButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -26343,7 +26343,7 @@ Useful if you have accidentally changed some settings.</string>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="saveStabilizationToSD_6"> <widget class="QPushButton" name="saveButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -26520,10 +26520,10 @@ Useful if you have accidentally changed some settings.</string>
<tabstop>AltThrRateSlider_2</tabstop> <tabstop>AltThrRateSlider_2</tabstop>
<tabstop>AltThrRate_2</tabstop> <tabstop>AltThrRate_2</tabstop>
<tabstop>realTimeUpdates_7</tabstop> <tabstop>realTimeUpdates_7</tabstop>
<tabstop>pushButton_23</tabstop> <tabstop>helpButton</tabstop>
<tabstop>stabilizationReloadBoardData_6</tabstop> <tabstop>reloadButton</tabstop>
<tabstop>saveStabilizationToRAM_6</tabstop> <tabstop>applyButton</tabstop>
<tabstop>saveStabilizationToSD_6</tabstop> <tabstop>saveButton</tabstop>
<tabstop>checkBoxLinkAcroFactors</tabstop> <tabstop>checkBoxLinkAcroFactors</tabstop>
<tabstop>tabWidget</tabstop> <tabstop>tabWidget</tabstop>
<tabstop>AttitudeResponsivenessSlider</tabstop> <tabstop>AttitudeResponsivenessSlider</tabstop>

22
ground/gcs/src/plugins/config/txpid.ui
View File

@ -118,9 +118,9 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>-317</y> <y>0</y>
<width>748</width> <width>751</width>
<height>724</height> <height>768</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
@ -1426,7 +1426,7 @@ font:bold;</string>
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QPushButton" name="pushButton"> <widget class="QPushButton" name="helpButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred"> <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -1484,7 +1484,7 @@ font:bold;</string>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="Apply"> <widget class="QPushButton" name="applyButton">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
@ -1500,10 +1500,13 @@ font:bold;</string>
<property name="text"> <property name="text">
<string>Apply</string> <string>Apply</string>
</property> </property>
<property name="objrelation" stdset="0">
<string>button:apply</string>
</property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="Save"> <widget class="QPushButton" name="saveButton">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
@ -1522,6 +1525,9 @@ font:bold;</string>
<property name="checked"> <property name="checked">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="objrelation" stdset="0">
<string>button:save</string>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>
@ -1529,8 +1535,8 @@ font:bold;</string>
</layout> </layout>
</widget> </widget>
<tabstops> <tabstops>
<tabstop>Apply</tabstop> <tabstop>applyButton</tabstop>
<tabstop>Save</tabstop> <tabstop>saveButton</tabstop>
<tabstop>scrollArea</tabstop> <tabstop>scrollArea</tabstop>
<tabstop>PID1</tabstop> <tabstop>PID1</tabstop>
<tabstop>Input1</tabstop> <tabstop>Input1</tabstop>

65
ground/gcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
View File

@ -60,6 +60,12 @@ ConfigTaskWidget::ConfigTaskWidget(QWidget *parent, bool autopilot) : QWidget(pa
UAVSettingsImportExportFactory *importexportplugin = m_pluginManager->getObject<UAVSettingsImportExportFactory>(); UAVSettingsImportExportFactory *importexportplugin = m_pluginManager->getObject<UAVSettingsImportExportFactory>();
connect(importexportplugin, SIGNAL(importAboutToBegin()), this, SLOT(invalidateObjects())); connect(importexportplugin, SIGNAL(importAboutToBegin()), this, SLOT(invalidateObjects()));
m_saveButton = new SmartSaveButton(this);
connect(m_saveButton, SIGNAL(preProcessOperations()), this, SLOT(updateObjectsFromWidgets()));
connect(m_saveButton, SIGNAL(saveSuccessfull()), this, SLOT(clearDirty()));
connect(m_saveButton, SIGNAL(beginOp()), this, SLOT(disableObjectUpdates()));
connect(m_saveButton, SIGNAL(endOp()), this, SLOT(enableObjectUpdates()));
if (m_autopilot) { if (m_autopilot) {
// connect to telemetry manager // connect to telemetry manager
TelemetryManager *tm = m_pluginManager->getObject<TelemetryManager>(); TelemetryManager *tm = m_pluginManager->getObject<TelemetryManager>();
@ -286,20 +292,9 @@ void ConfigTaskWidget::enableComboBoxOptionItem(QComboBox *combo, int optionValu
!enable ? QVariant(0) : QVariant(1 | 32), Qt::UserRole - 1); !enable ? QVariant(0) : QVariant(1 | 32), Qt::UserRole - 1);
} }
void ConfigTaskWidget::saveObjectToSD(UAVObject *obj)
{
// saveObjectToSD is now handled by the UAVUtils plugin in one
// central place (and one central queue)
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
UAVObjectUtilManager *utilMngr = pm->getObject<UAVObjectUtilManager>();
utilMngr->saveObjectToSD(obj);
}
UAVObjectManager *ConfigTaskWidget::getObjectManager() UAVObjectManager *ConfigTaskWidget::getObjectManager()
{ {
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance(); UAVObjectManager *objMngr = m_pluginManager->getObject<UAVObjectManager>();
UAVObjectManager *objMngr = pm->getObject<UAVObjectManager>();
Q_ASSERT(objMngr); Q_ASSERT(objMngr);
return objMngr; return objMngr;
@ -409,27 +404,15 @@ void ConfigTaskWidget::helpButtonPressed()
} }
} }
void ConfigTaskWidget::addApplySaveButtons(QPushButton *update, QPushButton *save) void ConfigTaskWidget::addApplyButton(QPushButton *button)
{ {
if (!m_saveButton) { m_saveButton->addApplyButton(button);
m_saveButton = new SmartSaveButton(this); button->setVisible(expertMode());
connect(m_saveButton, SIGNAL(preProcessOperations()), this, SLOT(updateObjectsFromWidgets()));
connect(m_saveButton, SIGNAL(saveSuccessfull()), this, SLOT(clearDirty()));
connect(m_saveButton, SIGNAL(beginOp()), this, SLOT(disableObjectUpdates()));
connect(m_saveButton, SIGNAL(endOp()), this, SLOT(enableObjectUpdates()));
}
if (update && save) {
m_saveButton->addButtons(save, update);
} else if (update) {
m_saveButton->addApplyButton(update);
} else if (save) {
m_saveButton->addSaveButton(save);
}
foreach(WidgetBinding * binding, m_widgetBindingsPerWidget) {
if (binding->object()) {
m_saveButton->addObject((UAVDataObject *)binding->object());
}
} }
void ConfigTaskWidget::addSaveButton(QPushButton *button)
{
m_saveButton->addSaveButton(button);
} }
void ConfigTaskWidget::enableControls(bool enable) void ConfigTaskWidget::enableControls(bool enable)
@ -636,9 +619,6 @@ void ConfigTaskWidget::addAutoBindings()
{ {
// qDebug() << "ConfigTaskWidget::addAutoBindings() - auto binding" << this; // qDebug() << "ConfigTaskWidget::addAutoBindings() - auto binding" << this;
QPushButton *saveButtonWidget = NULL;
QPushButton *applyButtonWidget = NULL;
foreach(QWidget * widget, this->findChildren<QWidget *>()) { foreach(QWidget * widget, this->findChildren<QWidget *>()) {
QVariant info = widget->property("objrelation"); QVariant info = widget->property("objrelation");
@ -697,15 +677,15 @@ void ConfigTaskWidget::addAutoBindings()
QPushButton *button = NULL; QPushButton *button = NULL;
switch (uiRelation.buttonType) { switch (uiRelation.buttonType) {
case save_button: case save_button:
saveButtonWidget = qobject_cast<QPushButton *>(widget); button = qobject_cast<QPushButton *>(widget);
if (saveButtonWidget) { if (button) {
addApplySaveButtons(NULL, saveButtonWidget); addSaveButton(button);
} }
break; break;
case apply_button: case apply_button:
applyButtonWidget = qobject_cast<QPushButton *>(widget); button = qobject_cast<QPushButton *>(widget);
if (applyButtonWidget) { if (button) {
addApplySaveButtons(applyButtonWidget, NULL); addApplyButton(button);
} }
break; break;
case default_button: case default_button:
@ -741,6 +721,11 @@ void ConfigTaskWidget::addAutoBindings()
} }
} }
} }
foreach(WidgetBinding * binding, m_widgetBindingsPerWidget) {
if (binding->object()) {
m_saveButton->addObject((UAVDataObject *)binding->object());
}
}
} }
// qDebug() << "ConfigTaskWidget::addAutoBindings() - auto binding done for" << this; // qDebug() << "ConfigTaskWidget::addAutoBindings() - auto binding done for" << this;
} }

19
ground/gcs/src/plugins/uavobjectwidgetutils/configtaskwidget.h
View File

@ -29,12 +29,13 @@
#include "uavobjectwidgetutils_global.h" #include "uavobjectwidgetutils_global.h"
#include "extensionsystem/pluginmanager.h"
#include <QWidget> #include <QWidget>
#include <QList> #include <QList>
#include <QVariant> #include <QVariant>
namespace ExtensionSystem {
class PluginManager;
}
class UAVObject; class UAVObject;
class UAVObjectField; class UAVObjectField;
class UAVObjectManager; class UAVObjectManager;
@ -120,7 +121,6 @@ protected:
void disableMouseWheelEvents(); void disableMouseWheelEvents();
bool eventFilter(QObject *obj, QEvent *evt); bool eventFilter(QObject *obj, QEvent *evt);
void saveObjectToSD(UAVObject *obj);
UAVObjectManager *getObjectManager(); UAVObjectManager *getObjectManager();
void addUAVObject(QString objectName, QList<int> *reloadGroups = NULL); void addUAVObject(QString objectName, QList<int> *reloadGroups = NULL);
@ -146,10 +146,6 @@ protected:
void addWidgetBinding(QString objectName, QString fieldName, QWidget *widget, QString elementName); void addWidgetBinding(QString objectName, QString fieldName, QWidget *widget, QString elementName);
void addWidgetBinding(UAVObject *object, UAVObjectField *field, QWidget *widget, QString elementName); void addWidgetBinding(UAVObject *object, UAVObjectField *field, QWidget *widget, QString elementName);
void addApplySaveButtons(QPushButton *update, QPushButton *save);
void addReloadButton(QPushButton *button, int buttonGroup);
void addDefaultButton(QPushButton *button, int buttonGroup);
void addWidgetToReloadGroups(QWidget *widget, QList<int> *reloadGroupIDs); void addWidgetToReloadGroups(QWidget *widget, QList<int> *reloadGroupIDs);
bool addShadowWidgetBinding(QString objectName, QString fieldName, QWidget *widget, int index = 0, double scale = 1, bool addShadowWidgetBinding(QString objectName, QString fieldName, QWidget *widget, int index = 0, double scale = 1,
@ -259,8 +255,10 @@ private:
ExtensionSystem::PluginManager *m_pluginManager; ExtensionSystem::PluginManager *m_pluginManager;
UAVObjectUtilManager *m_objectUtilManager; UAVObjectUtilManager *m_objectUtilManager;
SmartSaveButton *m_saveButton;
QHash<UAVObject *, bool> m_updatedObjects; QHash<UAVObject *, bool> m_updatedObjects;
SmartSaveButton *m_saveButton;
QHash<QPushButton *, QString> m_helpButtons; QHash<QPushButton *, QString> m_helpButtons;
QList<QPushButton *> m_reloadButtons; QList<QPushButton *> m_reloadButtons;
@ -287,6 +285,11 @@ private:
void doAddWidgetBinding(QString objectName, QString fieldName, QWidget *widget, int index = 0, double scale = 1, void doAddWidgetBinding(QString objectName, QString fieldName, QWidget *widget, int index = 0, double scale = 1,
bool isLimited = false, QList<int> *reloadGroupIDs = 0, quint32 instID = 0); bool isLimited = false, QList<int> *reloadGroupIDs = 0, quint32 instID = 0);
void addApplyButton(QPushButton *button);
void addSaveButton(QPushButton *button);
void addReloadButton(QPushButton *button, int buttonGroup);
void addDefaultButton(QPushButton *button, int buttonGroup);
}; };
#endif // CONFIGTASKWIDGET_H #endif // CONFIGTASKWIDGET_H

7
ground/gcs/src/plugins/uavobjectwidgetutils/smartsavebutton.cpp
View File

@ -30,13 +30,6 @@
SmartSaveButton::SmartSaveButton(ConfigTaskWidget *configTaskWidget) : configWidget(configTaskWidget) SmartSaveButton::SmartSaveButton(ConfigTaskWidget *configTaskWidget) : configWidget(configTaskWidget)
{} {}
void SmartSaveButton::addButtons(QPushButton *save, QPushButton *apply)
{
buttonList.insert(save, save_button);
buttonList.insert(apply, apply_button);
connect(save, SIGNAL(clicked()), this, SLOT(processClick()));
connect(apply, SIGNAL(clicked()), this, SLOT(processClick()));
}
void SmartSaveButton::addApplyButton(QPushButton *apply) void SmartSaveButton::addApplyButton(QPushButton *apply)
{ {
buttonList.insert(apply, apply_button); buttonList.insert(apply, apply_button);

1
ground/gcs/src/plugins/uavobjectwidgetutils/smartsavebutton.h
View File

@ -46,7 +46,6 @@ public:
public: public:
SmartSaveButton(ConfigTaskWidget *configTaskWidget); SmartSaveButton(ConfigTaskWidget *configTaskWidget);
void addButtons(QPushButton *save, QPushButton *apply);
void setObjects(QList<UAVDataObject *>); void setObjects(QList<UAVDataObject *>);
void addObject(UAVDataObject *); void addObject(UAVDataObject *);
void clearObjects(); void clearObjects();