Aufgrund einer Störung des s3 Storage, könnten in nächster Zeit folgende GitLab Funktionen nicht zur Verfügung stehen: LFS, Container Registry, Job Artifacs, Uploads (Wiki, Bilder, Projekt-Exporte). Wir bitten um Verständnis. Es wird mit Hochdruck an der Behebung des Problems gearbeitet. Weitere Informationen zur Störung des Object Storage finden Sie hier: https://maintenance.itc.rwth-aachen.de/ticket/status/messages/59-object-storage-pilot

Commit e3dae7d8 authored by Alexander David Hellwig's avatar Alexander David Hellwig
Browse files

Changed SimpleDist.tag to use new Syntax: simple RosConnection tag

parent de3f01f5
......@@ -81,9 +81,11 @@ public class DistributedTargetGenerator extends CMakeMasterGenerator {
if (Objects.equals(connectorSymbol.getSourcePort().getComponentInstance().orElse(null), componentInstanceSymbol)) {
//In port of supercomp
inferRosConnectionIfPossible(connectorSymbol.getSourcePort(), connectorSymbol.getTargetPort());
generateRosConnectionIfPossible(connectorSymbol);
} else if (Objects.equals(connectorSymbol.getTargetPort().getComponentInstance().orElse(null), componentInstanceSymbol)) {
//out port of supercomp
inferRosConnectionIfPossible(connectorSymbol.getTargetPort(), connectorSymbol.getSourcePort());
generateRosConnectionIfPossible(connectorSymbol);
} else {
//In between subcomps
generateRosConnectionIfPossible(connectorSymbol);
......
package tests.dist;
component DistComp{
port out Q resOut;
component SubComp1{
ports out Q out1,
out Q out2;
implementation Math{
out1 = out1 + 1;
out2 = out2 + 2;
}
}
component SubComp2{
ports in Q in1,
in Q in2;
in Q in2,
out Q resOut;
implementation Math{
resOut = in1 + in2;
}
}
instance SubComp1 sub1;
......@@ -16,4 +29,5 @@ component DistComp{
connect sub1.out1 -> sub2.in1;
connect sub1.out2 -> sub2.in2;
connect sub2.resOut -> resOut;
}
\ No newline at end of file
......@@ -2,8 +2,10 @@ package tests.dist;
conforms to de.monticore.lang.monticar.generator.roscpp.RosToEmamTagSchema;
tags SimpleDist{
tag distComp.sub1.out1 with RosConnection = {topic = (topicIn1, std_msgs/Float64), msgField = data};
tag distComp.sub1.out2 with RosConnection = {topic = (topicIn2, std_msgs/Float64), msgField = data};
tag distComp.sub2.in1 with RosConnection = {topic = (topicIn1, std_msgs/Float64), msgField = data};
tag distComp.sub2.in2 with RosConnection = {topic = (topicIn2, std_msgs/Float64), msgField = data};
tag distComp.sub1.out1 with RosConnection;
tag distComp.sub1.out2 with RosConnection;
tag distComp.sub2.in1 with RosConnection;
tag distComp.sub2.in2 with RosConnection;
tag distComp.sub2.resOut with RosConnection;
tag distComp.resOut with RosConnection;
}
\ No newline at end of file
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