rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-20 10:54:14 +01:00
Code Issues Releases Activity

Merge remote-tracking branch 'origin/laurent/OP-1592_Cloud_cfg_fails_CC3D' into rel-14.10

Browse Source
This commit is contained in:
Alessio Morale 2014-11-03 22:16:40 +01:00
commit 603625f65e
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,6 +98,19 @@ bool VehicleConfigurationHelper::setupHardwareSettings(bool save)
return result;
}
bool VehicleConfigurationHelper::isApplicable(UAVObject *dataObj)
{
switch (m_configSource->getControllerType()) {
case VehicleConfigurationSource::CONTROLLER_CC:
case VehicleConfigurationSource::CONTROLLER_CC3D:
if (dataObj->getName() == "EKFConfiguration") {
return false;
}
default:
return true;
}
}
void VehicleConfigurationHelper::addModifiedObject(UAVDataObject *object, QString description)
{
m_modifiedObjects << new QPair<UAVDataObject *, QString>(object, description);
@ -739,12 +752,6 @@ void VehicleConfigurationHelper::applyManualControlDefaults()
cData.ChannelGroups[ManualControlSettings::CHANNELGROUPS_PITCH] = channelType;
cData.ChannelGroups[ManualControlSettings::CHANNELGROUPS_FLIGHTMODE] = channelType;
cData.ChannelNumber[ManualControlSettings::CHANNELGROUPS_THROTTLE] = 1;
cData.ChannelNumber[ManualControlSettings::CHANNELGROUPS_ROLL] = 2;
cData.ChannelNumber[ManualControlSettings::CHANNELGROUPS_YAW] = 3;
cData.ChannelNumber[ManualControlSettings::CHANNELGROUPS_PITCH] = 4;
cData.ChannelNumber[ManualControlSettings::CHANNELGROUPS_FLIGHTMODE] = 5;
mcSettings->setData(cData);
addModifiedObject(mcSettings, tr("Writing manual control defaults"));
}
@ -758,8 +765,8 @@ void VehicleConfigurationHelper::applyTemplateSettings()
foreach(UAVObject * object, updatedObjects) {
UAVDataObject *dataObj = dynamic_cast<UAVDataObject *>(object);
if (dataObj != NULL) {
addModifiedObject(dataObj, QString(tr("Writing template settings for %1")).arg(object->getName()));
if (dataObj != NULL && isApplicable(dataObj)) {
addModifiedObject(dataObj, tr("Writing template settings for %1").arg(object->getName()));
}
}
}

2
ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.h
View File

@ -89,6 +89,8 @@ private:
void applyManualControlDefaults();
void applyTemplateSettings();
bool isApplicable(UAVObject *dataObj);
void applyMixerConfiguration(mixerChannelSettings channels[]);
GUIConfigDataUnion getGUIConfigData();