Commit 7f893689 authored by Don Gagne's avatar Don Gagne

Merge pull request #608 from vooon/fix-error-603

Fix bug #603 save INT8/UINT8 parameters to file
parents 78e555c6 e3f6a388
...@@ -309,6 +309,9 @@ void UASParameterDataModel::readUpdateParamsFromStream( QTextStream& stream) ...@@ -309,6 +309,9 @@ void UASParameterDataModel::readUpdateParamsFromStream( QTextStream& stream)
case MAV_PARAM_TYPE_INT32: case MAV_PARAM_TYPE_INT32:
updatePendingParamWithValue(componentId,key,QVariant(valStr.toInt())); updatePendingParamWithValue(componentId,key,QVariant(valStr.toInt()));
break; break;
case MAV_PARAM_TYPE_INT8:
updatePendingParamWithValue(componentId,key,QVariant((unsigned char) valStr.toUInt()));
break;
default: default:
qDebug() << "FAILED LOADING PARAM" << key << "UNKNOWN DATA TYPE"; qDebug() << "FAILED LOADING PARAM" << key << "UNKNOWN DATA TYPE";
} }
...@@ -355,8 +358,14 @@ void UASParameterDataModel::writeOnboardParamsToStream( QTextStream &stream, con ...@@ -355,8 +358,14 @@ void UASParameterDataModel::writeOnboardParamsToStream( QTextStream &stream, con
paramValue = paramValue.arg((double)j.value().toFloat(), 25, 'g', 6); paramValue = paramValue.arg((double)j.value().toFloat(), 25, 'g', 6);
paramType = paramType.arg(MAV_PARAM_TYPE_REAL32); paramType = paramType.arg(MAV_PARAM_TYPE_REAL32);
break; break;
case QMetaType::QChar:
case QMetaType::Char:
// see UAS::setParameter()
paramValue = paramValue.arg((unsigned char)j.value().toUInt());
paramType = paramType.arg(MAV_PARAM_TYPE_INT8);
break;
default: default:
qCritical() << "ABORTED PARAM WRITE TO FILE, NO VALID QVARIANT TYPE" << j.value(); qCritical() << "ABORTED PARAM WRITE TO FILE, PARAM '" << j.key() << "' NO VALID QVARIANT TYPE" << j.value();
return; return;
} }
stream << this->uasId << "\t" << compid << "\t" << j.key() << "\t" << paramValue << "\t" << paramType << "\n"; stream << this->uasId << "\t" << compid << "\t" << j.key() << "\t" << paramValue << "\t" << paramType << "\n";
......
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