diff --git a/files/images/devices/MinimOSD.jpg b/files/images/devices/MinimOSD.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..b24c7e4a9759278435edcefe778e51765177d26e
Binary files /dev/null and b/files/images/devices/MinimOSD.jpg differ
diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc
index bf6092bcf18f3dad831d964dfb0a719c2d0f2239..49cd25075def49b4f03abcde2509f1604c3e0474 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 badf1b8e0f56d01e5cbe862f26eb90c0eb841e21..d71430e3ca1a72490dd7af7cee4a7a0f005f5755 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 ecfb3ceaa3c139b7c14cfe90dbd5c5fad03ba851..963fa0dd1a507b8f1d0f1a4e9ad072326d11512b 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 c45bc6a259fac7363cc8b38fec3d1e7036eee474..6c9e4d7aece4e8246d56d24fd691a2e4e06b94d6 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
+
+
-
+
+
+