Merge branch 'master' of github.com:mavlink/qgroundcontrol into config

src/GAudioOutput.h

@@ -59,10 +59,21 @@ This file is part of the PIXHAWK project
 extern "C" {
     cst_voice *REGISTER_VOX(const char *voxdir);
     void UNREGISTER_VOX(cst_voice *vox);
-    cst_voice* register_cmu_us_kal16(const char *voxdir);
+    cst_voice *register_cmu_us_kal16(const char *voxdir);
 }
 #endif
 
+#if _MSC_VER
+// Documentation: http://msdn.microsoft.com/en-us/library/ee125082%28v=VS.85%29.aspx
+#define _ATL_APARTMENT_THREADED
+#include <atlbase.h>
+//You may derive a class from CComModule and use it if you want to override something,
+//but do not change the name of _Module
+extern CComModule _Module;
+#include <atlcom.h>
+#include <sapi.h>
+#endif
+
 /**
  * @brief Audio Output (speech synthesizer and "beep" output)
  * This class follows the singleton design pattern
@@ -73,10 +84,11 @@ class GAudioOutput : public QObject
     Q_OBJECT
 public:
     /** @brief Get the singleton instance */
-    static GAudioOutput* instance();
+    static GAudioOutput *instance();
     /** @brief List available voices */
     QStringList listVoices(void);
-    enum {
+    enum
+    {
         VOICE_MALE = 0,
         VOICE_FEMALE
     } QGVoice;
@@ -86,7 +98,7 @@ public:
 
 public slots:
     /** @brief Say this text if current output priority matches */
-    bool say(QString text, int severity=1);
+    bool say(QString text, int severity = 1);
     /** @brief Play alert sound and say notification message */
     bool alert(QString text);
     /** @brief Start emergency sound */
@@ -115,16 +127,20 @@ protected:
 #endif
 #ifdef Q_OS_LINUX
     //cst_voice* voice; ///< The flite voice object
+#endif
+#ifdef _MSC_VER
+    static ISpVoice *pVoice;
 #endif
     int voiceIndex;   ///< The index of the flite voice to use (awb, slt, rms)
-    Phonon::MediaObject* m_media; ///< The output object for audio
-    Phonon::AudioOutput* m_audioOutput;
+    Phonon::MediaObject *m_media; ///< The output object for audio
+    Phonon::AudioOutput *m_audioOutput;
     bool emergency;   ///< Emergency status flag
-    QTimer* emergencyTimer;
+    QTimer *emergencyTimer;
     bool muted;
 private:
-    GAudioOutput(QObject* parent=NULL);
-//    ~GAudioOutput();
+    GAudioOutput(QObject *parent = NULL);
+    ~GAudioOutput();
 };
 
 #endif // AUDIOOUTPUT_H
+

src/comm/MAVLinkProtocol.cc

@@ -268,6 +268,20 @@ void MAVLinkProtocol::receiveBytes(LinkInterface* link, QByteArray b)
         if (decodeState == 1)
         {
             decodedFirstPacket = true;
+
+            if(message.msgid == MAVLINK_MSG_ID_PING)
+            {
+                // process ping requests (tgt_system and tgt_comp must be zero)
+                mavlink_ping_t ping;
+                mavlink_msg_ping_decode(&message, &ping);
+                if(!ping.target_system && !ping.target_component)
+                {
+                    mavlink_message_t msg;
+                    mavlink_msg_ping_pack(getSystemId(), getComponentId(), &msg, ping.time_usec, ping.seq, message.sysid, message.compid);
+                    sendMessage(msg);
+                }
+            }
+
 #if defined(QGC_PROTOBUF_ENABLED)
 
             if (message.msgid == MAVLINK_MSG_ID_EXTENDED_MESSAGE)

src/ui/designer/QGCComboBox.h

@@ -22,7 +22,7 @@ public:
     explicit QGCComboBox(QWidget *parent = 0);
     ~QGCComboBox();
 
-    virtual void setEditMode(bool editMode) override;
+    virtual void setEditMode(bool editMode);
 
 public slots:
     /** @brief Queue parameter for sending to the MAV (add to pending list)*/

src/ui/designer/QGCCommandButton.h

@@ -18,7 +18,7 @@ public:
     explicit QGCCommandButton(QWidget *parent = 0);
     ~QGCCommandButton();
 
-    virtual void setEditMode(bool editMode) override;
+    virtual void setEditMode(bool editMode);
 
 public slots:
     void sendCommand();

src/ui/designer/QGCParamSlider.h

@@ -20,7 +20,7 @@ public:
     explicit QGCParamSlider(QWidget *parent = 0);
     ~QGCParamSlider();
 
-    virtual void setEditMode(bool editMode) override;
+    virtual void setEditMode(bool editMode);
 
 public slots:
     /** @brief Queue parameter for sending to the MAV (add to pending list)*/

src/ui/designer/QGCTextLabel.h

@@ -19,7 +19,7 @@ public:
     ~QGCTextLabel();
     void setActiveUAS(UASInterface *uas);
     void enableText(int num);
-    virtual void setEditMode(bool editMode) override;
+    virtual void setEditMode(bool editMode);
 public slots:
     void writeSettings(QSettings& settings);
     void readSettings(const QSettings& settings);