Commit 904a78a5 authored by pixhawk's avatar pixhawk

mergeconflict solved

parent 86fda273
...@@ -375,6 +375,7 @@ void QGCParamWidget::loadParameters() ...@@ -375,6 +375,7 @@ void QGCParamWidget::loadParameters()
// Only load parameters for right mav // Only load parameters for right mav
if (mav->getUASID() == wpParams.at(0).toInt()) if (mav->getUASID() == wpParams.at(0).toInt())
{ {
bool changed = false; bool changed = false;
int component = wpParams.at(1).toInt(); int component = wpParams.at(1).toInt();
QString parameterName = wpParams.at(2); QString parameterName = wpParams.at(2);
...@@ -405,6 +406,7 @@ void QGCParamWidget::loadParameters() ...@@ -405,6 +406,7 @@ void QGCParamWidget::loadParameters()
qDebug() << "MARKING COMP" << wpParams.at(1).toInt() << "PARAM" << wpParams.at(2) << "VALUE" << (float)wpParams.at(3).toDouble() << "AS CHANGED"; qDebug() << "MARKING COMP" << wpParams.at(1).toInt() << "PARAM" << wpParams.at(2) << "VALUE" << (float)wpParams.at(3).toDouble() << "AS CHANGED";
// Mark in UI // Mark in UI
} }
} }
} }
......
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