From e4baa3ce7f4ed8f723ffb56407617a247d635a9d Mon Sep 17 00:00:00 2001
From: Anton Matosov <anton.matosov@gmail.com>
Date: Mon, 13 Oct 2014 21:48:10 +0300
Subject: [PATCH] Fixed crashing at connection time if pixhawk MAV_COMP_ID
 value was previously changed.

---
 src/ui/px4_configuration/PX4RCCalibration.cc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/ui/px4_configuration/PX4RCCalibration.cc b/src/ui/px4_configuration/PX4RCCalibration.cc
index e4fa21640..455c4dbcf 100644
--- a/src/ui/px4_configuration/PX4RCCalibration.cc
+++ b/src/ui/px4_configuration/PX4RCCalibration.cc
@@ -167,28 +167,28 @@ void PX4RCCalibration::_setInternalCalibrationValuesFromParameters(void)
         for (int i = 0; i < _chanMax; ++i) {
             struct ChannelInfo* info = &_rgChannelInfo[i];
             
-            paramFound = _paramMgr->getParameterValue(50, trimTpl.arg(i+1), value);
+            paramFound = _paramMgr->getParameterValue(_paramMgr->getDefaultComponentId(), trimTpl.arg(i+1), value);
             Q_ASSERT(paramFound);
             if (paramFound) {
                 info->rcTrim = value.toInt(&convertOk);
                 Q_ASSERT(convertOk);
             }
             
-            paramFound = _paramMgr->getParameterValue(50, minTpl.arg(i+1), value);
+            paramFound = _paramMgr->getParameterValue(_paramMgr->getDefaultComponentId(), minTpl.arg(i+1), value);
             Q_ASSERT(paramFound);
             if (paramFound) {
                 info->rcMin = value.toInt(&convertOk);
                 Q_ASSERT(convertOk);
             }
 
-            paramFound = _paramMgr->getParameterValue(50, maxTpl.arg(i+1), value);
+            paramFound = _paramMgr->getParameterValue(_paramMgr->getDefaultComponentId(), maxTpl.arg(i+1), value);
             Q_ASSERT(paramFound);
             if (paramFound) {
                 info->rcMax = value.toInt(&convertOk);
                 Q_ASSERT(convertOk);
             }
 
-            paramFound = _paramMgr->getParameterValue(50, revTpl.arg(i+1), value);
+            paramFound = _paramMgr->getParameterValue(_paramMgr->getDefaultComponentId(), revTpl.arg(i+1), value);
             Q_ASSERT(paramFound);
             if (paramFound) {
                 float floatReversed = value.toFloat(&convertOk);
@@ -201,7 +201,7 @@ void PX4RCCalibration::_setInternalCalibrationValuesFromParameters(void)
         for (int i=0; i<rcCalFunctionMax; i++) {
             int32_t paramChannel;
             
-            paramFound = _paramMgr->getParameterValue(50, _rgFunctionInfo[i].parameterName, value);
+            paramFound = _paramMgr->getParameterValue(_paramMgr->getDefaultComponentId(), _rgFunctionInfo[i].parameterName, value);
             Q_ASSERT(paramFound);
             if (paramFound) {
                 paramChannel = value.toInt(&convertOk);
-- 
2.22.0