Skip to content

Q
qgroundcontrol
Commit e4baa3ce authored by Anton Matosov's avatar Anton Matosov
Browse files
Options

Fixed crashing at connection time if pixhawk MAV_COMP_ID value was previously changed.

parent c1e68051
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
src/ui/px4_configuration/PX4RCCalibration.cc
View file @ e4baa3ce
...@@ -167,28 +167,28 @@ void PX4RCCalibration::_setInternalCalibrationValuesFromParameters(void) ...@@ -167,28 +167,28 @@ void PX4RCCalibration::_setInternalCalibrationValuesFromParameters(void)
for (int i = 0; i < _chanMax; ++i) { for (int i = 0; i < _chanMax; ++i) {
struct ChannelInfo* info = &_rgChannelInfo[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); Q_ASSERT(paramFound);
if (paramFound) { if (paramFound) {
info->rcTrim = value.toInt(&convertOk); info->rcTrim = value.toInt(&convertOk);
Q_ASSERT(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); Q_ASSERT(paramFound);
if (paramFound) { if (paramFound) {
info->rcMin = value.toInt(&convertOk); info->rcMin = value.toInt(&convertOk);
Q_ASSERT(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); Q_ASSERT(paramFound);
if (paramFound) { if (paramFound) {
info->rcMax = value.toInt(&convertOk); info->rcMax = value.toInt(&convertOk);
Q_ASSERT(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); Q_ASSERT(paramFound);
if (paramFound) { if (paramFound) {
float floatReversed = value.toFloat(&convertOk); float floatReversed = value.toFloat(&convertOk);
...@@ -201,7 +201,7 @@ void PX4RCCalibration::_setInternalCalibrationValuesFromParameters(void) ...@@ -201,7 +201,7 @@ void PX4RCCalibration::_setInternalCalibrationValuesFromParameters(void)
for (int i=0; i<rcCalFunctionMax; i++) { for (int i=0; i<rcCalFunctionMax; i++) {
int32_t paramChannel; int32_t paramChannel;
paramFound = _paramMgr->getParameterValue(50, _rgFunctionInfo[i].parameterName, value); paramFound = _paramMgr->getParameterValue(_paramMgr->getDefaultComponentId(), _rgFunctionInfo[i].parameterName, value);
Q_ASSERT(paramFound); Q_ASSERT(paramFound);
if (paramFound) { if (paramFound) {
paramChannel = value.toInt(&convertOk); paramChannel = value.toInt(&convertOk);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment