From 645f1a16ac0eb0f8db5ac6ac6b1c8d5b254b627e Mon Sep 17 00:00:00 2001
From: Philippe Renon <op.filnet@yahoo.fr>
Date: Sun, 29 Jun 2014 21:10:04 +0200
Subject: [PATCH 1/2] OP-1376 calibration config panel now propoperly saves
 result to board SD

---
 ground/openpilotgcs/src/plugins/config/configrevowidget.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ground/openpilotgcs/src/plugins/config/configrevowidget.cpp b/ground/openpilotgcs/src/plugins/config/configrevowidget.cpp
index 54e1d1a9b..ade15643e 100644
--- a/ground/openpilotgcs/src/plugins/config/configrevowidget.cpp
+++ b/ground/openpilotgcs/src/plugins/config/configrevowidget.cpp
@@ -89,6 +89,10 @@ ConfigRevoWidget::ConfigRevoWidget(QWidget *parent) :
     // Must set up the UI (above) before setting up the UAVO mappings or refreshWidgetValues
     // will be dealing with some null pointers
     addUAVObject("HomeLocation");
+    addUAVObject("RevoCalibration");
+    addUAVObject("AttitudeSettings");
+    addUAVObject("RevoSettings");
+    addUAVObject("AccelGyroSettings");
     autoLoadWidgets();
 
     // accel calibration

From 1497d45eee64423f65eb08ded89656c9ca70dd18 Mon Sep 17 00:00:00 2001
From: Philippe Renon <op.filnet@yahoo.fr>
Date: Sun, 29 Jun 2014 21:11:34 +0200
Subject: [PATCH 2/2] OP-1377 calibration config panel Apply button is now
 visible only in Expert mode

---
 .../src/plugins/config/configrevowidget.cpp            | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/ground/openpilotgcs/src/plugins/config/configrevowidget.cpp b/ground/openpilotgcs/src/plugins/config/configrevowidget.cpp
index ade15643e..5c6feabed 100644
--- a/ground/openpilotgcs/src/plugins/config/configrevowidget.cpp
+++ b/ground/openpilotgcs/src/plugins/config/configrevowidget.cpp
@@ -32,9 +32,11 @@
 #include <accelgyrosettings.h>
 #include <homelocation.h>
 #include <accelstate.h>
-
 #include <magstate.h>
 
+#include <extensionsystem/pluginmanager.h>
+#include <coreplugin/generalsettings.h>
+
 #include "assertions.h"
 #include "calibration.h"
 #include "calibration/calibrationutils.h"
@@ -79,6 +81,12 @@ ConfigRevoWidget::ConfigRevoWidget(QWidget *parent) :
 
     addApplySaveButtons(m_ui->revoCalSettingsSaveRAM, m_ui->revoCalSettingsSaveSD);
 
+    ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
+    Core::Internal::GeneralSettings *settings = pm->getObject<Core::Internal::GeneralSettings>();
+    if (!settings->useExpertMode()) {
+        m_ui->revoCalSettingsSaveRAM->setVisible(false);
+    }
+
     // Initialization of the visual help
     m_ui->calibrationVisualHelp->setScene(new QGraphicsScene(this));
     m_ui->calibrationVisualHelp->setRenderHint(QPainter::HighQualityAntialiasing, true);