Merge branch 'experimental' of github.com:pixhawk/qgroundcontrol into experimental

settings/ParameterList.xml

@@ -36,7 +36,7 @@
        />
     <Parameter
        SimulinkPath="avionics_src/sm_avionics/Attitude_Controller/PID_AIL/Angle_Norm/Max_Min_Angle/"
-       SimulinkParameterName="Constant Value"
+       SimulinkParameterName="Value"
        QGCParamID="ANG_AIL_MAX"
        />
     <!-- Elevator Control Parameters -->
@@ -57,7 +57,7 @@
        />
     <Parameter
        SimulinkPath="avionics_src/sm_avionics/Attitude_Controller/PID_ELE/Angle_Norm/Max_Min_Angle/"
-       SimulinkParameterName="Constant Value"
+       SimulinkParameterName="Value"
        QGCParamID="ANG_ELE_MAX"
        />
   </Block>
@@ -199,7 +199,7 @@
        />
     <Parameter
        SimulinkPath="avionics_src/sm_avionics/Servo_Outputs/AileronMix/Controller_Mix/"
-       SimulinkParameterName="Constant Value"
+       SimulinkParameterName="Value"
        QGCParamID="MIX_AIL"
        />
     <!-- Settings for Elevator Servo -->
@@ -220,7 +220,7 @@
        />
     <Parameter
        SimulinkPath="avionics_src/sm_avionics/Servo_Outputs/ElevatorMix/Controller_Mix/"
-       SimulinkParameterName="Constant Value"
+       SimulinkParameterName="Value"
        QGCParamID="MIX_ELE"
        />
   </Block>

src/ui/QGCRemoteControlView.cc

@@ -115,7 +115,7 @@ 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(remoteControlChannelRawChanged(int,float)), calibrationWindow, SLOT(setChannelRaw(int,float)));
+        connect(newUAS, SIGNAL(remoteControlChannelRawChanged(int,float)), calibrationWindow, SLOT(setChannel(int,float)));
 
         connect(newUAS, SIGNAL(remoteControlChannelScaledChanged(int,float)), this, SLOT(setChannelScaled(int,float)));
 //        connect(newUAS, SIGNAL(remoteControlChannelScaledChanged(int,float)), calibrationWindow, SLOT(setChannelScaled(int,float)));

src/ui/RadioCalibration/AirfoilServoCalibrator.cc

@@ -43,21 +43,21 @@ AirfoilServoCalibrator::AirfoilServoCalibrator(AirfoilType type, QWidget *parent
     QLabel *lowPulseString;
     if (type == AILERON)
     {
-        highPulseString = new QLabel(tr("Bank Left"));
+        highPulseString = new QLabel(tr("Bank Right"));
         centerPulseString = new QLabel(tr("Center"));
-        lowPulseString = new QLabel(tr("Bank Right"));
+        lowPulseString = new QLabel(tr("Bank Left"));
     }
     else if (type == ELEVATOR)
     {
-        highPulseString = new QLabel(tr("Nose Down"));
+        highPulseString = new QLabel(tr("Nose Up"));
         centerPulseString = new QLabel(tr("Center"));
-        lowPulseString = new QLabel(tr("Nose Up"));
+        lowPulseString = new QLabel(tr("Nose Down"));
     }
     else if (type == RUDDER)
     {
-        highPulseString = new QLabel(tr("Nose Left"));
+        highPulseString = new QLabel(tr("Nose Right"));
         centerPulseString = new QLabel(tr("Center"));
-        lowPulseString = new QLabel(tr("Nose Right"));
+        lowPulseString = new QLabel(tr("Nose Left"));
     }
     else
     {
@@ -90,8 +90,6 @@ AirfoilServoCalibrator::AirfoilServoCalibrator(AirfoilType type, QWidget *parent
     connect(lowButton, SIGNAL(clicked()), this, SLOT(setLow()));
 }
 
-
-
 void AirfoilServoCalibrator::setHigh()
 {
     highPulseWidth->setText(QString::number(static_cast<double>(logExtrema())));