commit before pulling upstream

src/comm/ParameterList.cc

@@ -271,6 +271,8 @@ bool ParameterList::open(QString filename)
 
     read(&paramFile);
 
+    paramFile.close();
+
     return true;
 }
 

src/uas/UAS.cc

@@ -1383,12 +1383,12 @@ void UAS::shutdown()
 
 void UAS::setTargetPosition(float x, float y, float z, float yaw)
 {
-    mavlink_message_t msg;
-    mavlink_msg_position_target_pack(MG::SYSTEM::ID, MG::SYSTEM::COMPID, &msg, x, y, z, yaw);
-
-    // Send message twice to increase chance of reception
-    sendMessage(msg);
-    sendMessage(msg);
+//    mavlink_message_t msg;
+//    mavlink_msg_position_target_pack(MG::SYSTEM::ID, MG::SYSTEM::COMPID, &msg, x, y, z, yaw);
+//
+//    // Send message twice to increase chance of reception
+//    sendMessage(msg);
+//    sendMessage(msg);
 }
 
 /**

src/ui/RadioCalibration/RadioCalibrationData.h

@@ -30,10 +30,6 @@ public:
         THROTTLE
     };
 
-//    void loadFile();
-//    void saveFile();
-//    void send();
-//    void receive();
     const float* operator[](int i) const;
     const QVector<float>& operator()(int i) const;
     void set(int element, int index, float value) {(*data)[element][index] = value;}

src/ui/RadioCalibration/RadioCalibrationWindow.cc

@@ -85,7 +85,10 @@ void RadioCalibrationWindow::saveFile()
 
 void RadioCalibrationWindow::loadFile()
 {
-    qDebug() << __FILE__ << __LINE__ << "LOAD FROM FILE";
+    QString fileName(QFileDialog::getOpenFileName(this,
+                                                  tr("Load RC Calibration"),
+                                                  QString(),
+                                                  tr("XML Files (*.xml)")));
 }
 
 void RadioCalibrationWindow::send()

src/ui/RadioCalibration/RadioCalibrationWindow.h

@@ -10,6 +10,7 @@
 #include <QHBoxLayout>
 #include <QDebug>
 #include <QPointer>
+#include <QFileDialog>
 
 #include "AirfoilServoCalibrator.h"
 #include "SwitchCalibrator.h"