rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-19 04:52:12 +01:00
Code Issues Releases Activity

LP-390 Fix telemetry error for vehicle wizard

Browse Source
This commit is contained in:
Laurent Lalanne 2016-08-25 11:38:47 +02:00
parent b33d655ec2
commit 0c4c67fd23
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ground/gcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
View File

@ -29,6 +29,7 @@
#include "vehicleconfigurationhelper.h"
#include "extensionsystem/pluginmanager.h"
#include "uavobjectutilmanager.h"
#include <uavobjecthelper.h>
#include "hwsettings.h"
#include "actuatorsettings.h"
@ -403,7 +404,10 @@ void VehicleConfigurationHelper::applyHardwareConfiguration()
default:
break;
}
hwSettings->setData(data);
UAVObjectUpdaterHelper updateHelper;
hwSettings->setData(data, false);
updateHelper.doObjectAndWait(hwSettings);
addModifiedObject(hwSettings, tr("Writing hardware settings"));
}
@ -747,9 +751,15 @@ void VehicleConfigurationHelper::applyFlightModeConfiguration()
data.FlightModePosition[3] = FlightModeSettings::FLIGHTMODEPOSITION_STABILIZED4;
data.FlightModePosition[4] = FlightModeSettings::FLIGHTMODEPOSITION_STABILIZED5;
data.FlightModePosition[5] = FlightModeSettings::FLIGHTMODEPOSITION_STABILIZED6;
modeSettings->setData(data);
UAVObjectUpdaterHelper updateHelper;
modeSettings->setData(data, false);
updateHelper.doObjectAndWait(modeSettings);
addModifiedObject(modeSettings, tr("Writing flight mode settings 1/2"));
controlSettings->setData(data2);
controlSettings->setData(data2, false);
updateHelper.doObjectAndWait(controlSettings);
addModifiedObject(controlSettings, tr("Writing flight mode settings 2/2"));
}
@ -814,8 +824,10 @@ void VehicleConfigurationHelper::applyStabilizationConfiguration()
Q_ASSERT(stabSettings);
UAVObjectUpdaterHelper updateHelper;
StabilizationSettings defaultSettings;
stabSettings->setData(defaultSettings.getData());
stabSettings->setData(defaultSettings.getData(), false);
updateHelper.doObjectAndWait(stabSettings);
addModifiedObject(stabSettings, tr("Writing stabilization settings"));
}
@ -959,7 +971,9 @@ void VehicleConfigurationHelper::applyMixerConfiguration(mixerChannelSettings ch
}
// Apply updates
mSettings->setData(mSettings->getData());
UAVObjectUpdaterHelper updateHelper;
mSettings->setData(mSettings->getData(), false);
updateHelper.doObjectAndWait(mSettings);
addModifiedObject(mSettings, tr("Writing mixer settings"));
}
@ -975,7 +989,9 @@ void VehicleConfigurationHelper::applyMultiGUISettings(SystemSettings::AirframeT
data.GUIConfigData[i] = guiConfig.UAVObject[i];
}
sSettings->setData(data);
UAVObjectUpdaterHelper updateHelper;
sSettings->setData(data, false);
updateHelper.doObjectAndWait(sSettings);
addModifiedObject(sSettings, tr("Writing vehicle settings"));
}