Commit 7f59c693 authored by Bryan Godbolt's avatar Bryan Godbolt

fixed directions on airfoil calibrator

parent d2557030
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
/> />
<Parameter <Parameter
SimulinkPath="avionics_src/sm_avionics/Attitude_Controller/PID_AIL/Angle_Norm/Max_Min_Angle/" SimulinkPath="avionics_src/sm_avionics/Attitude_Controller/PID_AIL/Angle_Norm/Max_Min_Angle/"
SimulinkParameterName="Constant Value" SimulinkParameterName="Value"
QGCParamID="ANG_AIL_MAX" QGCParamID="ANG_AIL_MAX"
/> />
<!-- Elevator Control Parameters --> <!-- Elevator Control Parameters -->
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
/> />
<Parameter <Parameter
SimulinkPath="avionics_src/sm_avionics/Attitude_Controller/PID_ELE/Angle_Norm/Max_Min_Angle/" SimulinkPath="avionics_src/sm_avionics/Attitude_Controller/PID_ELE/Angle_Norm/Max_Min_Angle/"
SimulinkParameterName="Constant Value" SimulinkParameterName="Value"
QGCParamID="ANG_ELE_MAX" QGCParamID="ANG_ELE_MAX"
/> />
</Block> </Block>
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
/> />
<Parameter <Parameter
SimulinkPath="avionics_src/sm_avionics/Servo_Outputs/AileronMix/Controller_Mix/" SimulinkPath="avionics_src/sm_avionics/Servo_Outputs/AileronMix/Controller_Mix/"
SimulinkParameterName="Constant Value" SimulinkParameterName="Value"
QGCParamID="MIX_AIL" QGCParamID="MIX_AIL"
/> />
<!-- Settings for Elevator Servo --> <!-- Settings for Elevator Servo -->
...@@ -220,7 +220,7 @@ ...@@ -220,7 +220,7 @@
/> />
<Parameter <Parameter
SimulinkPath="avionics_src/sm_avionics/Servo_Outputs/ElevatorMix/Controller_Mix/" SimulinkPath="avionics_src/sm_avionics/Servo_Outputs/ElevatorMix/Controller_Mix/"
SimulinkParameterName="Constant Value" SimulinkParameterName="Value"
QGCParamID="MIX_ELE" QGCParamID="MIX_ELE"
/> />
</Block> </Block>
......
...@@ -39,21 +39,21 @@ AirfoilServoCalibrator::AirfoilServoCalibrator(AirfoilType type, QWidget *parent ...@@ -39,21 +39,21 @@ AirfoilServoCalibrator::AirfoilServoCalibrator(AirfoilType type, QWidget *parent
QLabel *lowPulseString; QLabel *lowPulseString;
if (type == AILERON) if (type == AILERON)
{ {
highPulseString = new QLabel(tr("Bank Left")); highPulseString = new QLabel(tr("Bank Right"));
centerPulseString = new QLabel(tr("Center")); centerPulseString = new QLabel(tr("Center"));
lowPulseString = new QLabel(tr("Bank Right")); lowPulseString = new QLabel(tr("Bank Left"));
} }
else if (type == ELEVATOR) else if (type == ELEVATOR)
{ {
highPulseString = new QLabel(tr("Nose Down")); highPulseString = new QLabel(tr("Nose Up"));
centerPulseString = new QLabel(tr("Center")); centerPulseString = new QLabel(tr("Center"));
lowPulseString = new QLabel(tr("Nose Up")); lowPulseString = new QLabel(tr("Nose Down"));
} }
else if (type == RUDDER) else if (type == RUDDER)
{ {
highPulseString = new QLabel(tr("Nose Left")); highPulseString = new QLabel(tr("Nose Right"));
centerPulseString = new QLabel(tr("Center")); centerPulseString = new QLabel(tr("Center"));
lowPulseString = new QLabel(tr("Nose Right")); lowPulseString = new QLabel(tr("Nose Left"));
} }
else else
{ {
...@@ -86,8 +86,6 @@ AirfoilServoCalibrator::AirfoilServoCalibrator(AirfoilType type, QWidget *parent ...@@ -86,8 +86,6 @@ AirfoilServoCalibrator::AirfoilServoCalibrator(AirfoilType type, QWidget *parent
connect(lowButton, SIGNAL(clicked()), this, SLOT(setLow())); connect(lowButton, SIGNAL(clicked()), this, SLOT(setLow()));
} }
void AirfoilServoCalibrator::setHigh() void AirfoilServoCalibrator::setHigh()
{ {
highPulseWidth->setText(QString::number(static_cast<double>(logExtrema()))); highPulseWidth->setText(QString::number(static_cast<double>(logExtrema())));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment