Skip to content

Commit 0ce35f7

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

16 files changed

+49
-55
lines changed

‎de.fraunhofer.ipa.ros.communication.objects/BasicSpecs/Joy.ros‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
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-
}}}}}
8+
}}}

‎de.fraunhofer.ipa.ros.communication.objects/BasicSpecs/Laser2DScan.ros‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
PackageSet { package {
2-
CatkinPackage scan_2d { artifact {
3-
Artifact scan_2d { node Node { name scan_2d
4-
publisher {
1+
PackageSet {
2+
CatkinPackage scan_2d {
3+
Artifact scan_2d { Node { name scan_2d
4+
Publishers {
55
Publisher { name scan message "sensor_msgs.LaserScan" } ,
66
Publisher { name diagnostics message "diagnostic_msgs.DiagnosticArray"
77
}}}}
88

9-
}}}}
9+
}}

‎de.fraunhofer.ipa.ros.communication.objects/BasicSpecs/Teleop.ros‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
PackageSet { package {
2-
CatkinPackage teleop { artifact {
1+
PackageSet {
2+
CatkinPackage teleop {
33
Artifact joystick_teleop_node {
4-
node Node { name joystick_teleop_node
5-
publisher { Publisher { name cmd_vel message "geometry_msgs.Twist" } }
6-
subscriber { Subscriber { name joy message "sensor_msgs.Joy" } }
4+
Node { name joystick_teleop_node
5+
Publishers { Publisher { name cmd_vel message "geometry_msgs.Twist" } }
6+
Subscribers { Subscriber { name joy message "sensor_msgs.Joy" } }
77
}
8-
}}}}}
8+
}}}

‎de.fraunhofer.ipa.ros.communication.objects/basic_msgs/common_msgs.ros‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
PackageSet{package{
2-
Package geometry_msgs{ spec {
1+
PackageSet{
2+
Package geometry_msgs{ Specs {
33
TopicSpec Accel{ message { Vector3 linear Vector3 angular }},
44
TopicSpec AccelStamped{ message { Header header Accel accel }},
55
TopicSpec AccelWithCovariance{ message { Accel accel float64[] covariance }},
@@ -30,19 +30,19 @@ PackageSet{package{
3030
TopicSpec Wrench{ message { Vector3 force Vector3 torque }},
3131
TopicSpec WrenchStamped{ message { Header header Wrench wrench }}
3232
}},
33-
Package actionlib_msgs{ spec {
33+
Package actionlib_msgs{ Specs {
3434
TopicSpec GoalID{ message { time stamp string id }},
3535
TopicSpec GoalStatus{ message { GoalID goal_id uint8 status uint8 PENDING=0 uint8 ACTIVE=1 uint8 PREEMPTED=2 uint8 SUCCEEDED=3 uint8 ABORTED=4 uint8 REJECTED=5 uint8 PREEMPTING=6 uint8 RECALLING=7 uint8 RECALLED=8 uint8 LOST=9 string text }},
3636
TopicSpec GoalStatusArray{ message { Header header GoalStatus[] status_list }}
3737
}},
38-
Package diagnostic_msgs{ spec {
38+
Package diagnostic_msgs{ Specs {
3939
TopicSpec DiagnosticArray{ message { Header header DiagnosticStatus[] status }},
4040
TopicSpec DiagnosticStatus{ message { byte OK=0 byte WARN=1 byte ERROR=2 byte STALE=3 byte level string name string message string hardware_id KeyValue[] values }},
4141
TopicSpec KeyValue{ message { string key string value }},
4242
ServiceSpec AddDiagnostics{ request { string load_namespace } response { bool success string message } },
4343
ServiceSpec SelfTest{ request { } response { string id byte passed DiagnosticStatus[] status } }
4444
}},
45-
Package nav_msgs{ spec {
45+
Package nav_msgs{ Specs {
4646
TopicSpec GetMapAction{ message { GetMapActionGoal action_goal GetMapActionResult action_result GetMapActionFeedback action_feedback }},
4747
TopicSpec GetMapActionFeedback{ message { Header header "actionlib_msgs.GoalStatus" status GetMapFeedback feedback }},
4848
TopicSpec GetMapActionGoal{ message { Header header "actionlib_msgs.GoalID" goal_id GetMapGoal goal }},
@@ -59,7 +59,7 @@ PackageSet{package{
5959
ServiceSpec GetPlan{ request { "geometry_msgs.PoseStamped" start "geometry_msgs.PoseStamped" goal float32 tolerance } response { "nav_msgs.Path" plan } },
6060
ServiceSpec SetMap{ request { "nav_msgs.OccupancyGrid" map "geometry_msgs.PoseWithCovarianceStamped" initial_pose } response { bool success } }
6161
}},
62-
Package sensor_msgs{ spec {
62+
Package sensor_msgs{ Specs {
6363
TopicSpec BatteryState{ message { uint8 POWER_SUPPLY_STATUS_UNKNOWN=0 uint8 POWER_SUPPLY_STATUS_CHARGING=1 uint8 POWER_SUPPLY_STATUS_DISCHARGING=2 uint8 POWER_SUPPLY_STATUS_NOT_CHARGING=3 uint8 POWER_SUPPLY_STATUS_FULL=4 uint8 POWER_SUPPLY_HEALTH_UNKNOWN=0 uint8 POWER_SUPPLY_HEALTH_GOOD=1 uint8 POWER_SUPPLY_HEALTH_OVERHEAT=2 uint8 POWER_SUPPLY_HEALTH_DEAD=3 uint8 POWER_SUPPLY_HEALTH_OVERVOLTAGE=4 uint8 POWER_SUPPLY_HEALTH_UNSPEC_FAILURE=5 uint8 POWER_SUPPLY_HEALTH_COLD=6 uint8 POWER_SUPPLY_HEALTH_WATCHDOG_TIMER_EXPIRE=7 uint8 POWER_SUPPLY_HEALTH_SAFETY_TIMER_EXPIRE=8 uint8 POWER_SUPPLY_TECHNOLOGY_UNKNOWN=0 uint8 POWER_SUPPLY_TECHNOLOGY_NIMH=1 uint8 POWER_SUPPLY_TECHNOLOGY_LION=2 uint8 POWER_SUPPLY_TECHNOLOGY_LIPO=3 uint8 POWER_SUPPLY_TECHNOLOGY_LIFE=4 uint8 POWER_SUPPLY_TECHNOLOGY_NICD=5 uint8 POWER_SUPPLY_TECHNOLOGY_LIMN=6 Header header float32 voltage float32 current float32 charge float32 capacity float32 design_capacity float32 percentage uint8 power_supply_status uint8 power_supply_health uint8 power_supply_technology bool present float32[] cell_voltage string location string serial_number }},
6464
TopicSpec CameraInfo{ message { Header header uint32 height uint32 width string distortion_model float64[] D float64[] K float64[] R float64[] P uint32 binning_x uint32 binning_y RegionOfInterest roi }},
6565
TopicSpec ChannelFloat32{ message { string name float32[] values }},
@@ -89,22 +89,22 @@ PackageSet{package{
8989
TopicSpec TimeReference{ message { Header header time time_ref string source }},
9090
ServiceSpec SetCameraInfo{ request { "sensor_msgs.CameraInfo" camera_info } response { bool success string status_message } }
9191
}},
92-
Package shape_msgs{ spec {
92+
Package shape_msgs{ Specs {
9393
TopicSpec Mesh{ message { MeshTriangle[] triangles "geometry_msgs.Point"[] vertices }},
9494
TopicSpec MeshTriangle{ message { uint32[] vertex_indices }},
9595
TopicSpec Plane{ message { float64[] coef }},
9696
TopicSpec SolidPrimitive{ message { uint8 BOX=1 uint8 SPHERE=2 uint8 CYLINDER=3 uint8 CONE=4 uint8 type float64[] dimensions uint8 BOX_X=0 uint8 BOX_Y=1 uint8 BOX_Z=2 uint8 SPHERE_RADIUS=0 uint8 CYLINDER_HEIGHT=0 uint8 CYLINDER_RADIUS=1 uint8 CONE_HEIGHT=0 uint8 CONE_RADIUS=1 }}
9797
}},
98-
Package stereo_msgs{ spec {
98+
Package stereo_msgs{ Specs {
9999
TopicSpec DisparityImage{ message { Header header "sensor_msgs.Image" image float32 f float32 T "sensor_msgs.RegionOfInterest" valid_window float32 min_disparity float32 max_disparity float32 delta_d }}
100100
}},
101-
Package trajectory_msgs{ spec {
101+
Package trajectory_msgs{ Specs {
102102
TopicSpec JointTrajectory{ message { Header header string[] joint_names JointTrajectoryPoint[] points }},
103103
TopicSpec JointTrajectoryPoint{ message { float64[] positions float64[] velocities float64[] accelerations float64[] effort duration time_from_start }},
104104
TopicSpec MultiDOFJointTrajectory{ message { Header header string[] joint_names MultiDOFJointTrajectoryPoint[] points }},
105105
TopicSpec MultiDOFJointTrajectoryPoint{ message { "geometry_msgs.Transform"[] transforms "geometry_msgs.Twist"[] velocities "geometry_msgs.Twist"[] accelerations duration time_from_start }}
106106
}},
107-
Package visualization_msgs{ spec {
107+
Package visualization_msgs{ Specs {
108108
TopicSpec ImageMarker{ message { uint8 CIRCLE=0 uint8 LINE_STRIP=1 uint8 LINE_LIST=2 uint8 POLYGON=3 uint8 POINTS=4 uint8 ADD=0 uint8 REMOVE=1 Header header string ns int32 id int32 type int32 action "geometry_msgs.Point" position float32 scale "std_msgs.ColorRGBA" outline_color uint8 filled "std_msgs.ColorRGBA" fill_color duration lifetime "geometry_msgs.Point"[] points "std_msgs.ColorRGBA"[] outline_colors }},
109109
TopicSpec InteractiveMarker{ message { Header header "geometry_msgs.Pose" pose string name string description float32 scale MenuEntry[] menu_entries InteractiveMarkerControl[] controls }},
110110
TopicSpec InteractiveMarkerControl{ message { string name "geometry_msgs.Quaternion" orientation uint8 INHERIT=0 uint8 FIXED=1 uint8 VIEW_FACING=2 uint8 orientation_mode uint8 NONE=0 uint8 MENU=1 uint8 BUTTON=2 uint8 MOVE_AXIS=3 uint8 MOVE_PLANE=4 uint8 ROTATE_AXIS=5 uint8 MOVE_ROTATE=6 uint8 MOVE_3D=7 uint8 ROTATE_3D=8 uint8 MOVE_ROTATE_3D=9 uint8 interaction_mode bool always_visible Marker[] markers bool independent_marker_orientation string description }},
@@ -116,5 +116,4 @@ PackageSet{package{
116116
TopicSpec MarkerArray{ message { Marker[] markers }},
117117
TopicSpec MenuEntry{ message { uint32 id uint32 parent_id string title string command uint8 FEEDBACK=0 uint8 ROSRUN=1 uint8 ROSLAUNCH=2 uint8 command_type }}
118118
}}
119-
}
120119
}

‎de.fraunhofer.ipa.ros.communication.objects/basic_msgs/control_msgs.ros‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
PackageSet{package{
2-
Package control_msgs{ spec {
1+
PackageSet{
2+
Package control_msgs{ Specs {
33
TopicSpec FollowJointTrajectoryAction{ message { FollowJointTrajectoryActionGoal action_goal FollowJointTrajectoryActionResult action_result FollowJointTrajectoryActionFeedback action_feedback }},
44
TopicSpec FollowJointTrajectoryActionFeedback{ message { Header header "actionlib_msgs.GoalStatus" status FollowJointTrajectoryFeedback feedback }},
55
TopicSpec FollowJointTrajectoryActionGoal{ message { Header header "actionlib_msgs.GoalID" goal_id FollowJointTrajectoryGoal goal }},
@@ -45,5 +45,4 @@ PackageSet{package{
4545
ServiceSpec QueryTrajectoryState{ request { time time } response { string[] name float64[] position float64[] velocity float64[] acceleration } },
4646
ActionSpec FollowJointTrajectory{ goal { FollowJointTrajectoryActionGoal action_goal} result {FollowJointTrajectoryActionResult action_result} feedback {FollowJointTrajectoryActionFeedback action_feedback}}
4747
}}
48-
}
4948
}

‎de.fraunhofer.ipa.ros.communication.objects/basic_msgs/controller_manager_msgs.ros‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
PackageSet{package{
2-
Package controller_manager_msgs{spec{
1+
PackageSet{
2+
Package controller_manager_msgs{ Specs {
33
TopicSpec ControllerState{},
44
TopicSpec ControllerStatistics{},
55
TopicSpec ControllersStatistics{},
@@ -11,5 +11,4 @@ PackageSet{package{
1111
ServiceSpec SwitchController{},
1212
ServiceSpec UnloadController{}
1313
}}
14-
}
1514
}

‎de.fraunhofer.ipa.ros.communication.objects/basic_msgs/dynamic_reconfigure.ros‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
PackageSet{package{
2-
Package dynamic_reconfigure{spec{
1+
PackageSet{
2+
Package dynamic_reconfigure{ Specs {
33
TopicSpec BoolParameter{},
44
TopicSpec Config{},
55
TopicSpec ConfigDescription{},
@@ -12,5 +12,4 @@ PackageSet{package{
1212
TopicSpec StrParameter{},
1313
ServiceSpec Reconfigure{}
1414
}}
15-
}
1615
}

‎de.fraunhofer.ipa.ros.communication.objects/basic_msgs/generate_messages_model_helper.sh‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ function parserToRosModel(){
2020
echo $msg_desc
2121
}
2222

23-
echo 'PackageSet{package{'
23+
echo 'PackageSet{'
2424
arr_pkg=($package_list)
2525
cout_pkg=${#arr_pkg[@]}
2626

@@ -34,7 +34,7 @@ do
3434
arr_srv=($services_fullname)
3535
cout_srv=${#arr_srv[@]}
3636

37-
echo ' Package '$p'{ spec { '
37+
echo ' Package '$p'{ Specs { '
3838

3939
for i in $messages_fullname
4040
do
@@ -96,5 +96,4 @@ do
9696
done
9797

9898
echo $'\n }'
99-
echo '}'
10099

‎de.fraunhofer.ipa.ros.communication.objects/basic_msgs/map_msgs.ros‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
PackageSet{package{
2-
Package map_msgs{spec{
1+
PackageSet{
2+
Package map_msgs { Specs {
33
TopicSpec OccupancyGridUpdate{},
44
TopicSpec PointCloud2Update{},
55
TopicSpec ProjectedMap{},
@@ -15,5 +15,4 @@ PackageSet{package{
1515
ServiceSpec octoBoundingBoxQuery{},
1616
ServiceSpec octoGetOctomap{}
1717
}}
18-
}
1918
}

‎de.fraunhofer.ipa.ros.communication.objects/basic_msgs/move_base_msgs.ros‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
PackageSet{package{
2-
Package move_base_msgs{spec{
1+
PackageSet{
2+
Package move_base_msgs { Specs {
33
TopicSpec MoveBaseAction{},
44
TopicSpec MoveBaseActionFeedback{},
55
TopicSpec MoveBaseActionGoal{},
@@ -9,5 +9,4 @@ PackageSet{package{
99
TopicSpec MoveBaseResult{},
1010
ActionSpec MoveBase{}
1111
}}
12-
}
1312
}

0 commit comments

Comments
 (0)