Commit 1f7a7157 authored by Don Gagne's avatar Don Gagne

Assume param dups are not fatal

If we get a dup, clear the default value since we can’t trust it
parent c2d5f6a2
...@@ -145,7 +145,7 @@ void PX4ParameterLoader::loadParameterFactMetaData(void) ...@@ -145,7 +145,7 @@ void PX4ParameterLoader::loadParameterFactMetaData(void)
qWarning() << "Badly formed XML"; qWarning() << "Badly formed XML";
return; return;
} }
if (intVersion <= 1) { if (intVersion <= 2) {
// We can't read these old files // We can't read these old files
qDebug() << "Parameter version stamp too old, skipping load" << parameterFilename; qDebug() << "Parameter version stamp too old, skipping load" << parameterFilename;
return; return;
...@@ -218,18 +218,22 @@ void PX4ParameterLoader::loadParameterFactMetaData(void) ...@@ -218,18 +218,22 @@ void PX4ParameterLoader::loadParameterFactMetaData(void)
metaData = new FactMetaData(foundType); metaData = new FactMetaData(foundType);
Q_CHECK_PTR(metaData); Q_CHECK_PTR(metaData);
metaData->setGroup(factGroup); metaData->setGroup(factGroup);
if (!_mapParameterName2FactMetaData.contains(name)) { if (_mapParameterName2FactMetaData.contains(name)) {
// We can't trust the default value since we have dups
qDebug() << "Duplicate parameter found:" << name;
_mapParameterName2FactMetaData[name]->clearDefaultValue();
} else {
_mapParameterName2FactMetaData[name] = metaData; _mapParameterName2FactMetaData[name] = metaData;
}
if (xml.attributes().hasAttribute("default")) {
if (xml.attributes().hasAttribute("default")) { bool convertOk;
bool convertOk; QVariant varDefault = _stringToTypedVariant(strDefault, metaData->type(), &convertOk);
QVariant varDefault = _stringToTypedVariant(strDefault, metaData->type(), &convertOk); if (convertOk) {
if (convertOk) { metaData->setDefaultValue(varDefault);
metaData->setDefaultValue(varDefault); } else {
} else { // Non-fatal
// Non-fatal qDebug() << "Parameter meta data with bad default value, name:" << name << " type:" << type << " default:" << strDefault;
qDebug() << "Parameter meta data with bad default value, name:" << name << " type:" << type << " default:" << strDefault; }
} }
} }
......
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