Merge branch 'master' into majian_branch

src/include/Air_Ground_CEC/mainwindow.hpp

@@ -59,6 +59,8 @@ private slots:
 private slots:
     void on_Open_receive_clicked();
 
+    void on_ConnectTello_clicked();
+
 private:
     Ui::MainWindow *ui;
     QNode qnode;

src/main/mainwindow.cpp

@@ -1,6 +1,7 @@
+#define TELLODISCONNECTION 274
 #include "../include/Air_Ground_CEC/mainwindow.hpp"
 #include <QtConcurrent/QtConcurrent>
-
+#include <iostream>
 
 MainWindow::MainWindow(int argc, char **argv, QWidget *parent) :
     QMainWindow(parent), qnode(argc, argv),
@@ -408,3 +409,20 @@ void MainWindow::on_Stop_receive_clicked()
   timer->stop();
   capture.release();
 }
+
+void MainWindow::on_ConnectTello_clicked()
+{
+  /*
+  Tello T("192.168.10.1");
+  int socket_fd, err;
+
+  if((socket_fd = socket(PF_INET,SOCK_DGRAM,IPPROTO_UDP))==-1)
+  {
+    cout << "initialized error" << endl;
+    cout << 0;
+    exit(TELLODISCONNECTION);
+  }
+  */
+}
+
+

src/ui/mainwindow.ui

@@ -310,6 +310,19 @@ margin:0px 0px 0px 0px;
            </property>
           </spacer>
          </item>
+         <item>
+          <widget class="QPushButton" name="ConnectTello">
+           <property name="minimumSize">
+            <size>
+             <width>211</width>
+             <height>71</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>Connect</string>
+           </property>
+          </widget>
+         </item>
          <item>
           <widget class="QPushButton" name="Open_receive">
            <property name="minimumSize">