Skip to content

Commit

Permalink
Restore signature of configure function to ensure backward compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
Benkendorfer authored and ITk Strips SR1 Team committed Aug 21, 2024
1 parent f51d48d commit face515
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions templates/designToConfigParser.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ bool {{functionPrefix}}evaluateActive(
{% for class_name in designInspector.get_names_of_all_classes() %}
{% set cls = designInspector.objectify_class(class_name) %}

bool {{functionPrefix}}configureFromXML{{class_name}} (
bool {{functionPrefix}}configure{{class_name}} (
int docNum,
int childNode,
string prefix,
Expand All @@ -114,7 +114,7 @@ bool {{functionPrefix}}configureFromXML{{class_name}} (
{# {% for ho in designInspector.objectify_has_objects(class_name, "") %} #}
children = {{functionPrefix}}getChildNodesWithName(docNum, childNode, "{{ho.get('class')}}");
for (int i=1; i<=dynlen(children); i++)
{{functionPrefix}}configureFromXML{{ho.get('class')}} (docNum, children[i], fullName+"/", createDps, assignAddresses, continueOnError, addressActiveControl, connectionSettings);
{{functionPrefix}}configure{{ho.get('class')}} (docNum, children[i], fullName+"/", createDps, assignAddresses, continueOnError, addressActiveControl, connectionSettings);
{% endfor %}

return success;
Expand Down Expand Up @@ -325,7 +325,7 @@ int {{functionPrefix}}parseConfig (
dyn_int children = {{functionPrefix}}getChildNodesWithName(docNum, firstNode, "{{ho.get('class')}}");
for (int i = 1; i<=dynlen(children); i++)
{
{{functionPrefix}}configureFromXML{{ho.get('class')}} (docNum, children[i], "", createDps, assignAddresses, continueOnError, addressActiveControl, connectionSettings);
{{functionPrefix}}configure{{ho.get('class')}} (docNum, children[i], "", createDps, assignAddresses, continueOnError, addressActiveControl, connectionSettings);
}
{% elif ho.get('instantiateUsing') == 'design' %}
{{debug("WARNING: Skipping objects instantiated by design. For pure design instantiation ")}}
Expand Down

0 comments on commit face515

Please sign in to comment.