diff --git a/ground/openpilotgcs/src/plugins/setupwizard/connectiondiagram.cpp b/ground/openpilotgcs/src/plugins/setupwizard/connectiondiagram.cpp index 92930a345..3106ee69f 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/connectiondiagram.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/connectiondiagram.cpp @@ -109,9 +109,6 @@ void ConnectionDiagram::setupGraphicsScene() case VehicleConfigurationSource::MULTI_ROTOR_QUAD_PLUS: elementsToShow << "quad-p"; break; - case VehicleConfigurationSource::MULTI_ROTOR_QUAD_H: - elementsToShow << "quad-h"; - break; case VehicleConfigurationSource::MULTI_ROTOR_HEXA: elementsToShow << "hexa"; break; diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp index 7cdef960c..a05281cfc 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp @@ -160,11 +160,9 @@ bool AirframeInitialTuningPage::airframeIsCompatible(int vehicleType, int vehicl int wizSubType = getWizard()->getVehicleSubType(); switch (vehicleType) { - case VehicleConfigurationSource::MULTI_ROTOR_QUAD_H: case VehicleConfigurationSource::MULTI_ROTOR_QUAD_X: { - return wizSubType == VehicleConfigurationSource::MULTI_ROTOR_QUAD_H || - wizSubType == VehicleConfigurationSource::MULTI_ROTOR_QUAD_X; + return wizSubType == VehicleConfigurationSource::MULTI_ROTOR_QUAD_X; } default: return vehicleSubType == wizSubType; diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.cpp index ec1aae395..8a53a417f 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.cpp @@ -77,11 +77,6 @@ void MultiPage::setupSelection(Selection *selection) "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"), tr("A multirotor with six motors, one motor in front."), "quad-hexa", diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.cpp index e9c1f8ab2..e3d7ed90a 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.cpp @@ -131,14 +131,6 @@ void OutputCalibrationPage::setupVehicle() m_channelIndex << 0 << 0 << 1 << 2 << 3; setupActuatorMinMaxAndNeutral(0, 3, 4); 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: loadSVGFile(MULTI_SVG_FILE); m_wizardIndexes << 0 << 1 << 1 << 1 << 1; diff --git a/ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp b/ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp index db6f73b2e..c7a8dfc74 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp @@ -277,9 +277,6 @@ QString SetupWizard::getSummaryText() case SetupWizard::MULTI_ROTOR_QUAD_PLUS: summary.append(tr("Quadcopter +")); break; - case SetupWizard::MULTI_ROTOR_QUAD_H: - summary.append(tr("Quadcopter H")); - break; case SetupWizard::MULTI_ROTOR_HEXA: summary.append(tr("Hexacopter")); break; diff --git a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp index 1f633381e..520ddf45c 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp @@ -292,7 +292,6 @@ void VehicleConfigurationHelper::applyVehicleConfiguration() break; case VehicleConfigurationSource::MULTI_ROTOR_QUAD_X: case VehicleConfigurationSource::MULTI_ROTOR_QUAD_PLUS: - case VehicleConfigurationSource::MULTI_ROTOR_QUAD_H: setupQuadCopter(); break; case VehicleConfigurationSource::MULTI_ROTOR_HEXA: @@ -407,7 +406,6 @@ void VehicleConfigurationHelper::applyActuatorConfiguration() } break; case VehicleConfigurationSource::MULTI_ROTOR_QUAD_X: - case VehicleConfigurationSource::MULTI_ROTOR_QUAD_H: case VehicleConfigurationSource::MULTI_ROTOR_QUAD_PLUS: data.ChannelUpdateFreq[0] = escFrequence; data.ChannelUpdateFreq[1] = escFrequence; @@ -657,11 +655,6 @@ void VehicleConfigurationHelper::applyMixerConfiguration(mixerChannelSettings ch mSettings->setMixerValuePitch(100); mSettings->setMixerValueYaw(50); break; - case VehicleConfigurationSource::MULTI_ROTOR_QUAD_H: - mSettings->setMixerValueRoll(50); - mSettings->setMixerValuePitch(70); - mSettings->setMixerValueYaw(50); - break; case VehicleConfigurationSource::MULTI_ROTOR_HEXA_COAX_Y: mSettings->setMixerValueRoll(100); mSettings->setMixerValuePitch(50); @@ -1077,44 +1070,6 @@ void VehicleConfigurationHelper::setupQuadCopter() 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: break; } diff --git a/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateexportdialog.cpp b/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateexportdialog.cpp index 1451b0388..2563f961c 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateexportdialog.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateexportdialog.cpp @@ -112,11 +112,6 @@ QString VehicleTemplateExportDialog::setupVehicleType() m_subType = VehicleConfigurationSource::MULTI_ROTOR_QUAD_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: m_type = VehicleConfigurationSource::VEHICLE_MULTI; m_subType = VehicleConfigurationSource::MULTI_ROTOR_QUAD_PLUS;