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

LP-240 Remove delay (diff sliders working) on enter tab - Apply default metadata

Browse Source
This commit is contained in:
Laurent Lalanne 2016-02-26 00:49:23 +01:00
parent e1dadbce02
commit 1aaf9b9f0e
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ground/gcs/src/plugins/config/configrevowidget.cpp
View File

@ -205,9 +205,10 @@ ConfigRevoWidget::ConfigRevoWidget(QWidget *parent) :
addWidgetBinding("AuxMagSettings", "BoardRotation", m_ui->auxMagPitchRotation, AuxMagSettings::BOARDROTATION_PITCH); addWidgetBinding("AuxMagSettings", "BoardRotation", m_ui->auxMagPitchRotation, AuxMagSettings::BOARDROTATION_PITCH);
addWidgetBinding("AuxMagSettings", "BoardRotation", m_ui->auxMagYawRotation, AuxMagSettings::BOARDROTATION_YAW); addWidgetBinding("AuxMagSettings", "BoardRotation", m_ui->auxMagYawRotation, AuxMagSettings::BOARDROTATION_YAW);
connect(m_ui->tabWidget, SIGNAL(currentChanged(int)), this, SLOT(onBoardAuxMagError()));
connect(MagSensor::GetInstance(getObjectManager()), SIGNAL(objectUpdated(UAVObject *)), this, SLOT(onBoardAuxMagError())); connect(MagSensor::GetInstance(getObjectManager()), SIGNAL(objectUpdated(UAVObject *)), this, SLOT(onBoardAuxMagError()));
connect(MagState::GetInstance(getObjectManager()), SIGNAL(objectUpdated(UAVObject *)), this, SLOT(updateMagStatus())); connect(MagState::GetInstance(getObjectManager()), SIGNAL(objectUpdated(UAVObject *)), this, SLOT(updateMagStatus()));
connect(HomeLocation::GetInstance(getObjectManager()), SIGNAL(objectUpdated(UAVObject *)), this, SLOT(updateMagBeVector())); connect(HomeLocation::GetInstance(getObjectManager()), SIGNAL(objectUpdated(UAVObject *)), this, SLOT(getMagBeVector()));
addWidget(m_ui->internalAuxErrorX); addWidget(m_ui->internalAuxErrorX);
addWidget(m_ui->internalAuxErrorY); addWidget(m_ui->internalAuxErrorY);
@ -485,20 +486,16 @@ void ConfigRevoWidget::onBoardAuxMagError()
Q_ASSERT(auxMagSensor); Q_ASSERT(auxMagSensor);
if (m_ui->tabWidget->currentIndex() != 2) { if (m_ui->tabWidget->currentIndex() != 2) {
// Restore metadata // Apply default metadata
if (displayMagError) { if (displayMagError) {
magSensor->setMetadata(metamag.magSensorMetadata); magSensor->setMetadata(magSensor->getDefaultMetadata());
auxMagSensor->setMetadata(metamag.auxMagSensorMetadata); auxMagSensor->setMetadata(auxMagSensor->getDefaultMetadata());
displayMagError = false; displayMagError = false;
} }
return; return;
} }
if (!displayMagError) { if (!displayMagError) {
// Store current metadata settings
metamag.magSensorMetadata = magSensor->getMetadata();
metamag.auxMagSensorMetadata = auxMagSensor->getMetadata();
// Apply new rates // Apply new rates
UAVObject::Metadata mdata = magSensor->getMetadata(); UAVObject::Metadata mdata = magSensor->getMetadata();
UAVObject::SetFlightTelemetryUpdateMode(mdata, UAVObject::UPDATEMODE_PERIODIC); UAVObject::SetFlightTelemetryUpdateMode(mdata, UAVObject::UPDATEMODE_PERIODIC);
@ -511,6 +508,7 @@ void ConfigRevoWidget::onBoardAuxMagError()
auxMagSensor->setMetadata(mdata); auxMagSensor->setMetadata(mdata);
displayMagError = true; displayMagError = true;
return;
} }
MagSensor::DataFields magData = magSensor->getData(); MagSensor::DataFields magData = magSensor->getData();