Merge branch 'dev-lin' of https://github.com/godbolt/qgroundcontrol into dev

src/ui/QGCRemoteControlView.cc

@@ -80,9 +80,8 @@ void QGCRemoteControlView::setUASId(int id)
             // The UAS exists, disconnect any existing connections
             disconnect(uas, SIGNAL(remoteControlChannelRawChanged(int,float,float)), this, SLOT(setChannel(int,float,float)));
             disconnect(uas, SIGNAL(remoteControlRSSIChanged(float)), this, SLOT(setRemoteRSSI(float)));
-            disconnect(uas, SIGNAL(radioCalibrationRawReceived(const QPointer<RadioCalibrationData>)), calibrationWindow, SLOT(receive(const QPointer<RadioCalibrationData>&)));
-            disconnect(uas, SIGNAL(remoteControlChannelRawChanged(int,float)), calibrationWindow, SLOT(setChannelRaw(int,float)));
-            disconnect(uas, SIGNAL(remoteControlChannelScaledChanged(int,float,float)), calibrationWindow, SLOT(setChannelScaled(int,float)));
+            disconnect(uas, SIGNAL(radioCalibrationRawReceived(const QPointer<RadioCalibrationData>&)), calibrationWindow, SLOT(receive(const QPointer<RadioCalibrationData>&)));
+            disconnect(uas, SIGNAL(remoteControlChannelRawChanged(int,float)), calibrationWindow, SLOT(setChannel(int,float)));
         }
     }
 
@@ -97,6 +96,9 @@ void QGCRemoteControlView::setUASId(int id)
         connect(newUAS, SIGNAL(remoteControlRSSIChanged(float)), this, SLOT(setRemoteRSSI(float)));
         connect(newUAS, SIGNAL(remoteControlChannelRawChanged(int,float)), this, SLOT(setChannelRaw(int,float)));
         connect(newUAS, SIGNAL(remoteControlChannelScaledChanged(int,float)), this, SLOT(setChannelScaled(int,float)));
+
+        // only connect raw channels to calibration window widget
+        connect(newUAS, SIGNAL(remoteControlChannelRawChanged(int,float)), calibrationWindow, SLOT(setChannel(int,float)));
     }
 }
 

src/ui/RadioCalibration/RadioCalibrationWindow.cc

@@ -52,68 +52,7 @@ RadioCalibrationWindow::RadioCalibrationWindow(QWidget *parent) :
     setUASId(0);
 }
 
-//void RadioCalibrationWindow::setChannelRaw(int ch, float raw)
-//{
-//    /** this expects a particular channel to function mapping
-//       \todo allow run-time channel mapping
-//       */
-//    switch (ch)
-//    {
-//    case 0:
-//        aileron->channelChanged(raw);
-//        break;
-//    case 1:
-//        elevator->channelChanged(raw);
-//        break;
-//    case 2:
-//        throttle->channelChanged(raw);
-//        break;
-//    case 3:
-//        rudder->channelChanged(raw);
-//        break;
-//    case 4:
-//        gyro->channelChanged(raw);
-//        break;
-//    case 5:
-//        pitch->channelChanged(raw);
-//        break;
-
-
-//    }
-//}
-
-//void RadioCalibrationWindow::setChannelScaled(int ch, float normalized)
-//{
-// FIXME James
-// FIXME Bryan
-
-//    /** this expects a particular channel to function mapping
-//       \todo allow run-time channel mapping
-//       */
-//    switch (ch)
-//    {
-//    case 0:
-//        aileron->channelChanged(raw);
-//        break;
-//    case 1:
-//        elevator->channelChanged(raw);
-//        break;
-//    case 2:
-//        throttle->channelChanged(raw);
-//        break;
-//    case 3:
-//        rudder->channelChanged(raw);
-//        break;
-//    case 4:
-//        gyro->channelChanged(raw);
-//        break;
-//    case 5:
-//        pitch->channelChanged(raw);
-//        break;
-
-
-//    }
-//}
+
 
 void RadioCalibrationWindow::setChannel(int ch, float raw)
 {
@@ -313,7 +252,7 @@ void RadioCalibrationWindow::parseSetpoint(const QDomElement &setpoint, const QP
 void RadioCalibrationWindow::send()
 {
     qDebug() << __FILE__ << __LINE__ << "uasId = " << uasId;
-#ifdef MAVLINK_ENABLED_UALBERTA_MESSAGES
+#ifdef MAVLINK_ENABLED_UALBERTA
     UAS *uas = dynamic_cast<UAS*>(UASManager::instance()->getUASForId(uasId));
     if (uas) {
         mavlink_message_t msg;

src/ui/RadioCalibration/RadioCalibrationWindow.h

@@ -67,9 +67,6 @@ public:
 
 public slots:
     void setChannel(int ch, float raw);
-    // @todo remove these functions if they are not needed - were added by lm on dec 14, 2010
-//    void setChannelRaw(int ch, float raw);
-//    void setChannelScaled(int ch, float normalized);
     void loadFile();
     void saveFile();
     void send();