From 28246cccbe3b362a61a8612b4c1405214cb52a9f Mon Sep 17 00:00:00 2001 From: Kevin Finisterre Date: Sat, 7 Jun 2014 23:04:12 -0400 Subject: [PATCH] fix remaining headers --- .../src/plugins/setupwizard/connectiondiagram.cpp | 4 ++-- .../src/plugins/setupwizard/setupwizard.cpp | 4 ++-- .../setupwizard/vehicleconfigurationhelper.cpp | 14 +++++++------- .../setupwizard/vehicleconfigurationhelper.h | 2 +- .../setupwizard/vehicleconfigurationsource.h | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/setupwizard/connectiondiagram.cpp b/ground/openpilotgcs/src/plugins/setupwizard/connectiondiagram.cpp index 7525d5e55..6057098b1 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/connectiondiagram.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/connectiondiagram.cpp @@ -122,8 +122,8 @@ void ConnectionDiagram::setupGraphicsScene() case VehicleConfigurationSource::FIXED_WING_AILERON: elementsToShow << "aileron"; break; - case VehicleConfigurationSource::FIXED_WING_VTAIL: - elementsToShow << "vtail"; + case VehicleConfigurationSource::FIXED_WING_ELEVON: + elementsToShow << "elevon"; break; default: break; diff --git a/ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp b/ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp index 449296f5b..09be733f1 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp @@ -236,8 +236,8 @@ QString SetupWizard::getSummaryText() case SetupWizard::FIXED_WING_AILERON: summary.append(tr("Aileron")); break; - case SetupWizard::FIXED_WING_VTAIL: - summary.append(tr("Vtail")); + case SetupWizard::FIXED_WING_ELEVON: + summary.append(tr("Elevon")); break; default: summary.append(tr("Unknown")); diff --git a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp index d5cf4ad5e..97219ada9 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp @@ -221,8 +221,8 @@ void VehicleConfigurationHelper::applyVehicleConfiguration() case VehicleConfigurationSource::FIXED_WING_AILERON: setupAileron(); break; - case VehicleConfigurationSource::FIXED_WING_VTAIL: - setupVtail(); + case VehicleConfigurationSource::FIXED_WING_ELEVON: + setupElevon(); break; default: break; @@ -1332,7 +1332,7 @@ void VehicleConfigurationHelper::setupOctoCopter() applyMultiGUISettings(frame, guiSettings); } -void VehicleConfigurationHelper::setupVtail() +void VehicleConfigurationHelper::setupElevon() { mixerChannelSettings channels[10]; @@ -1348,15 +1348,15 @@ void VehicleConfigurationHelper::setupVtail() channels[1].type = MIXER_TYPE_SERVO; channels[1].throttle1 = 0; channels[1].throttle2 = 0; - channels[1].roll = -100; - channels[1].pitch = 50; + channels[1].roll = -127; + channels[1].pitch = 127; channels[1].yaw = 0; channels[2].type = MIXER_TYPE_SERVO; channels[2].throttle1 = 0; channels[2].throttle2 = 0; - channels[2].roll = 100; - channels[2].pitch = -50; + channels[2].roll = 127; + channels[2].pitch = -127; channels[2].yaw = 0; channels[3].type = MIXER_TYPE_SERVO; diff --git a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.h b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.h index d3ef88df4..7d92bd4ce 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.h +++ b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.h @@ -103,7 +103,7 @@ private: void setupQuadCopter(); void setupHexaCopter(); void setupOctoCopter(); - void setupVtail(); + void setupElevon(); void setupAileron(); private slots: diff --git a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationsource.h b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationsource.h index 98f06a991..53e0f8736 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationsource.h +++ b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationsource.h @@ -60,7 +60,7 @@ public: enum VEHICLE_SUB_TYPE { MULTI_ROTOR_UNKNOWN, MULTI_ROTOR_TRI_Y, MULTI_ROTOR_QUAD_X, MULTI_ROTOR_QUAD_PLUS, MULTI_ROTOR_HEXA, MULTI_ROTOR_HEXA_H, MULTI_ROTOR_HEXA_COAX_Y, MULTI_ROTOR_OCTO, MULTI_ROTOR_OCTO_V, MULTI_ROTOR_OCTO_COAX_X, MULTI_ROTOR_OCTO_COAX_PLUS, FIXED_WING_AILERON, - FIXED_WING_VTAIL, HELI_CCPM }; + FIXED_WING_ELEVON, HELI_CCPM }; enum ESC_TYPE { ESC_RAPID, ESC_LEGACY, ESC_UNKNOWN }; enum INPUT_TYPE { INPUT_PWM, INPUT_PPM, INPUT_SBUS, INPUT_DSMX10, INPUT_DSMX11, INPUT_DSM2, INPUT_UNKNOWN };