Removed some warning from QGCParamSlider. Fixed some merge issues in Slugs HIL Sim

src/ui/SlugsHilSim.cc

@@ -25,16 +25,13 @@ This file is part of the QGROUNDCONTROL project
  * @file
  *   @brief Configuration Window for Slugs' HIL Simulator
  *   @author Mariano Lizarraga <malife@gmail.com>
+ *   @author Alejandro Molina <am.alex09@gmail.com>
  */
 
 
 #include "SlugsHilSim.h"
 #include "ui_SlugsHilSim.h"
-#include "LinkManager.h"
 
-#include "SlugsMAV.h"
-#include "qbytearray.h"
-#include "qhostaddress.h"
 
 SlugsHilSim::SlugsHilSim(QWidget *parent) :
     QWidget(parent),
@@ -75,8 +72,8 @@ SlugsHilSim::~SlugsHilSim()
 
 void SlugsHilSim::addToCombo(LinkInterface* theLink){
 
-  ui->cb_mavlinkLinks->addItem(theLink->getName());
   linksAvailable.insert(ui->cb_mavlinkLinks->count(),theLink);
+  ui->cb_mavlinkLinks->addItem(theLink->getName());
 
   if (hilLink == NULL){
     hilLink = theLink;
@@ -161,7 +158,6 @@ void SlugsHilSim::processHilDatagram(const QByteArray* datagram)
     #ifdef MAVLINK_ENABLED_SLUGS
   unsigned char i = 0;
 
-  mavlink_message_t msg;
 
   tmpGpsTime.year  = datagram->at(i++);
   tmpGpsTime.month = datagram->at(i++);
@@ -217,15 +213,6 @@ void SlugsHilSim::processHilDatagram(const QByteArray* datagram)
   tmpLocalPositionData.vy = getFloatFromDatagram(datagram, &i);
   tmpLocalPositionData.vz = getFloatFromDatagram(datagram, &i);
 
-
-//  mavlink_msg_gps_date_time_encode(MG::SYSTEM::ID,MG::SYSTEM::COMPID, &msg, &tmpGpsTime);
-//  activeUas->sendMessage(hilLink, msg);
-
-//  memset(&msg, 0, sizeof(mavlink_message_t));
-
-//  mavlink_msg_gps_raw_encode(MG::SYSTEM::ID,MG::SYSTEM::COMPID, &msg, &tmpGpsRaw);
-//  activeUas->sendMessage(hilLink,msg);
-
   // TODO: this is legacy of old HIL datagram. Need to remove from Simulink model
   i++;
 
@@ -269,7 +256,9 @@ void SlugsHilSim::linkSelected(int cbIndex){
   //hilLink = linksAvailable
     // FIXME Mariano
 
-    hilLink = LinkManager::instance()->getLinkForId(cbIndex);
+    hilLink =linksAvailable.value(cbIndex);
+
+  #endif
 }
 
 void SlugsHilSim::sendMessageToSlugs()

src/ui/SlugsHilSim.h

@@ -30,14 +30,19 @@ This file is part of the QGROUNDCONTROL project
 #ifndef SLUGSHILSIM_H
 #define SLUGSHILSIM_H
 
+#include <stdint.h>
+
 #include <QWidget>
 #include <QHostAddress>
 #include <QUdpSocket>
 #include <QMessageBox>
+#include <QByteArray>
+
 
 #include "LinkInterface.h"
 #include "UAS.h"
-#include <stdint.h>
+#include "LinkManager.h"
+#include "SlugsMAV.h"
 
 
 namespace Ui {

src/ui/designer/QGCParamSlider.cc

 #include <QMenu>
 #include <QContextMenuEvent>
+#include <QSettings>
 
 #include "QGCParamSlider.h"
 #include "ui_QGCParamSlider.h"
 #include "UASInterface.h"
 
+
 QGCParamSlider::QGCParamSlider(QWidget *parent) :
     QGCToolWidgetItem("Slider", parent),
     parameterName(""),
@@ -82,10 +84,11 @@ void QGCParamSlider::changeEvent(QEvent *e)
 
 void QGCParamSlider::writeSettings(QSettings& settings)
 {
+  Q_UNUSED(settings);
 
 }
 
 void QGCParamSlider::readSettings(const QSettings& settings)
 {
-
+  Q_UNUSED(settings);
 }