Merge pull request #9034 from DonLakeFlyer/ParamJsonIndex

COMPONENT_INFORMATION: Parameter json metadata - support 'FOO<#>_BAR' param name metadata

src/Vehicle/CompInfoParam.cc

@@ -22,7 +22,8 @@ QGC_LOGGING_CATEGORY(CompInfoParamLog, "CompInfoParamLog")
 
 const char* CompInfoParam::_jsonScopeKey                = "scope";
 const char* CompInfoParam::_jsonParametersKey           = "parameters";
-const char* CompInfoParam::_cachedMetaDataFilePrefix    =   "ParameterFactMetaData";
+const char* CompInfoParam::_cachedMetaDataFilePrefix    = "ParameterFactMetaData";
+const char* CompInfoParam::_parameterIndexTag           = "<#>";
 
 CompInfoParam::CompInfoParam(uint8_t compId, Vehicle* vehicle, QObject* parent)
     : CompInfo(COMP_METADATA_TYPE_PARAMETER, compId, vehicle, parent)
@@ -84,10 +85,20 @@ FactMetaData* CompInfoParam::factMetaDataForName(const QString& name, FactMetaDa
     if (_opaqueParameterMetaData) {
         return vehicle->firmwarePlugin()->_getMetaDataForFact(_opaqueParameterMetaData, name, type, vehicle->vehicleType());
     } else {
+        QString indexTagName = name;
         if (!_nameToMetaDataMap.contains(name)) {
+            // Checked for indexed parameter names: "FOO<#>_BAR" will match "FOO1_BAR"
+            QRegularExpression regex("\\d+");
+            indexTagName = indexTagName.replace(regex, _parameterIndexTag);
+            if (!_nameToMetaDataMap.contains(indexTagName)) {
+                indexTagName.clear();
+            }
+        }
+        if (indexTagName.isEmpty()) {
+            indexTagName = name;
             _nameToMetaDataMap[name] = new FactMetaData(type, this);
         }
-        return _nameToMetaDataMap[name];
+        return _nameToMetaDataMap[indexTagName];
     }
 }
 

src/Vehicle/CompInfoParam.h

@@ -49,7 +49,7 @@ private:
     QObject*                            _opaqueParameterMetaData    = nullptr;
 
     static const char* _cachedMetaDataFilePrefix;
-
     static const char* _jsonScopeKey;
     static const char* _jsonParametersKey;
+    static const char* _parameterIndexTag;
 };