From c69f884f011a6e2ce8d3dec0d58aba55e5427cea Mon Sep 17 00:00:00 2001 From: peabody124 Date: Thu, 30 Sep 2010 04:49:55 +0000 Subject: [PATCH] Ground/AHRS Calibration: Make sure it returns updateRaw to false after running to stop from hammering telemetry and keep OP-AHRS smooth. Also fixed bad connection in magic waypoint. git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@1807 ebee16cc-31ac-478f-84a7-5cbb03baadba --- ground/src/plugins/config/configahrswidget.cpp | 3 ++- ground/src/plugins/magicwaypoint/magicwaypointgadgetwidget.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ground/src/plugins/config/configahrswidget.cpp b/ground/src/plugins/config/configahrswidget.cpp index b724a194b..4ef01cbf5 100644 --- a/ground/src/plugins/config/configahrswidget.cpp +++ b/ground/src/plugins/config/configahrswidget.cpp @@ -38,7 +38,7 @@ #define sign(x) ((x < 0) ? -1 : 1) const double ConfigAHRSWidget::maxVarValue = 0.1; -const int ConfigAHRSWidget::calibrationDelay = 5; // Time to wait for the AHRS to do its calibration +const int ConfigAHRSWidget::calibrationDelay = 7; // Time to wait for the AHRS to do its calibration ConfigAHRSWidget::ConfigAHRSWidget(QWidget *parent) : ConfigTaskWidget(parent) { @@ -375,6 +375,7 @@ void ConfigAHRSWidget::attitudeRawUpdated(UAVObject * obj) obj = dynamic_cast(getObjectManager()->getObject(QString("AHRSSettings"))); obj->getField(QString("UpdateRaw"))->setValue(initialUpdateRaw); obj->getField(QString("UpdateFiltered"))->setValue(initialUpdateFiltered); + obj->updated(); getObjectManager()->getObject(QString("AttitudeRaw"))->setMetadata(initialMdata); } } diff --git a/ground/src/plugins/magicwaypoint/magicwaypointgadgetwidget.cpp b/ground/src/plugins/magicwaypoint/magicwaypointgadgetwidget.cpp index 0e715b95b..3fa067ee9 100644 --- a/ground/src/plugins/magicwaypoint/magicwaypointgadgetwidget.cpp +++ b/ground/src/plugins/magicwaypoint/magicwaypointgadgetwidget.cpp @@ -56,7 +56,7 @@ MagicWaypointGadgetWidget::MagicWaypointGadgetWidget(QWidget *parent) : QLabel(p connect(this, SIGNAL(positionDesiredObjectChanged(double,double)), m_magicwaypoint->widgetPosition, SLOT(updateDesiredIndicator(double,double))); // Catch changes in scale for visualization - connect(m_magicwaypoint->horizontalSliderScale, SIGNAL(valueChanged(int)), this, SLOT(scaleChanged(double))); + connect(m_magicwaypoint->horizontalSliderScale, SIGNAL(valueChanged(int)), this, SLOT(scaleChanged(int))); } MagicWaypointGadgetWidget::~MagicWaypointGadgetWidget()