zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

QGC4.4
pixhawk 15 years ago
parent
fea454e8e8 9096a15016
commit
4b1ae00c64
3 changed files with 234 additions and 236 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 454
      settings/ParameterList.xml
  2. 2
      src/ui/QGCRemoteControlView.cc
  3. 14
      src/ui/RadioCalibration/AirfoilServoCalibrator.cc

454
settings/ParameterList.xml
Unescape View File

@ -1,227 +1,227 @@
<ParameterList version="0.1"> <ParameterList version="0.1">
<!-- Parameters in the top level block --> <!-- Parameters in the top level block -->
<Block name="TopLevel"> <Block name="TopLevel">
</Block> </Block>
<!--Parameters related to the navigation block --> <!--Parameters related to the navigation block -->
<Block name="Navigation"> <Block name="Navigation">
<Parameter <Parameter
SimulinkPath="avionics_src/sm_avionics/Navigation_Filter/NAV_FILT_INIT/" SimulinkPath="avionics_src/sm_avionics/Navigation_Filter/NAV_FILT_INIT/"
SimulinkParameterName="Value" SimulinkParameterName="Value"
QGCParamID="NAV_FILT_INIT" QGCParamID="NAV_FILT_INIT"
/> />
</Block> </Block>
<!--Parameters related to the controller block --> <!--Parameters related to the controller block -->
<Block name="Controller"> <Block name="Controller">
<!-- Aileron Control Parameters --> <!-- Aileron Control Parameters -->
<Parameter <Parameter
SimulinkPath="avionics_src/sm_avionics/Attitude_Controller/PID_AIL/kp/" SimulinkPath="avionics_src/sm_avionics/Attitude_Controller/PID_AIL/kp/"
SimulinkParameterName="Gain" SimulinkParameterName="Gain"
QGCParamID="AIL_KP" QGCParamID="AIL_KP"
/> />
<Parameter <Parameter
SimulinkPath="avionics_src/sm_avionics/Attitude_Controller/PID_AIL/ki/" SimulinkPath="avionics_src/sm_avionics/Attitude_Controller/PID_AIL/ki/"
SimulinkParameterName="Gain" SimulinkParameterName="Gain"
QGCParamID="AIL_KI" QGCParamID="AIL_KI"
/> />
<Parameter <Parameter
SimulinkPath="avionics_src/sm_avionics/Attitude_Controller/PID_AIL/kd/" SimulinkPath="avionics_src/sm_avionics/Attitude_Controller/PID_AIL/kd/"
SimulinkParameterName="Gain" SimulinkParameterName="Gain"
QGCParamID="AIL_KD" QGCParamID="AIL_KD"
/> />
<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 -->
<Parameter <Parameter
SimulinkPath="avionics_src/sm_avionics/Attitude_Controller/PID_ELE/kp/" SimulinkPath="avionics_src/sm_avionics/Attitude_Controller/PID_ELE/kp/"
SimulinkParameterName="Gain" SimulinkParameterName="Gain"
QGCParamID="ELE_KP" QGCParamID="ELE_KP"
/> />
<Parameter <Parameter
SimulinkPath="avionics_src/sm_avionics/Attitude_Controller/PID_ELE/ki/" SimulinkPath="avionics_src/sm_avionics/Attitude_Controller/PID_ELE/ki/"
SimulinkParameterName="Gain" SimulinkParameterName="Gain"
QGCParamID="ELE_KI" QGCParamID="ELE_KI"
/> />
<Parameter <Parameter
SimulinkPath="avionics_src/sm_avionics/Attitude_Controller/PID_ELE/kd/" SimulinkPath="avionics_src/sm_avionics/Attitude_Controller/PID_ELE/kd/"
SimulinkParameterName="Gain" SimulinkParameterName="Gain"
QGCParamID="ELE_KD" QGCParamID="ELE_KD"
/> />
<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>
<!-- Paremters for the Pilot Input/Raw RC block --> <!-- Paremters for the Pilot Input/Raw RC block -->
<Block name="ServoInputs"> <Block name="ServoInputs">
<!-- Settings for Aileron Servo --> <!-- Settings for Aileron Servo -->
<Parameter <Parameter
SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/AileronInput/" SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/AileronInput/"
SimulinkParameterName="Setpoint0" SimulinkParameterName="Setpoint0"
QGCParamID="AIL_LEFT_IN" QGCParamID="AIL_LEFT_IN"
/> />
<Parameter <Parameter
SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/AileronInput/" SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/AileronInput/"
SimulinkParameterName="Setpoint1" SimulinkParameterName="Setpoint1"
QGCParamID="AIL_CENTER_IN" QGCParamID="AIL_CENTER_IN"
/> />
<Parameter <Parameter
SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/AileronInput/" SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/AileronInput/"
SimulinkParameterName="Setpoint2" SimulinkParameterName="Setpoint2"
QGCParamID="AIL_RIGHT_IN" QGCParamID="AIL_RIGHT_IN"
/> />
<!-- Settings for Elevator Servo --> <!-- Settings for Elevator Servo -->
<Parameter <Parameter
SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/ElevatorInput/" SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/ElevatorInput/"
SimulinkParameterName="Setpoint0" SimulinkParameterName="Setpoint0"
QGCParamID="ELE_DOWN_IN" QGCParamID="ELE_DOWN_IN"
/> />
<Parameter <Parameter
SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/ElevatorInput/" SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/ElevatorInput/"
SimulinkParameterName="Setpoint1" SimulinkParameterName="Setpoint1"
QGCParamID="ELE_CENTER_IN" QGCParamID="ELE_CENTER_IN"
/> />
<Parameter <Parameter
SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/ElevatorInput/" SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/ElevatorInput/"
SimulinkParameterName="Setpoint2" SimulinkParameterName="Setpoint2"
QGCParamID="ELE_UP_IN" QGCParamID="ELE_UP_IN"
/> />
<!-- Settings for Throttle Servo --> <!-- Settings for Throttle Servo -->
<Parameter <Parameter
SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/ThrottleInput/" SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/ThrottleInput/"
SimulinkParameterName="Setpoint0" SimulinkParameterName="Setpoint0"
QGCParamID="THR_SET0_IN" QGCParamID="THR_SET0_IN"
/> />
<Parameter <Parameter
SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/ThrottleInput/" SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/ThrottleInput/"
SimulinkParameterName="Setpoint1" SimulinkParameterName="Setpoint1"
QGCParamID="THR_SET1_IN" QGCParamID="THR_SET1_IN"
/> />
<Parameter <Parameter
SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/ThrottleInput/" SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/ThrottleInput/"
SimulinkParameterName="Setpoint2" SimulinkParameterName="Setpoint2"
QGCParamID="THR_SET2_IN" QGCParamID="THR_SET2_IN"
/> />
<Parameter <Parameter
SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/ThrottleInput/" SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/ThrottleInput/"
SimulinkParameterName="Setpoint3" SimulinkParameterName="Setpoint3"
QGCParamID="THR_SET3_IN" QGCParamID="THR_SET3_IN"
/> />
<Parameter <Parameter
SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/ThrottleInput/" SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/ThrottleInput/"
SimulinkParameterName="Setpoint4" SimulinkParameterName="Setpoint4"
QGCParamID="THR_SET4_IN" QGCParamID="THR_SET4_IN"
/> />
<!-- Settings for Rudder Servo --> <!-- Settings for Rudder Servo -->
<Parameter <Parameter
SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/RudderInput/" SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/RudderInput/"
SimulinkParameterName="Setpoint0" SimulinkParameterName="Setpoint0"
QGCParamID="RUD_LEFT_IN" QGCParamID="RUD_LEFT_IN"
/> />
<Parameter <Parameter
SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/RudderInput/" SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/RudderInput/"
SimulinkParameterName="Setpoint1" SimulinkParameterName="Setpoint1"
QGCParamID="RUD_CENTER_IN" QGCParamID="RUD_CENTER_IN"
/> />
<Parameter <Parameter
SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/RudderInput/" SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/RudderInput/"
SimulinkParameterName="Setpoint2" SimulinkParameterName="Setpoint2"
QGCParamID="RUD_RIGHT_IN" QGCParamID="RUD_RIGHT_IN"
/> />
<!-- Settings for Gyro Mode/Gain Switch --> <!-- Settings for Gyro Mode/Gain Switch -->
<Parameter <Parameter
SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/GyroInput/" SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/GyroInput/"
SimulinkParameterName="Setpoint0" SimulinkParameterName="Setpoint0"
QGCParamID="GYRO_DEF_IN" QGCParamID="GYRO_DEF_IN"
/> />
<Parameter <Parameter
SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/GyroInput/" SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/GyroInput/"
SimulinkParameterName="Setpoint1" SimulinkParameterName="Setpoint1"
QGCParamID="GYRO_TOG_IN" QGCParamID="GYRO_TOG_IN"
/> />
<!-- Settings for Pitch Servo --> <!-- Settings for Pitch Servo -->
<Parameter <Parameter
SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/PitchInput/" SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/PitchInput/"
SimulinkParameterName="Setpoint0" SimulinkParameterName="Setpoint0"
QGCParamID="PIT_SET0_IN" QGCParamID="PIT_SET0_IN"
/> />
<Parameter <Parameter
SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/PitchInput/" SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/PitchInput/"
SimulinkParameterName="Setpoint1" SimulinkParameterName="Setpoint1"
QGCParamID="PIT_SET1_IN" QGCParamID="PIT_SET1_IN"
/> />
<Parameter <Parameter
SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/PitchInput/" SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/PitchInput/"
SimulinkParameterName="Setpoint2" SimulinkParameterName="Setpoint2"
QGCParamID="PIT_SET2_IN" QGCParamID="PIT_SET2_IN"
/> />
<Parameter <Parameter
SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/PitchInput/" SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/PitchInput/"
SimulinkParameterName="Setpoint3" SimulinkParameterName="Setpoint3"
QGCParamID="PIT_SET3_IN" QGCParamID="PIT_SET3_IN"
/> />
<Parameter <Parameter
SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/PitchInput/" SimulinkPath="avionics_src/sm_avionics/Pilot_Inputs/PitchInput/"
SimulinkParameterName="Setpoint4" SimulinkParameterName="Setpoint4"
QGCParamID="PIT_SET4_IN" QGCParamID="PIT_SET4_IN"
/> />
</Block> </Block>
<!-- Parameters for the servo output block --> <!-- Parameters for the servo output block -->
<Block name="ServoOutputs"> <Block name="ServoOutputs">
<!-- Settings for Aileron Servo --> <!-- Settings for Aileron Servo -->
<Parameter <Parameter
SimulinkPath="avionics_src/sm_avionics/Servo_Outputs/AileronOutput/" SimulinkPath="avionics_src/sm_avionics/Servo_Outputs/AileronOutput/"
SimulinkParameterName="Setpoint0" SimulinkParameterName="Setpoint0"
QGCParamID="AIL_LEFT_OUT" QGCParamID="AIL_LEFT_OUT"
/> />
<Parameter <Parameter
SimulinkPath="avionics_src/sm_avionics/Servo_Outputs/AileronOutput/" SimulinkPath="avionics_src/sm_avionics/Servo_Outputs/AileronOutput/"
SimulinkParameterName="Setpoint1" SimulinkParameterName="Setpoint1"
QGCParamID="AIL_CENTER_OUT" QGCParamID="AIL_CENTER_OUT"
/> />
<Parameter <Parameter
SimulinkPath="avionics_src/sm_avionics/Servo_Outputs/AileronOutput/" SimulinkPath="avionics_src/sm_avionics/Servo_Outputs/AileronOutput/"
SimulinkParameterName="Setpoint2" SimulinkParameterName="Setpoint2"
QGCParamID="AIL_RIGHT_OUT" QGCParamID="AIL_RIGHT_OUT"
/> />
<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 -->
<Parameter <Parameter
SimulinkPath="avionics_src/sm_avionics/Servo_Outputs/ElevatorOutput/" SimulinkPath="avionics_src/sm_avionics/Servo_Outputs/ElevatorOutput/"
SimulinkParameterName="Setpoint0" SimulinkParameterName="Setpoint0"
QGCParamID="ELE_DOWN_OUT" QGCParamID="ELE_DOWN_OUT"
/> />
<Parameter <Parameter
SimulinkPath="avionics_src/sm_avionics/Servo_Outputs/ElevatorOutput/" SimulinkPath="avionics_src/sm_avionics/Servo_Outputs/ElevatorOutput/"
SimulinkParameterName="Setpoint1" SimulinkParameterName="Setpoint1"
QGCParamID="ELE_CENTER_OUT" QGCParamID="ELE_CENTER_OUT"
/> />
<Parameter <Parameter
SimulinkPath="avionics_src/sm_avionics/Servo_Outputs/ElevatorOutput/" SimulinkPath="avionics_src/sm_avionics/Servo_Outputs/ElevatorOutput/"
SimulinkParameterName="Setpoint2" SimulinkParameterName="Setpoint2"
QGCParamID="ELE_UP_OUT" QGCParamID="ELE_UP_OUT"
/> />
<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>
</ParameterList> </ParameterList>

2
src/ui/QGCRemoteControlView.cc
Unescape View File

@ -115,7 +115,7 @@ void QGCRemoteControlView::setUASId(int id)
connect(newUAS, SIGNAL(remoteControlRSSIChanged(float)), this, SLOT(setRemoteRSSI(float))); 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)), 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)), this, SLOT(setChannelScaled(int,float)));
// connect(newUAS, SIGNAL(remoteControlChannelScaledChanged(int,float)), calibrationWindow, SLOT(setChannelScaled(int,float))); // connect(newUAS, SIGNAL(remoteControlChannelScaledChanged(int,float)), calibrationWindow, SLOT(setChannelScaled(int,float)));

14
src/ui/RadioCalibration/AirfoilServoCalibrator.cc
Unescape View File

@ -43,21 +43,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
{ {
@ -90,8 +90,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())));

Write Preview
Loading…
Cancel
Save