rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
Code Issues Releases Activity

Remove QuadH from setup wizard

Browse Source
This commit is contained in:
Laurent Lalanne 2014-11-24 00:51:40 +01:00
parent 10f3371e9a
commit 01cb489378
7 changed files with 1 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ground/openpilotgcs/src/plugins/setupwizard/connectiondiagram.cpp
View File

@ -109,9 +109,6 @@ void ConnectionDiagram::setupGraphicsScene()
case VehicleConfigurationSource::MULTI_ROTOR_QUAD_PLUS: case VehicleConfigurationSource::MULTI_ROTOR_QUAD_PLUS:
elementsToShow << "quad-p"; elementsToShow << "quad-p";
break; break;
case VehicleConfigurationSource::MULTI_ROTOR_QUAD_H:
elementsToShow << "quad-h";
break;
case VehicleConfigurationSource::MULTI_ROTOR_HEXA: case VehicleConfigurationSource::MULTI_ROTOR_HEXA:
elementsToShow << "hexa"; elementsToShow << "hexa";
break; break;

4
ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp
View File

@ -160,11 +160,9 @@ bool AirframeInitialTuningPage::airframeIsCompatible(int vehicleType, int vehicl
int wizSubType = getWizard()->getVehicleSubType(); int wizSubType = getWizard()->getVehicleSubType();
switch (vehicleType) { switch (vehicleType) {
case VehicleConfigurationSource::MULTI_ROTOR_QUAD_H:
case VehicleConfigurationSource::MULTI_ROTOR_QUAD_X: case VehicleConfigurationSource::MULTI_ROTOR_QUAD_X:
{ {
return wizSubType == VehicleConfigurationSource::MULTI_ROTOR_QUAD_H || return wizSubType == VehicleConfigurationSource::MULTI_ROTOR_QUAD_X;
wizSubType == VehicleConfigurationSource::MULTI_ROTOR_QUAD_X;
} }
default: default:
return vehicleSubType == wizSubType; return vehicleSubType == wizSubType;

5
ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.cpp
View File

@ -77,11 +77,6 @@ void MultiPage::setupSelection(Selection *selection)
"quad-plus", "quad-plus",
SetupWizard::MULTI_ROTOR_QUAD_PLUS); SetupWizard::MULTI_ROTOR_QUAD_PLUS);
selection->addItem(tr("Quadcopter H"),
tr("Quadcopter H, Blackout miniH"),
"quad-h",
SetupWizard::MULTI_ROTOR_QUAD_H);
selection->addItem(tr("Hexacopter"), selection->addItem(tr("Hexacopter"),
tr("A multirotor with six motors, one motor in front."), tr("A multirotor with six motors, one motor in front."),
"quad-hexa", "quad-hexa",

8
ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.cpp
View File

@ -131,14 +131,6 @@ void OutputCalibrationPage::setupVehicle()
m_channelIndex << 0 << 0 << 1 << 2 << 3; m_channelIndex << 0 << 0 << 1 << 2 << 3;
setupActuatorMinMaxAndNeutral(0, 3, 4); setupActuatorMinMaxAndNeutral(0, 3, 4);
break; break;
case SetupWizard::MULTI_ROTOR_QUAD_H:
loadSVGFile(MULTI_SVG_FILE);
m_wizardIndexes << 0 << 1 << 1 << 1 << 1;
m_vehicleElementIds << "quad-h" << "quad-h-frame" << "quad-h-m1" << "quad-h-m2" << "quad-h-m3" << "quad-h-m4";
m_vehicleHighlightElementIndexes << 0 << 1 << 2 << 3 << 4;
m_channelIndex << 0 << 0 << 1 << 2 << 3;
setupActuatorMinMaxAndNeutral(0, 3, 4);
break;
case SetupWizard::MULTI_ROTOR_QUAD_PLUS: case SetupWizard::MULTI_ROTOR_QUAD_PLUS:
loadSVGFile(MULTI_SVG_FILE); loadSVGFile(MULTI_SVG_FILE);
m_wizardIndexes << 0 << 1 << 1 << 1 << 1; m_wizardIndexes << 0 << 1 << 1 << 1 << 1;

3
ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp
View File

@ -277,9 +277,6 @@ QString SetupWizard::getSummaryText()
case SetupWizard::MULTI_ROTOR_QUAD_PLUS: case SetupWizard::MULTI_ROTOR_QUAD_PLUS:
summary.append(tr("Quadcopter +")); summary.append(tr("Quadcopter +"));
break; break;
case SetupWizard::MULTI_ROTOR_QUAD_H:
summary.append(tr("Quadcopter H"));
break;
case SetupWizard::MULTI_ROTOR_HEXA: case SetupWizard::MULTI_ROTOR_HEXA:
summary.append(tr("Hexacopter")); summary.append(tr("Hexacopter"));
break; break;

45
ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
View File

@ -292,7 +292,6 @@ void VehicleConfigurationHelper::applyVehicleConfiguration()
break; break;
case VehicleConfigurationSource::MULTI_ROTOR_QUAD_X: case VehicleConfigurationSource::MULTI_ROTOR_QUAD_X:
case VehicleConfigurationSource::MULTI_ROTOR_QUAD_PLUS: case VehicleConfigurationSource::MULTI_ROTOR_QUAD_PLUS:
case VehicleConfigurationSource::MULTI_ROTOR_QUAD_H:
setupQuadCopter(); setupQuadCopter();
break; break;
case VehicleConfigurationSource::MULTI_ROTOR_HEXA: case VehicleConfigurationSource::MULTI_ROTOR_HEXA:
@ -407,7 +406,6 @@ void VehicleConfigurationHelper::applyActuatorConfiguration()
} }
break; break;
case VehicleConfigurationSource::MULTI_ROTOR_QUAD_X: case VehicleConfigurationSource::MULTI_ROTOR_QUAD_X:
case VehicleConfigurationSource::MULTI_ROTOR_QUAD_H:
case VehicleConfigurationSource::MULTI_ROTOR_QUAD_PLUS: case VehicleConfigurationSource::MULTI_ROTOR_QUAD_PLUS:
data.ChannelUpdateFreq[0] = escFrequence; data.ChannelUpdateFreq[0] = escFrequence;
data.ChannelUpdateFreq[1] = escFrequence; data.ChannelUpdateFreq[1] = escFrequence;
@ -657,11 +655,6 @@ void VehicleConfigurationHelper::applyMixerConfiguration(mixerChannelSettings ch
mSettings->setMixerValuePitch(100); mSettings->setMixerValuePitch(100);
mSettings->setMixerValueYaw(50); mSettings->setMixerValueYaw(50);
break; break;
case VehicleConfigurationSource::MULTI_ROTOR_QUAD_H:
mSettings->setMixerValueRoll(50);
mSettings->setMixerValuePitch(70);
mSettings->setMixerValueYaw(50);
break;
case VehicleConfigurationSource::MULTI_ROTOR_HEXA_COAX_Y: case VehicleConfigurationSource::MULTI_ROTOR_HEXA_COAX_Y:
mSettings->setMixerValueRoll(100); mSettings->setMixerValueRoll(100);
mSettings->setMixerValuePitch(50); mSettings->setMixerValuePitch(50);
@ -1077,44 +1070,6 @@ void VehicleConfigurationHelper::setupQuadCopter()
break; break;
} }
case VehicleConfigurationSource::MULTI_ROTOR_QUAD_H:
{
frame = SystemSettings::AIRFRAMETYPE_QUADH;
channels[0].type = MIXER_TYPE_MOTOR;
channels[0].throttle1 = 100;
channels[0].throttle2 = 0;
channels[0].roll = 50;
channels[0].pitch = 70;
channels[0].yaw = -50;
channels[1].type = MIXER_TYPE_MOTOR;
channels[1].throttle1 = 100;
channels[1].throttle2 = 0;
channels[1].roll = -50;
channels[1].pitch = 70;
channels[1].yaw = 50;
channels[2].type = MIXER_TYPE_MOTOR;
channels[2].throttle1 = 100;
channels[2].throttle2 = 0;
channels[2].roll = -50;
channels[2].pitch = -70;
channels[2].yaw = -50;
channels[3].type = MIXER_TYPE_MOTOR;
channels[3].throttle1 = 100;
channels[3].throttle2 = 0;
channels[3].roll = 50;
channels[3].pitch = -70;
channels[3].yaw = 50;
guiSettings.multi.VTOLMotorNW = 1;
guiSettings.multi.VTOLMotorNE = 2;
guiSettings.multi.VTOLMotorSE = 3;
guiSettings.multi.VTOLMotorSW = 4;
break;
}
default: default:
break; break;
} }

5
ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateexportdialog.cpp
View File

@ -112,11 +112,6 @@ QString VehicleTemplateExportDialog::setupVehicleType()
m_subType = VehicleConfigurationSource::MULTI_ROTOR_QUAD_X; m_subType = VehicleConfigurationSource::MULTI_ROTOR_QUAD_X;
return tr("Multirotor - Quadrocopter X"); return tr("Multirotor - Quadrocopter X");
case SystemSettings::AIRFRAMETYPE_QUADH:
m_type = VehicleConfigurationSource::VEHICLE_MULTI;
m_subType = VehicleConfigurationSource::MULTI_ROTOR_QUAD_H;
return tr("Multirotor - Quadrocopter H");
case SystemSettings::AIRFRAMETYPE_QUADP: case SystemSettings::AIRFRAMETYPE_QUADP:
m_type = VehicleConfigurationSource::VEHICLE_MULTI; m_type = VehicleConfigurationSource::VEHICLE_MULTI;
m_subType = VehicleConfigurationSource::MULTI_ROTOR_QUAD_PLUS; m_subType = VehicleConfigurationSource::MULTI_ROTOR_QUAD_PLUS;