Commit be70eb2d authored by Maxime Perrotin's avatar Maxime Perrotin
Browse files

Fixes in xml2aadl templates

parent cd269d65
Pipeline #3173 passed with stage
in 38 minutes and 37 seconds
......@@ -103,21 +103,13 @@ SUBCOMPONENTS
{% endfor %}
{% if func.connections|length > 0 %}
CONNECTIONS
{% for conn in func.connections %}
{% if conn.siIsRequired %}
{{ conn.source }}_RI_{{ conn.siName }}_{{ conn.target }}_PI_{{ conn.tiName }} : SUBPROGRAM ACCESS RI_{{ conn.tiName }} -> {{ conn.source }}.RI_{{ conn.siName }} {
{% for prop in conn.properties %}
{{ prop.name }} => "{{ prop.value }}";
{% endfor %}
};
{% else %}
{{ conn.source }}_PI_{{ conn.siName }}_{{ conn.target }}_RI_{{ conn.tiName }} : SUBPROGRAM ACCESS {{ conn.target }}.PI_{{ conn.tiName }} -> PI_{{ conn.siName }} {
{% for prop in conn.properties %}
{{ prop.name }} => "{{ prop.value }}";
{% endfor %}
};
{% endif %}
{% endfor %}
{% for conn in func.connections %}
{% if conn.siIsRequired %}
{{ conn.source }}_RI_{{ conn.siName }}_{{ conn.target }}_PI_{{ conn.tiName }} : SUBPROGRAM ACCESS {% if conn.target != func.name %}{{ conn.target }}.PI_{% else %}RI_{% endif %}{{ conn.tiName }} -> {{ conn.source }}.RI_{{ conn.siName }};
{% else %}
{{ conn.source }}_PI_{{ conn.siName }}_{{ conn.target }}_RI_{{ conn.tiName }} : SUBPROGRAM ACCESS {{ conn.target }}.PI_{{ conn.tiName }} -> {% if conn.source != func.name %}{{ conn.source }}.RI_{% else %}PI_{% endif %}{{ conn.siName }};
{% endif %}
{% endfor %}
{% endif %}
{% endif %}
END {{ func.name }}.others;
......
......@@ -37,7 +37,7 @@ SUBCOMPONENTS
{% if attr.name == "name" %}
{{ attr.value }} : SYSTEM interfaceview::IV::{{ attr.value }}::{{ attr.value }}.others {
{% for prop in func.properties %}
{% if prop.name != "Taste::RootCoordinates" %}
{% if prop.name != "Taste::RootCoordinates" and prop.name != "Taste.InnerCoordinates" %}
{{ prop.name }} => "{{ prop.value }}";
{% endif %}
{% endfor %}
......@@ -48,11 +48,7 @@ SUBCOMPONENTS
{% if Connections|length > 0 %}
CONNECTIONS
{% for conn in Connections %}
{{ conn.source }}_RI_{{ conn.siName }}_{{ conn.target }}_PI_{{ conn.tiName }} : SUBPROGRAM ACCESS {{ conn.target }}.PI_{{ conn.tiName }} -> {{ conn.source }}.RI_{{ conn.siName }} {
{% for prop in conn.properties %}
{{ prop.name }} => "{{ prop.value }}";
{% endfor %}
};
{{ conn.source }}_RI_{{ conn.siName }}_{{ conn.target }}_PI_{{ conn.tiName }} : SUBPROGRAM ACCESS {{ conn.target }}.PI_{{ conn.tiName }} -> {{ conn.source }}.RI_{{ conn.siName }};
{% endfor %}
{% endif %}
END interfaceview.others;
......
Supports Markdown
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