diff --git a/ground/openpilotgcs/src/plugins/setupwizard/connectiondiagram.cpp b/ground/openpilotgcs/src/plugins/setupwizard/connectiondiagram.cpp index 8a3bc6ae8..6f56f791c 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/connectiondiagram.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/connectiondiagram.cpp @@ -126,7 +126,7 @@ void ConnectionDiagram::setupGraphicsScene() elementsToShow << "aileron"; break; case VehicleConfigurationSource::FIXED_WING_AILERON: - elementsToShow << "ail2"; + elementsToShow << "aileron-single"; break; case VehicleConfigurationSource::FIXED_WING_ELEVON: elementsToShow << "elevon"; diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/escpage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/escpage.cpp index 75d8d6c77..4cb190b32 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/escpage.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/escpage.cpp @@ -47,7 +47,7 @@ bool EscPage::validatePage() if (ui->rapidESCButton->isChecked()) { getWizard()->setEscType(SetupWizard::ESC_RAPID); } else { - getWizard()->setEscType(SetupWizard::ESC_LEGACY); + getWizard()->setEscType(SetupWizard::ESC_STANDARD); } return true; diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/fixedwingpage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/fixedwingpage.cpp index fb637750d..0e392bd56 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/fixedwingpage.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/fixedwingpage.cpp @@ -82,11 +82,11 @@ void FixedWingPage::resizeEvent(QResizeEvent *event) void FixedWingPage::setupFixedWingTypesCombo() { - ui->typeCombo->addItem(tr("Dual Aileron Servos"), SetupWizard::FIXED_WING_DUAL_AILERON); - m_descriptions << tr("This setup expects a traditional airframe setup using two independent aileron servos on their own channel (not connected by Y adapter), an elevator and a rudder. "); + ui->typeCombo->addItem(tr("Aileron Dual Servos"), SetupWizard::FIXED_WING_DUAL_AILERON); + m_descriptions << tr("This setup expects a traditional airframe using two independent aileron servos on their own channel (not connected by Y adapter) plus an elevator and a rudder. "); - ui->typeCombo->addItem(tr("Single Aileron Servo"), SetupWizard::FIXED_WING_AILERON); - m_descriptions << tr("This setup expects a traditional airframe setup using a single alieron servo or two connected by Y a adapter, an elevator and a rudder. "); + ui->typeCombo->addItem(tr("Aileron Single Servo"), SetupWizard::FIXED_WING_AILERON); + m_descriptions << tr("This setup expects a traditional airframe using a single alieron servo or two servos connected by a Y adapter plus an elevator and a rudder. "); ui->typeCombo->addItem(tr("Elevon"), SetupWizard::FIXED_WING_ELEVON); m_descriptions << tr("This setup currently expects a flying-wing setup, an elevon plus rudder setup is not yet supported. Setup should include only two elevons, and should explicitly not include a rudder."); @@ -109,7 +109,7 @@ void FixedWingPage::updateImageAndDescription() elementId = "aileron"; break; case SetupWizard::FIXED_WING_AILERON: - elementId = "ail2"; + elementId = "aileron-single"; break; case SetupWizard::FIXED_WING_ELEVON: elementId = "elevon"; diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.cpp index 68af79f5a..4865e9b13 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.cpp @@ -186,7 +186,7 @@ void OutputCalibrationPage::setupVehicle() case SetupWizard::FIXED_WING_AILERON: loadSVGFile(FIXEDWING_SVG_FILE); m_wizardIndexes << 0 << 1 << 2 << 3 << 4 << 2 << 3 << 4 << 2 << 3 << 4 << 2 << 3 << 4; - m_vehicleElementIds << "ail2" << "ail2-frame" << "ail2-motor" << "ail2-ail-left" << "ail2-ail-right" << "ail2-rudder" << "ail2-elevator"; + m_vehicleElementIds << "aileron-single" << "ail2-frame" << "ail2-motor" << "ail2-ail-left" << "ail2-ail-right" << "ail2-rudder" << "ail2-elevator"; m_vehicleHighlightElementIndexes << 0 << 1 << 2 << 2 << 2 << 3 << 3 << 3 << 4 << 4 << 4 << 5 << 5 << 5; m_channelIndex << 0 << 2 << 0 << 0 << 0 << 1 << 1 << 1 << 3 << 3 << 3 << 4 << 4 << 4; diff --git a/ground/openpilotgcs/src/plugins/setupwizard/resources/fixedwing-shapes.svg b/ground/openpilotgcs/src/plugins/setupwizard/resources/fixedwing-shapes.svg index 5812cdc9d..968c38041 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/resources/fixedwing-shapes.svg +++ b/ground/openpilotgcs/src/plugins/setupwizard/resources/fixedwing-shapes.svg @@ -777,14 +777,14 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1920" - inkscape:window-height="1017" + inkscape:window-height="1080" id="namedview4099" showgrid="false" inkscape:zoom="0.72183815" inkscape:cx="658.07866" - inkscape:cy="230.01827" - inkscape:window-x="-8" - inkscape:window-y="-8" + inkscape:cy="562.50278" + inkscape:window-x="0" + inkscape:window-y="0" inkscape:window-maximized="1" inkscape:current-layer="Layer_1" showborder="true" @@ -2581,6 +2581,7 @@ x="569.97363" y="1401.7424">6 + + + + + 4 + "); summary.append("").append(tr("Speed Controller (ESC) type: ")).append(""); - switch (getEscType()) { - case ESC_LEGACY: - summary.append(tr("Legacy ESC (50 Hz)")); - break; - case ESC_RAPID: - summary.append(tr("Rapid ESC (400 Hz)")); - break; - default: - summary.append(tr("Unknown")); + if (getVehicleType() == VEHICLE_FIXEDWING) { + summary.append(tr("Standard ESC (50 Hz)")); + } else { + switch (getEscType()) { + case ESC_STANDARD: + summary.append(tr("Legacy ESC (50 Hz)")); + break; + case ESC_RAPID: + summary.append(tr("Rapid ESC (400 Hz)")); + break; + default: + summary.append(tr("Unknown")); + } } if (getVehicleSubType() == MULTI_ROTOR_TRI_Y || getVehicleType() == VEHICLE_FIXEDWING) { diff --git a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp index b30c2a3ee..148604c47 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp @@ -255,7 +255,7 @@ void VehicleConfigurationHelper::applyActuatorConfiguration() qint16 escFrequence = LEGACY_ESC_FREQUENCE; switch (m_configSource->getEscType()) { - case VehicleConfigurationSource::ESC_LEGACY: + case VehicleConfigurationSource::ESC_STANDARD: escFrequence = LEGACY_ESC_FREQUENCE; break; case VehicleConfigurationSource::ESC_RAPID: @@ -1553,6 +1553,7 @@ void VehicleConfigurationHelper::setupElevon() mixerChannelSettings channels[10]; GUIConfigDataUnion guiSettings = getGUIConfigData(); + // Motor (Chan 3) channels[2].type = MIXER_TYPE_MOTOR; channels[2].throttle1 = 100; channels[2].throttle2 = 0; @@ -1560,6 +1561,7 @@ void VehicleConfigurationHelper::setupElevon() channels[2].pitch = 0; channels[2].yaw = 0; + // Elevon Servo 1 (Chan 1) channels[0].type = MIXER_TYPE_SERVO; channels[0].throttle1 = 0; channels[0].throttle2 = 0; @@ -1567,6 +1569,7 @@ void VehicleConfigurationHelper::setupElevon() channels[0].pitch = 100; channels[0].yaw = 0; + // Elevon Servo 1 (Chan 2) channels[1].type = MIXER_TYPE_SERVO; channels[1].throttle1 = 0; channels[1].throttle2 = 0; diff --git a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.h b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.h index f54e7e2b1..49dee8ec5 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.h +++ b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.h @@ -106,7 +106,6 @@ private: void setupQuadCopter(); void setupHexaCopter(); void setupOctoCopter(); - void setupVtail(); void setupElevon(); void setupDualAileron(); void setupAileron(); diff --git a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationsource.h b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationsource.h index a09ceba64..2102bf4d9 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationsource.h +++ b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationsource.h @@ -61,7 +61,7 @@ public: MULTI_ROTOR_HEXA, MULTI_ROTOR_HEXA_H, MULTI_ROTOR_HEXA_X, MULTI_ROTOR_HEXA_COAX_Y, MULTI_ROTOR_OCTO, MULTI_ROTOR_OCTO_X, MULTI_ROTOR_OCTO_V, MULTI_ROTOR_OCTO_COAX_X, MULTI_ROTOR_OCTO_COAX_PLUS, FIXED_WING_DUAL_AILERON, FIXED_WING_AILERON, FIXED_WING_ELEVON, HELI_CCPM }; - enum ESC_TYPE { ESC_RAPID, ESC_LEGACY, ESC_UNKNOWN }; + enum ESC_TYPE { ESC_RAPID, ESC_STANDARD, ESC_UNKNOWN }; enum SERVO_TYPE { SERVO_ANALOG, SERVO_DIGITAL, SERVO_UNKNOWN }; enum INPUT_TYPE { INPUT_PWM, INPUT_PPM, INPUT_SBUS, INPUT_DSMX10, INPUT_DSMX11, INPUT_DSM2, INPUT_UNKNOWN };