From 9d6810dda834f288c54b4eb50c4077452ebd5b69 Mon Sep 17 00:00:00 2001 From: Oleg Semyonov Date: Wed, 14 Nov 2012 02:00:26 +0200 Subject: [PATCH] GCS vehicle config: use better function name for readability [OP-691] --- .../config/cfg_vehicletypes/configfixedwingwidget.cpp | 6 +++--- .../config/cfg_vehicletypes/configgroundvehiclewidget.cpp | 6 +++--- .../config/cfg_vehicletypes/configmultirotorwidget.cpp | 2 +- .../src/plugins/config/cfg_vehicletypes/vehicleconfig.cpp | 2 +- .../src/plugins/config/cfg_vehicletypes/vehicleconfig.h | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configfixedwingwidget.cpp b/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configfixedwingwidget.cpp index 04dc21698..ac6d91165 100644 --- a/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configfixedwingwidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configfixedwingwidget.cpp @@ -281,7 +281,7 @@ bool ConfigFixedWingWidget::setupFrameFixedWing(QString airframeType) UAVDataObject* mixer = dynamic_cast(getObjectManager()->getObject(QString("MixerSettings"))); Q_ASSERT(mixer); - resetMixers(mixer); + resetMotorAndServoMixers(mixer); // ... and compute the matrix: // In order to make code a bit nicer, we assume: @@ -352,7 +352,7 @@ bool ConfigFixedWingWidget::setupFrameElevon(QString airframeType) UAVDataObject* mixer = dynamic_cast(getObjectManager()->getObject(QString("MixerSettings"))); Q_ASSERT(mixer); - resetMixers(mixer); + resetMotorAndServoMixers(mixer); // Save the curve: // ... and compute the matrix: @@ -424,7 +424,7 @@ bool ConfigFixedWingWidget::setupFrameVtail(QString airframeType) UAVDataObject* mixer = dynamic_cast(getObjectManager()->getObject(QString("MixerSettings"))); Q_ASSERT(mixer); - resetMixers(mixer); + resetMotorAndServoMixers(mixer); // Save the curve: // ... and compute the matrix: diff --git a/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configgroundvehiclewidget.cpp b/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configgroundvehiclewidget.cpp index 3f4a62c87..a23b758df 100644 --- a/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configgroundvehiclewidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configgroundvehiclewidget.cpp @@ -295,7 +295,7 @@ bool ConfigGroundVehicleWidget::setupGroundVehicleMotorcycle(QString airframeTyp UAVDataObject* mixer = dynamic_cast(getObjectManager()->getObject(QString("MixerSettings"))); Q_ASSERT(mixer); - resetMixers(mixer); + resetMotorAndServoMixers(mixer); //motor int channel = m_aircraft->gvMotor2ChannelBox->currentIndex()-1; @@ -346,7 +346,7 @@ bool ConfigGroundVehicleWidget::setupGroundVehicleDifferential(QString airframeT UAVDataObject* mixer = dynamic_cast(getObjectManager()->getObject(QString("MixerSettings"))); Q_ASSERT(mixer); - resetMixers(mixer); + resetMotorAndServoMixers(mixer); //left motor int channel = m_aircraft->gvMotor1ChannelBox->currentIndex()-1; @@ -395,7 +395,7 @@ bool ConfigGroundVehicleWidget::setupGroundVehicleCar(QString airframeType) UAVDataObject* mixer = dynamic_cast(getObjectManager()->getObject(QString("MixerSettings"))); Q_ASSERT(mixer); - resetMixers(mixer); + resetMotorAndServoMixers(mixer); int channel = m_aircraft->gvSteering1ChannelBox->currentIndex()-1; setMixerType(mixer,channel, VehicleConfig::MIXERTYPE_SERVO); diff --git a/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp b/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp index 433642bed..7db57f5d1 100644 --- a/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp @@ -1032,7 +1032,7 @@ bool ConfigMultiRotorWidget::setupMultiRotorMixer(double mixerFactors[8][3]) UAVDataObject* mixer = dynamic_cast(getObjectManager()->getObject(QString("MixerSettings"))); Q_ASSERT(mixer); - resetMixers(mixer); + resetMotorAndServoMixers(mixer); // and enable only the relevant channels: double pFactor = (double)m_aircraft->mrPitchMixLevel->value()/100; diff --git a/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/vehicleconfig.cpp b/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/vehicleconfig.cpp index 026ec897f..64ab037c8 100644 --- a/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/vehicleconfig.cpp +++ b/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/vehicleconfig.cpp @@ -182,7 +182,7 @@ void VehicleConfig::resetMixerVector(UAVDataObject* mixer, int channel) } // Disable all servo/motor mixers (but keep camera and accessory ones) -void VehicleConfig::resetMixers(UAVDataObject *mixer) +void VehicleConfig::resetMotorAndServoMixers(UAVDataObject *mixer) { for (int channel = 0; channel < (int)VehicleConfig::CHANNEL_NUMELEM; channel++) { QString type = getMixerType(mixer, channel); diff --git a/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/vehicleconfig.h b/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/vehicleconfig.h index 828968218..5f47d0548 100644 --- a/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/vehicleconfig.h +++ b/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/vehicleconfig.h @@ -127,7 +127,7 @@ class VehicleConfig: public ConfigTaskWidget double getMixerVectorValue(UAVDataObject* mixer, int channel, MixerVectorElem elementName); void setMixerVectorValue(UAVDataObject* mixer, int channel, MixerVectorElem elementName, double value); void resetMixerVector(UAVDataObject* mixer, int channel); - void resetMixers(UAVDataObject* mixer); + void resetMotorAndServoMixers(UAVDataObject* mixer); QString getMixerType(UAVDataObject* mixer, int channel); void setMixerType(UAVDataObject* mixer, int channel, MixerTypeElem mixerType); double getMixerValue(UAVDataObject* mixer, QString elementName);