Merge branch 'no_portconfig' of github.com:mavlink/qgroundcontrol

src/comm/SerialLink.h

@@ -103,6 +103,8 @@ public:
     void loadSettings();
     void writeSettings();
 
+    void checkIfCDC();
+
     void run();
     void run2();
 
@@ -154,6 +156,8 @@ protected:
     QMutex m_dataMutex;       // Mutex for reading data from m_port
     QMutex m_writeMutex;      // Mutex for accessing the m_transmitBuffer.
     QList<QString> m_ports;
+    QString type;
+    bool m_is_cdc;
 
 private:
     volatile bool m_stopp;
@@ -161,7 +165,7 @@ private:
     QMutex m_stoppMutex; // Mutex for accessing m_stopp
     QByteArray m_transmitBuffer; // An internal buffer for receiving data from member functions and actually transmitting them via the serial port.
 
-    bool hardwareConnect();
+    bool hardwareConnect(QString &type);
 
 signals:
     void aboutToCloseFlag();

src/configuration.h

@@ -4,7 +4,7 @@
 #include <QString>
 
 /** @brief Polling interval in ms */
-#define SERIAL_POLL_INTERVAL 9
+#define SERIAL_POLL_INTERVAL 5
 
 /** @brief Heartbeat emission rate, in Hertz (times per second) */
 #define MAVLINK_HEARTBEAT_DEFAULT_RATE 1