Skip to content

Q
qgroundcontrol
Commit 7ffb2cf4 authored by DonLakeFlyer's avatar DonLakeFlyer
Browse files
Options

Validate min/max on the way in

parent a08db212
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc
View file @ 7ffb2cf4
...@@ -265,7 +265,7 @@ void PX4ParameterMetaData::loadParameterFactMetaDataFile(const QString& metaData ...@@ -265,7 +265,7 @@ void PX4ParameterMetaData::loadParameterFactMetaDataFile(const QString& metaData
qCDebug(PX4ParameterMetaDataLog) << "Min:" << text; qCDebug(PX4ParameterMetaDataLog) << "Min:" << text;
QVariant varMin; QVariant varMin;
if (metaData->convertAndValidateRaw(text, true /* convertOnly */, varMin, errorString)) { if (metaData->convertAndValidateRaw(text, false /* convertOnly */, varMin, errorString)) {
metaData->setRawMin(varMin); metaData->setRawMin(varMin);
} else { } else {
qCWarning(PX4ParameterMetaDataLog) << "Invalid min value, name:" << metaData->name() << " type:" << metaData->type() << " min:" << text << " error:" << errorString; qCWarning(PX4ParameterMetaDataLog) << "Invalid min value, name:" << metaData->name() << " type:" << metaData->type() << " min:" << text << " error:" << errorString;
...@@ -276,7 +276,7 @@ void PX4ParameterMetaData::loadParameterFactMetaDataFile(const QString& metaData ...@@ -276,7 +276,7 @@ void PX4ParameterMetaData::loadParameterFactMetaDataFile(const QString& metaData
qCDebug(PX4ParameterMetaDataLog) << "Max:" << text; qCDebug(PX4ParameterMetaDataLog) << "Max:" << text;
QVariant varMax; QVariant varMax;
if (metaData->convertAndValidateRaw(text, true /* convertOnly */, varMax, errorString)) { if (metaData->convertAndValidateRaw(text, false /* convertOnly */, varMax, errorString)) {
metaData->setRawMax(varMax); metaData->setRawMax(varMax);
} else { } else {
qCWarning(PX4ParameterMetaDataLog) << "Invalid max value, name:" << metaData->name() << " type:" << metaData->type() << " max:" << text << " error:" << errorString; qCWarning(PX4ParameterMetaDataLog) << "Invalid max value, name:" << metaData->name() << " type:" << metaData->type() << " max:" << text << " error:" << errorString;
......
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