From 508fdae1252d9ae7e1cc31b4091de7c531830959 Mon Sep 17 00:00:00 2001 From: James Cotton Date: Thu, 11 Aug 2011 10:31:14 -0500 Subject: [PATCH 1/4] On connect/disconnect load the .png HwConfig image. Drop the .svg from the qrc file for consistency. --- ground/openpilotgcs/src/plugins/config/configgadget.qrc | 3 --- ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/configgadget.qrc b/ground/openpilotgcs/src/plugins/config/configgadget.qrc index a91cd499a..5f982053b 100644 --- a/ground/openpilotgcs/src/plugins/config/configgadget.qrc +++ b/ground/openpilotgcs/src/plugins/config/configgadget.qrc @@ -1,7 +1,6 @@ images/help2.png - images/XBee.svg images/Airframe.png images/Servo.png images/ahrs-calib.svg @@ -11,11 +10,9 @@ images/quad-shapes.svg images/ccpm_setup.svg images/PipXtreme.png - images/gyroscope.svg images/Transmitter.png images/help.png images/coptercontrol.svg - images/hw_config.svg images/hw_config.png images/gyroscope.png diff --git a/ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp b/ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp index 8430f00cf..39acb5adf 100644 --- a/ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp @@ -136,7 +136,7 @@ void ConfigGadgetWidget::onAutopilotConnect() { ftw->insertTab(ConfigGadgetWidget::ins, qwd, QIcon(":/configgadget/images/AHRS-v1.3.png"), QString("Attitude")); ftw->removeTab(ConfigGadgetWidget::hardware); qwd = new ConfigCCHWWidget(this); - ftw->insertTab(ConfigGadgetWidget::hardware, qwd, QIcon(":/configgadget/images/hw_config.svg"), QString("HW Settings")); + ftw->insertTab(ConfigGadgetWidget::hardware, qwd, QIcon(":/configgadget/images/hw_config.png"), QString("HW Settings")); ftw->setCurrentIndex(ConfigGadgetWidget::hardware); } else if ((board & 0xff00) == 256 ) { // Mainboard family @@ -146,7 +146,7 @@ void ConfigGadgetWidget::onAutopilotConnect() { ftw->insertTab(ConfigGadgetWidget::ins, qwd, QIcon(":/configgadget/images/AHRS-v1.3.png"), QString("INS")); ftw->removeTab(ConfigGadgetWidget::hardware); qwd = new ConfigProHWWidget(this); - ftw->insertTab(ConfigGadgetWidget::hardware, qwd, QIcon(":/configgadget/images/hw_config.svg"), QString("HW Settings")); + ftw->insertTab(ConfigGadgetWidget::hardware, qwd, QIcon(":/configgadget/images/hw_config.png"), QString("HW Settings")); ftw->setCurrentIndex(ConfigGadgetWidget::hardware); } } From 669634782f77075ebfa2173fa766620b231672a4 Mon Sep 17 00:00:00 2001 From: James Cotton Date: Thu, 11 Aug 2011 10:45:40 -0500 Subject: [PATCH 2/4] UI: Two aesthetic issues on cc_hw_settings.ui: 1) Don't override fonts when possible. It makes the layout inconsistent. We should come up with a stylesheet/system wide way for things like this. 2) Left align the telemetry speed field instead of making it full screen width 3) Move the "Settings apply after restart" message out of the button row. This makes the buttons not in the same location between panels. --- .../src/plugins/config/cc_hw_settings.ui | 58 +++++++++++-------- 1 file changed, 33 insertions(+), 25 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui b/ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui index 29052623c..67a22d116 100644 --- a/ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui +++ b/ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui @@ -31,7 +31,7 @@ - :/configgadget/images/coptercontrol.svg + :/configgadget/images/coptercontrol.svg true @@ -103,13 +103,6 @@ - - - 11 - 75 - true - - Telemetry speed: @@ -122,6 +115,19 @@ + + + + Qt::Horizontal + + + + 40 + 20 + + + + @@ -156,24 +162,24 @@ + + + + + 75 + true + + + + Changes on this page only take effect after board reset or power cycle + + + true + + + - - - - - 75 - true - - - - Changes on this page only take effect after board reset or power cycle - - - true - - - @@ -231,6 +237,8 @@ Beware of not locking yourself out! - + + + From 681444184cd8a60ac17e216a362778fdc70dcde0 Mon Sep 17 00:00:00 2001 From: James Cotton Date: Thu, 11 Aug 2011 10:58:22 -0500 Subject: [PATCH 3/4] CCHWSettings: Add help button in --- .../src/plugins/config/cc_hw_settings.ui | 39 +++++++++++++++++++ .../plugins/config/config_cc_hw_widget.cpp | 14 ++++++- .../src/plugins/config/config_cc_hw_widget.h | 1 + 3 files changed, 53 insertions(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui b/ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui index 67a22d116..a4a8586e5 100644 --- a/ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui +++ b/ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui @@ -193,6 +193,44 @@ + + + + + 0 + 0 + + + + + 32 + 32 + + + + + 32 + 32 + + + + + + + + :/core/images/helpicon.svg:/core/images/helpicon.svg + + + + 32 + 32 + + + + true + + + @@ -239,6 +277,7 @@ Beware of not locking yourself out! + diff --git a/ground/openpilotgcs/src/plugins/config/config_cc_hw_widget.cpp b/ground/openpilotgcs/src/plugins/config/config_cc_hw_widget.cpp index 62e2d59e2..e5adf27f1 100644 --- a/ground/openpilotgcs/src/plugins/config/config_cc_hw_widget.cpp +++ b/ground/openpilotgcs/src/plugins/config/config_cc_hw_widget.cpp @@ -32,7 +32,8 @@ #include #include #include - +#include +#include ConfigCCHWWidget::ConfigCCHWWidget(QWidget *parent) : ConfigTaskWidget(parent) { @@ -43,6 +44,7 @@ ConfigCCHWWidget::ConfigCCHWWidget(QWidget *parent) : ConfigTaskWidget(parent) addUAVObjectToWidgetRelation("HwSettings","CC_FlexiPort",m_telemetry->cbFlexi); addUAVObjectToWidgetRelation("HwSettings","CC_MainPort",m_telemetry->cbTele); addUAVObjectToWidgetRelation("ManualControlSettings","InputMode",m_telemetry->receiverType); + connect(m_telemetry->cchwHelp,SIGNAL(clicked()),this,SLOT(openHelp())); enableControls(false); populateWidgets(); refreshWidgetsValues(); @@ -88,3 +90,13 @@ void ConfigCCHWWidget::widgetsContentsChanged() } } +void ConfigCCHWWidget::openHelp() +{ + QDesktopServices::openUrl( QUrl("http://wiki.openpilot.org/display/Doc/CopterControl+HW+Settings", QUrl::StrictMode) ); +} + +/** + * @} + * @} + */ + diff --git a/ground/openpilotgcs/src/plugins/config/config_cc_hw_widget.h b/ground/openpilotgcs/src/plugins/config/config_cc_hw_widget.h index 32c8a6988..f815786fb 100644 --- a/ground/openpilotgcs/src/plugins/config/config_cc_hw_widget.h +++ b/ground/openpilotgcs/src/plugins/config/config_cc_hw_widget.h @@ -44,6 +44,7 @@ public: ConfigCCHWWidget(QWidget *parent = 0); ~ConfigCCHWWidget(); private slots: + void openHelp(); void refreshValues(); void widgetsContentsChanged(); From 39fcc5bde3cf1e30b3aff3c36f5863708e690a9e Mon Sep 17 00:00:00 2001 From: James Cotton Date: Thu, 11 Aug 2011 12:05:52 -0500 Subject: [PATCH 4/4] Revert "Telemetry: Remove a processObjectQueue() command that was triggering warnings". Unfortunately this causes problems getting objects quickly on linux. A complete fix to the connection speed issue on all platforms may take some work. This reverts commit 74d1762e4c05e7923d496408752dbad5e7413637. --- ground/openpilotgcs/src/plugins/uavtalk/telemetry.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ground/openpilotgcs/src/plugins/uavtalk/telemetry.cpp b/ground/openpilotgcs/src/plugins/uavtalk/telemetry.cpp index 05a47ed3c..186233ca0 100644 --- a/ground/openpilotgcs/src/plugins/uavtalk/telemetry.cpp +++ b/ground/openpilotgcs/src/plugins/uavtalk/telemetry.cpp @@ -218,6 +218,8 @@ void Telemetry::transactionCompleted(UAVObject* obj, bool success) transPending = false; // Send signal obj->emitTransactionCompleted(success); + // Process new object updates from queue + processObjectQueue(); } else { // qDebug() << "Error: received a transaction completed when did not expect it.";