Skip to content

Commit 13c767d

Browse files
ipa-nhgipa-nhg
committed
Update models to the new ros-model version, see:ipa320/RosTooling#125 
1 parent 28420d7 commit 13c767d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+691
-706
lines changed

‎RosComponents/cob_light/msgs/cob_light.ros‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
PackageSet{package{
2-
Package cob_light{ spec {
1+
PackageSet{
2+
Package cob_light{ Specs {
33
TopicSpec ColorRGBAArray{ message { "std_msgs.ColorRGBA"[] colors }},
44
TopicSpec LightMode{ message { uint8 mode float32 frequency float32 timeout int32 pulses int8 priority "std_msgs.ColorRGBA"[] colors "cob_light.Sequence"[] sequences }},
55
TopicSpec Sequence{ message { "std_msgs.ColorRGBA" color float32 hold_time float32 cross_time }},
@@ -14,5 +14,4 @@ PackageSet{package{
1414
TopicSpec LightModes{ message { uint8 NONE uint8 STATIC uint8 FLASH uint8 BREATH uint8 BREATH_COLOR uint8 FADE_COLOR uint8 SEQ uint8 CIRCLE_COLORS uint8 SWEEP uint8 DIST_APPROX uint8 GLOW uint8 XMAS }},
1515
ServiceSpec StopLightMode{ request { uint64 track_id } response { uint8 active_mode uint8 active_priority uint64 track_id } }
1616
}}
17-
}
1817
}

‎RosComponents/cob_light/representations.aird‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<semanticResources>platform:/resource/de.fraunhofer.ipa.ros.communication.objects/basic_msgs/nodelet.ros</semanticResources>
1313
<semanticResources>platform:/resource/de.fraunhofer.ipa.ros.communication.objects/basic_msgs/theora_image_transport.ros</semanticResources>
1414
<semanticResources>msgs/cob_light.ros</semanticResources>
15+
<semanticResources>components/cob_light.componentinterface</semanticResources>
1516
<ownedViews xmi:type="viewpoint:DView" uid="_0E3V8O9oEemw_eODUxH3xw">
1617
<viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/de.fraunhofer.ipa.ros.sirius/description/ros.odesign#//@ownedViewpoints[name='component']"/>
1718
<ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_0HBSEO9oEemw_eODUxH3xw" name="cob_light" repPath="#_0Gr64O9oEemw_eODUxH3xw">
@@ -130,71 +131,71 @@
130131
<target xmi:type="ros:Node" href="rosnodes/cob_light.ros#//@package.0/@artifact.0/@node"/>
131132
<semanticElements xmi:type="ros:Node" href="rosnodes/cob_light.ros#//@package.0/@artifact.0/@node"/>
132133
<ownedBorderedNodes xmi:type="diagram:DNode" uid="_2VXY8O9oEemw_eODUxH3xw" name="/diagnostics" tooltipText="Topic" width="2" height="2" resizeKind="NSEW">
133-
<target xmi:type="ros:Publisher" href="rosnodes/cob_light.ros#//@package.0/@artifact.0/@node/@publisher.0"/>
134-
<semanticElements xmi:type="ros:Publisher" href="rosnodes/cob_light.ros#//@package.0/@artifact.0/@node/@publisher.0"/>
134+
<target xmi:type="ros:Publisher" href="rosnodes/cob_light.ros#//@package.0/@artifact.0/@node/@Publishers.0"/>
135+
<semanticElements xmi:type="ros:Publisher" href="rosnodes/cob_light.ros#//@package.0/@artifact.0/@node/@Publishers.0"/>
135136
<ownedStyle xmi:type="diagram:Square" uid="_2VYnEO9oEemw_eODUxH3xw" labelSize="10" showIcon="false" width="2" height="2" color="0,0,0">
136137
<labelFormat>bold</labelFormat>
137138
<description xmi:type="style:SquareDescription" href="platform:/plugin/de.fraunhofer.ipa.ros.sirius/description/ros.odesign#//@ownedViewpoints[name='component']/@ownedRepresentations[name='Artifact%20diagram']/@defaultLayer/@containerMappings[name='Node']/@borderedNodeMappings[name='RosPublisher']/@style"/>
138139
</ownedStyle>
139140
<actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/de.fraunhofer.ipa.ros.sirius/description/ros.odesign#//@ownedViewpoints[name='component']/@ownedRepresentations[name='Artifact%20diagram']/@defaultLayer/@containerMappings[name='Node']/@borderedNodeMappings[name='RosPublisher']"/>
140141
</ownedBorderedNodes>
141142
<ownedBorderedNodes xmi:type="diagram:DNode" uid="_2VZOIe9oEemw_eODUxH3xw" name="marker" tooltipText="Topic" width="2" height="2" resizeKind="NSEW">
142-
<target xmi:type="ros:Publisher" href="rosnodes/cob_light.ros#//@package.0/@artifact.0/@node/@publisher.1"/>
143-
<semanticElements xmi:type="ros:Publisher" href="rosnodes/cob_light.ros#//@package.0/@artifact.0/@node/@publisher.1"/>
143+
<target xmi:type="ros:Publisher" href="rosnodes/cob_light.ros#//@package.0/@artifact.0/@node/@Publishers.1"/>
144+
<semanticElements xmi:type="ros:Publisher" href="rosnodes/cob_light.ros#//@package.0/@artifact.0/@node/@Publishers.1"/>
144145
<ownedStyle xmi:type="diagram:Square" uid="_2VZ1MO9oEemw_eODUxH3xw" labelSize="10" showIcon="false" width="2" height="2" color="0,0,0">
145146
<labelFormat>bold</labelFormat>
146147
<description xmi:type="style:SquareDescription" href="platform:/plugin/de.fraunhofer.ipa.ros.sirius/description/ros.odesign#//@ownedViewpoints[name='component']/@ownedRepresentations[name='Artifact%20diagram']/@defaultLayer/@containerMappings[name='Node']/@borderedNodeMappings[name='RosPublisher']/@style"/>
147148
</ownedStyle>
148149
<actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/de.fraunhofer.ipa.ros.sirius/description/ros.odesign#//@ownedViewpoints[name='component']/@ownedRepresentations[name='Artifact%20diagram']/@defaultLayer/@containerMappings[name='Node']/@borderedNodeMappings[name='RosPublisher']"/>
149150
</ownedBorderedNodes>
150151
<ownedBorderedNodes xmi:type="diagram:DNode" uid="_2VZ1Mu9oEemw_eODUxH3xw" name="debug" tooltipText="Topic" width="2" height="2" resizeKind="NSEW">
151-
<target xmi:type="ros:Publisher" href="rosnodes/cob_light.ros#//@package.0/@artifact.0/@node/@publisher.2"/>
152-
<semanticElements xmi:type="ros:Publisher" href="rosnodes/cob_light.ros#//@package.0/@artifact.0/@node/@publisher.2"/>
152+
<target xmi:type="ros:Publisher" href="rosnodes/cob_light.ros#//@package.0/@artifact.0/@node/@Publishers.2"/>
153+
<semanticElements xmi:type="ros:Publisher" href="rosnodes/cob_light.ros#//@package.0/@artifact.0/@node/@Publishers.2"/>
153154
<ownedStyle xmi:type="diagram:Square" uid="_2VacQO9oEemw_eODUxH3xw" labelSize="10" showIcon="false" width="2" height="2" color="0,0,0">
154155
<labelFormat>bold</labelFormat>
155156
<description xmi:type="style:SquareDescription" href="platform:/plugin/de.fraunhofer.ipa.ros.sirius/description/ros.odesign#//@ownedViewpoints[name='component']/@ownedRepresentations[name='Artifact%20diagram']/@defaultLayer/@containerMappings[name='Node']/@borderedNodeMappings[name='RosPublisher']/@style"/>
156157
</ownedStyle>
157158
<actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/de.fraunhofer.ipa.ros.sirius/description/ros.odesign#//@ownedViewpoints[name='component']/@ownedRepresentations[name='Artifact%20diagram']/@defaultLayer/@containerMappings[name='Node']/@borderedNodeMappings[name='RosPublisher']"/>
158159
</ownedBorderedNodes>
159160
<ownedBorderedNodes xmi:type="diagram:DNode" uid="_2VacQu9oEemw_eODUxH3xw" name="debugMulti" tooltipText="Topic" width="2" height="2" resizeKind="NSEW">
160-
<target xmi:type="ros:Publisher" href="rosnodes/cob_light.ros#//@package.0/@artifact.0/@node/@publisher.3"/>
161-
<semanticElements xmi:type="ros:Publisher" href="rosnodes/cob_light.ros#//@package.0/@artifact.0/@node/@publisher.3"/>
161+
<target xmi:type="ros:Publisher" href="rosnodes/cob_light.ros#//@package.0/@artifact.0/@node/@Publishers.3"/>
162+
<semanticElements xmi:type="ros:Publisher" href="rosnodes/cob_light.ros#//@package.0/@artifact.0/@node/@Publishers.3"/>
162163
<ownedStyle xmi:type="diagram:Square" uid="_2VacQ-9oEemw_eODUxH3xw" labelSize="10" showIcon="false" width="2" height="2" color="0,0,0">
163164
<labelFormat>bold</labelFormat>
164165
<description xmi:type="style:SquareDescription" href="platform:/plugin/de.fraunhofer.ipa.ros.sirius/description/ros.odesign#//@ownedViewpoints[name='component']/@ownedRepresentations[name='Artifact%20diagram']/@defaultLayer/@containerMappings[name='Node']/@borderedNodeMappings[name='RosPublisher']/@style"/>
165166
</ownedStyle>
166167
<actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/de.fraunhofer.ipa.ros.sirius/description/ros.odesign#//@ownedViewpoints[name='component']/@ownedRepresentations[name='Artifact%20diagram']/@defaultLayer/@containerMappings[name='Node']/@borderedNodeMappings[name='RosPublisher']"/>
167168
</ownedBorderedNodes>
168169
<ownedBorderedNodes xmi:type="diagram:DNode" uid="_2VbDUe9oEemw_eODUxH3xw" name="command" tooltipText="Topic" width="2" height="2" resizeKind="NSEW">
169-
<target xmi:type="ros:Subscriber" href="rosnodes/cob_light.ros#//@package.0/@artifact.0/@node/@subscriber.0"/>
170-
<semanticElements xmi:type="ros:Subscriber" href="rosnodes/cob_light.ros#//@package.0/@artifact.0/@node/@subscriber.0"/>
170+
<target xmi:type="ros:Subscriber" href="rosnodes/cob_light.ros#//@package.0/@artifact.0/@node/@Subscribers.0"/>
171+
<semanticElements xmi:type="ros:Subscriber" href="rosnodes/cob_light.ros#//@package.0/@artifact.0/@node/@Subscribers.0"/>
171172
<ownedStyle xmi:type="diagram:Square" uid="_2VbqYO9oEemw_eODUxH3xw" labelSize="10" showIcon="false" width="2" height="2" color="0,0,0">
172173
<labelFormat>bold</labelFormat>
173174
<description xmi:type="style:SquareDescription" href="platform:/plugin/de.fraunhofer.ipa.ros.sirius/description/ros.odesign#//@ownedViewpoints[name='component']/@ownedRepresentations[name='Artifact%20diagram']/@defaultLayer/@containerMappings[name='Node']/@borderedNodeMappings[name='RosSubscriber']/@style"/>
174175
</ownedStyle>
175176
<actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/de.fraunhofer.ipa.ros.sirius/description/ros.odesign#//@ownedViewpoints[name='component']/@ownedRepresentations[name='Artifact%20diagram']/@defaultLayer/@containerMappings[name='Node']/@borderedNodeMappings[name='RosSubscriber']"/>
176177
</ownedBorderedNodes>
177178
<ownedBorderedNodes xmi:type="diagram:DNode" uid="_2VbqYu9oEemw_eODUxH3xw" name="/scan_unified" tooltipText="Topic" width="2" height="2" resizeKind="NSEW">
178-
<target xmi:type="ros:Subscriber" href="rosnodes/cob_light.ros#//@package.0/@artifact.0/@node/@subscriber.1"/>
179-
<semanticElements xmi:type="ros:Subscriber" href="rosnodes/cob_light.ros#//@package.0/@artifact.0/@node/@subscriber.1"/>
179+
<target xmi:type="ros:Subscriber" href="rosnodes/cob_light.ros#//@package.0/@artifact.0/@node/@Subscribers.1"/>
180+
<semanticElements xmi:type="ros:Subscriber" href="rosnodes/cob_light.ros#//@package.0/@artifact.0/@node/@Subscribers.1"/>
180181
<ownedStyle xmi:type="diagram:Square" uid="_2VcRcO9oEemw_eODUxH3xw" labelSize="10" showIcon="false" width="2" height="2" color="0,0,0">
181182
<labelFormat>bold</labelFormat>
182183
<description xmi:type="style:SquareDescription" href="platform:/plugin/de.fraunhofer.ipa.ros.sirius/description/ros.odesign#//@ownedViewpoints[name='component']/@ownedRepresentations[name='Artifact%20diagram']/@defaultLayer/@containerMappings[name='Node']/@borderedNodeMappings[name='RosSubscriber']/@style"/>
183184
</ownedStyle>
184185
<actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/de.fraunhofer.ipa.ros.sirius/description/ros.odesign#//@ownedViewpoints[name='component']/@ownedRepresentations[name='Artifact%20diagram']/@defaultLayer/@containerMappings[name='Node']/@borderedNodeMappings[name='RosSubscriber']"/>
185186
</ownedBorderedNodes>
186187
<ownedBorderedNodes xmi:type="diagram:DNode" uid="_2Vc4gO9oEemw_eODUxH3xw" name="set_light" tooltipText="Topic" width="2" height="2" resizeKind="NSEW">
187-
<target xmi:type="ros:ServiceServer" href="rosnodes/cob_light.ros#//@package.0/@artifact.0/@node/@serviceserver.0"/>
188-
<semanticElements xmi:type="ros:ServiceServer" href="rosnodes/cob_light.ros#//@package.0/@artifact.0/@node/@serviceserver.0"/>
188+
<target xmi:type="ros:ServiceServer" href="rosnodes/cob_light.ros#//@package.0/@artifact.0/@node/@ServiceServers.0"/>
189+
<semanticElements xmi:type="ros:ServiceServer" href="rosnodes/cob_light.ros#//@package.0/@artifact.0/@node/@ServiceServers.0"/>
189190
<ownedStyle xmi:type="diagram:Square" uid="_2Vc4ge9oEemw_eODUxH3xw" labelSize="10" showIcon="false" labelColor="39,76,114" borderColor="39,76,114" width="2" height="2" color="39,76,114">
190191
<labelFormat>bold</labelFormat>
191192
<description xmi:type="style:SquareDescription" href="platform:/plugin/de.fraunhofer.ipa.ros.sirius/description/ros.odesign#//@ownedViewpoints[name='component']/@ownedRepresentations[name='Artifact%20diagram']/@defaultLayer/@containerMappings[name='Node']/@borderedNodeMappings[name='RosServiceServer']/@style"/>
192193
</ownedStyle>
193194
<actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/de.fraunhofer.ipa.ros.sirius/description/ros.odesign#//@ownedViewpoints[name='component']/@ownedRepresentations[name='Artifact%20diagram']/@defaultLayer/@containerMappings[name='Node']/@borderedNodeMappings[name='RosServiceServer']"/>
194195
</ownedBorderedNodes>
195196
<ownedBorderedNodes xmi:type="diagram:DNode" uid="_2VdfkO9oEemw_eODUxH3xw" name="stop_mode" tooltipText="Topic" width="2" height="2" resizeKind="NSEW">
196-
<target xmi:type="ros:ServiceServer" href="rosnodes/cob_light.ros#//@package.0/@artifact.0/@node/@serviceserver.1"/>
197-
<semanticElements xmi:type="ros:ServiceServer" href="rosnodes/cob_light.ros#//@package.0/@artifact.0/@node/@serviceserver.1"/>
197+
<target xmi:type="ros:ServiceServer" href="rosnodes/cob_light.ros#//@package.0/@artifact.0/@node/@ServiceServers.1"/>
198+
<semanticElements xmi:type="ros:ServiceServer" href="rosnodes/cob_light.ros#//@package.0/@artifact.0/@node/@ServiceServers.1"/>
198199
<ownedStyle xmi:type="diagram:Square" uid="_2Vdfke9oEemw_eODUxH3xw" labelSize="10" showIcon="false" labelColor="39,76,114" borderColor="39,76,114" width="2" height="2" color="39,76,114">
199200
<labelFormat>bold</labelFormat>
200201
<description xmi:type="style:SquareDescription" href="platform:/plugin/de.fraunhofer.ipa.ros.sirius/description/ros.odesign#//@ownedViewpoints[name='component']/@ownedRepresentations[name='Artifact%20diagram']/@defaultLayer/@containerMappings[name='Node']/@borderedNodeMappings[name='RosServiceServer']/@style"/>

‎RosComponents/cob_light/rosnodes/cob_light.ros‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
PackageSet { package {
2-
CatkinPackage cob_light { artifact {
1+
PackageSet {
2+
CatkinPackage cob_light {
33
Artifact cob_light {
4-
node Node { name cob_light
5-
serviceserver {
4+
Node { name cob_light
5+
ServiceServers {
66
ServiceServer { name 'set_light' service 'cob_light.SetLightMode'},
77
ServiceServer { name 'stop_mode' service 'cob_light.StopLightMode'}}
8-
publisher {
8+
Publishers {
99
Publisher { name '/diagnostics' message 'diagnostic_msgs.DiagnosticArray'},
1010
Publisher { name 'marker' message 'visualization_msgs.Marker'},
1111
Publisher { name 'debug' message 'std_msgs.ColorRGBA'},
1212
Publisher { name 'debugMulti' message 'cob_light.ColorRGBAArray'}}
13-
subscriber {
13+
Subscribers {
1414
Subscriber { name 'command' message 'cob_light.ColorRGBAArray'},
1515
Subscriber { name '/scan_unified' message 'sensor_msgs.LaserScan'}}
16-
}}}}}}
16+
}}}}

‎RosComponents/joy/representations.aird‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@
7878
<target xmi:type="ros:Node" href="rosnodes/joy.ros#//@package.0/@artifact.0/@node"/>
7979
<semanticElements xmi:type="ros:Node" href="rosnodes/joy.ros#//@package.0/@artifact.0/@node"/>
8080
<ownedBorderedNodes xmi:type="diagram:DNode" uid="_mArCUBgAEeqnldYXm10Q0Q" name="joy" tooltipText="Topic" width="2" height="2" resizeKind="NSEW">
81-
<target xmi:type="ros:Publisher" href="rosnodes/joy.ros#//@package.0/@artifact.0/@node/@publisher.0"/>
82-
<semanticElements xmi:type="ros:Publisher" href="rosnodes/joy.ros#//@package.0/@artifact.0/@node/@publisher.0"/>
81+
<target xmi:type="ros:Publisher" href="rosnodes/joy.ros#//@package.0/@artifact.0/@node/@Publishers.0"/>
82+
<semanticElements xmi:type="ros:Publisher" href="rosnodes/joy.ros#//@package.0/@artifact.0/@node/@Publishers.0"/>
8383
<arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
8484
<arrangeConstraints>KEEP_SIZE</arrangeConstraints>
8585
<arrangeConstraints>KEEP_RATIO</arrangeConstraints>
@@ -90,8 +90,8 @@
9090
<actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/de.fraunhofer.ipa.ros.sirius/description/ros.odesign#//@ownedViewpoints[name='component']/@ownedRepresentations[name='Artifact%20diagram']/@defaultLayer/@containerMappings[name='Node']/@borderedNodeMappings[name='RosPublisher']"/>
9191
</ownedBorderedNodes>
9292
<ownedBorderedNodes xmi:type="diagram:DNode" uid="_mArpYRgAEeqnldYXm10Q0Q" name="diagnostics" tooltipText="Topic" width="2" height="2" resizeKind="NSEW">
93-
<target xmi:type="ros:Publisher" href="rosnodes/joy.ros#//@package.0/@artifact.0/@node/@publisher.1"/>
94-
<semanticElements xmi:type="ros:Publisher" href="rosnodes/joy.ros#//@package.0/@artifact.0/@node/@publisher.1"/>
93+
<target xmi:type="ros:Publisher" href="rosnodes/joy.ros#//@package.0/@artifact.0/@node/@Publishers.1"/>
94+
<semanticElements xmi:type="ros:Publisher" href="rosnodes/joy.ros#//@package.0/@artifact.0/@node/@Publishers.1"/>
9595
<arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
9696
<arrangeConstraints>KEEP_SIZE</arrangeConstraints>
9797
<arrangeConstraints>KEEP_RATIO</arrangeConstraints>
@@ -102,8 +102,8 @@
102102
<actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/de.fraunhofer.ipa.ros.sirius/description/ros.odesign#//@ownedViewpoints[name='component']/@ownedRepresentations[name='Artifact%20diagram']/@defaultLayer/@containerMappings[name='Node']/@borderedNodeMappings[name='RosPublisher']"/>
103103
</ownedBorderedNodes>
104104
<ownedBorderedNodes xmi:type="diagram:DNode" uid="_mAsQcRgAEeqnldYXm10Q0Q" name="joy/set_feedback" tooltipText="Topic" width="2" height="2" resizeKind="NSEW">
105-
<target xmi:type="ros:Subscriber" href="rosnodes/joy.ros#//@package.0/@artifact.0/@node/@subscriber.0"/>
106-
<semanticElements xmi:type="ros:Subscriber" href="rosnodes/joy.ros#//@package.0/@artifact.0/@node/@subscriber.0"/>
105+
<target xmi:type="ros:Subscriber" href="rosnodes/joy.ros#//@package.0/@artifact.0/@node/@Subscribers.0"/>
106+
<semanticElements xmi:type="ros:Subscriber" href="rosnodes/joy.ros#//@package.0/@artifact.0/@node/@Subscribers.0"/>
107107
<arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
108108
<arrangeConstraints>KEEP_SIZE</arrangeConstraints>
109109
<arrangeConstraints>KEEP_RATIO</arrangeConstraints>

‎RosComponents/joy/rosnodes/joy.ros‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
PackageSet { package {
2-
CatkinPackage joy { artifact {
3-
Artifact joy_node { node Node { name joy_node
4-
publisher {
1+
PackageSet {
2+
CatkinPackage joy {
3+
Artifact joy_node { Node { name joy_node
4+
Publishers {
55
Publisher { name "joy" message "sensor_msgs.Joy" },
66
Publisher { name "diagnostics" message "diagnostic_msgs.DiagnosticArray" }
77
}
8-
subscriber {
8+
Subscribers {
99
Subscriber { name "joy/set_feedback" message "sensor_msgs.JoyFeedbackArray"}
1010
}}
11-
}}}}}
11+
}}}

0 commit comments

Comments
 (0)