From 4decb8d647f0380106988b73c6763fb77a8ff7ec Mon Sep 17 00:00:00 2001 From: Michael Carpenter Date: Fri, 28 Jun 2013 08:35:41 -0400 Subject: [PATCH] Implementation of OSD Configuration --- files/images/devices/MinimOSD.jpg | Bin 0 -> 41403 bytes qgroundcontrol.qrc | 1 + src/ui/configuration/OsdConfig.cc | 30 ++++++++++++++-- src/ui/configuration/OsdConfig.h | 6 ++-- src/ui/configuration/OsdConfig.ui | 56 ++++++++++++++++++++++++++++-- 5 files changed, 86 insertions(+), 7 deletions(-) create mode 100644 files/images/devices/MinimOSD.jpg diff --git a/files/images/devices/MinimOSD.jpg b/files/images/devices/MinimOSD.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b24c7e4a9759278435edcefe778e51765177d26e GIT binary patch literal 41403 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 M{Zn-7!q)iz2X}sf_5c6? literal 0 HcmV?d00001 diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc index bf6092bcf..49cd25075 100644 --- a/qgroundcontrol.qrc +++ b/qgroundcontrol.qrc @@ -114,6 +114,7 @@ files/images/devices/AC-0004-11-2.jpg files/images/devices/BR-0004-03-2.jpg files/images/devices/BR-0016-01-3T.jpg + files/images/devices/MinimOSD.jpg files/styles/Vera.ttf diff --git a/src/ui/configuration/OsdConfig.cc b/src/ui/configuration/OsdConfig.cc index badf1b8e0..d71430e3c 100644 --- a/src/ui/configuration/OsdConfig.cc +++ b/src/ui/configuration/OsdConfig.cc @@ -1,11 +1,37 @@ #include "OsdConfig.h" +#include - -OsdConfig::OsdConfig(QWidget *parent) : QWidget(parent) +OsdConfig::OsdConfig(QWidget *parent) : AP2ConfigWidget(parent) { ui.setupUi(this); + connect(ui.enablePushButton,SIGNAL(clicked()),this,SLOT(enableButtonClicked())); } OsdConfig::~OsdConfig() { } +void OsdConfig::enableButtonClicked() +{ + if (!m_uas) + { + QMessageBox::information(0,tr("Error"),tr("Please connect to a MAV before attempting to set configuration")); + return; + } + m_uas->setParameter(0,"SR0_EXT_STAT",2); + m_uas->setParameter(0,"SR0_EXTRA1",10); + m_uas->setParameter(0,"SR0_EXTRA2",10); + m_uas->setParameter(0,"SR0_EXTRA3",2); + m_uas->setParameter(0,"SR0_POSITION",3); + m_uas->setParameter(0,"SR0_RAW_CTRL",2); + m_uas->setParameter(0,"SR0_RAW_SENS",2); + m_uas->setParameter(0,"SR0_RC_CHAN",2); + + m_uas->setParameter(0,"SR3_EXT_STAT",2); + m_uas->setParameter(0,"SR3_EXTRA1",10); + m_uas->setParameter(0,"SR3_EXTRA2",10); + m_uas->setParameter(0,"SR3_EXTRA3",2); + m_uas->setParameter(0,"SR3_POSITION",3); + m_uas->setParameter(0,"SR3_RAW_CTRL",2); + m_uas->setParameter(0,"SR3_RAW_SENS",2); + m_uas->setParameter(0,"SR3_RC_CHAN",2); +} diff --git a/src/ui/configuration/OsdConfig.h b/src/ui/configuration/OsdConfig.h index ecfb3ceaa..963fa0dd1 100644 --- a/src/ui/configuration/OsdConfig.h +++ b/src/ui/configuration/OsdConfig.h @@ -2,16 +2,18 @@ #define OSDCONFIG_H #include +#include "AP2ConfigWidget.h" #include "ui_OsdConfig.h" -class OsdConfig : public QWidget +class OsdConfig : public AP2ConfigWidget { Q_OBJECT public: explicit OsdConfig(QWidget *parent = 0); ~OsdConfig(); - +private slots: + void enableButtonClicked(); private: Ui::OsdConfig ui; }; diff --git a/src/ui/configuration/OsdConfig.ui b/src/ui/configuration/OsdConfig.ui index c45bc6a25..6c9e4d7ae 100644 --- a/src/ui/configuration/OsdConfig.ui +++ b/src/ui/configuration/OsdConfig.ui @@ -6,8 +6,8 @@ 0 0 - 400 - 300 + 499 + 243 @@ -29,7 +29,57 @@ false + + + + 10 + 60 + 101 + 41 + + + + + + + :/files/images/devices/MinimOSD.jpg + + + true + + + + + + 230 + 60 + 191 + 41 + + + + You only need to use this if you are +having issue with your OSD not +updating + + + + + + 120 + 60 + 91 + 41 + + + + Enable +Telemetry + + - + + + -- 2.22.0