Skip to content

Commit cd340b0

Browse files
committed
Added ignored manifest.xml files, added rule to .gitignore
1 parent 759ef6a commit cd340b0

File tree

8 files changed

+155
-0
lines changed

8 files changed

+155
-0
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,7 @@
1414
# OSX Files
1515
.DS_Store
1616

17+
# We had to disable manifest.xml in all packages because of a package naming conflict
18+
# See issue https://github.com/ros-controls/ros_control/issues/101#issuecomment-21781620
19+
# and issue http://answers.gazebosim.org/question/4134/installing-gazebo-19-on-ros-groovy/?answer=4138#post-id-4138
20+
manifest.xml
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<package>
2+
<description brief="effort_controllers">
3+
4+
effort_controllers
5+
6+
</description>
7+
<author>Vijay Pradeep</author>
8+
<license>BSD</license>
9+
<review status="unreviewed" notes=""/>
10+
<url>https://github.com/ros-controls/ros_controllers/wiki</url>
11+
12+
<depend package="controller_interface"/>
13+
<depend package="control_msgs"/>
14+
<depend package="control_toolbox" />
15+
<depend package="realtime_tools" />
16+
<depend package="urdf" />
17+
18+
<depend package="forward_command_controller"/>
19+
20+
<export>
21+
<controller_interface plugin="${prefix}/effort_controllers_plugins.xml" />
22+
</export>
23+
24+
</package>
25+
26+
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<package>
2+
<description>
3+
Controller to publish state of force-torque sensors
4+
</description>
5+
<author>Adolfo Rodriguez Tsouroukdissian</author>
6+
<license>Modified BSD</license>
7+
<review status="unreviewed" notes=""/>
8+
<url>https://github.com/ros-controls/ros_controllers/wiki</url>
9+
10+
<depend package="realtime_tools"/>
11+
<depend package="roscpp"/>
12+
<depend package="hardware_interface"/>
13+
<depend package="pluginlib"/>
14+
<depend package="controller_interface"/>
15+
<depend package="geometry_msgs"/>
16+
17+
<export>
18+
<controller_interface plugin="${prefix}/force_torque_sensor_plugin.xml" />
19+
</export>
20+
21+
</package>
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<package>
2+
<description brief="forward_command_controller">
3+
4+
forward_command_controller
5+
6+
</description>
7+
<author>Vijay Pradeep, Adolfo Rodriguez Tsouroukdissian</author>
8+
<license>BSD</license>
9+
<review status="unreviewed" notes=""/>
10+
<url>http://ros.org/wiki/forward_command_controller</url>
11+
12+
<depend package="controller_interface"/>
13+
<depend package="hardware_interface"/>
14+
<depend package="std_msgs"/>
15+
16+
<export>
17+
<cpp cflags="-I${prefix}/include" />
18+
</export>
19+
20+
</package>
21+
22+
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<package>
2+
<description>
3+
Controller to publish state of IMU sensors
4+
</description>
5+
<author>Adolfo Rodriguez Tsouroukdissian</author>
6+
<license>Modified BSD</license>
7+
<review status="unreviewed" notes=""/>
8+
<url>https://github.com/ros-controls/ros_controllers/wiki</url>
9+
10+
<depend package="realtime_tools"/>
11+
<depend package="roscpp"/>
12+
<depend package="hardware_interface"/>
13+
<depend package="pluginlib"/>
14+
<depend package="controller_interface"/>
15+
<depend package="sensor_msgs"/>
16+
17+
<export>
18+
<controller_interface plugin="${prefix}/imu_sensor_plugin.xml" />
19+
</export>
20+
21+
</package>
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<package>
2+
<description>
3+
Controller to publish joint state
4+
</description>
5+
<author>Wim Meeussen</author>
6+
<license>BSD</license>
7+
<review status="unreviewed" notes=""/>
8+
<url>https://github.com/ros-controls/ros_controllers/wiki</url>
9+
10+
<depend package="realtime_tools"/>
11+
<depend package="roscpp"/>
12+
<depend package="hardware_interface"/>
13+
<depend package="pluginlib"/>
14+
<depend package="controller_interface"/>
15+
<depend package="sensor_msgs"/>
16+
17+
<export>
18+
<controller_interface plugin="${prefix}/joint_state_plugin.xml" />
19+
</export>
20+
21+
</package>
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<package>
2+
<description brief="position_controllers">
3+
4+
position_controllers
5+
6+
</description>
7+
<author>Vijay Pradeep</author>
8+
<license>BSD</license>
9+
<review status="unreviewed" notes=""/>
10+
<url>https://github.com/ros-controls/ros_controllers/wiki</url>
11+
12+
<depend package="controller_interface"/>
13+
<depend package="forward_command_controller"/>
14+
15+
<export>
16+
<controller_interface plugin="${prefix}/position_controllers_plugins.xml" />
17+
</export>
18+
19+
</package>
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<package>
2+
<description brief="velocity_controllers">
3+
4+
velocity_controllers
5+
6+
</description>
7+
<author>Vijay Pradeep</author>
8+
<license>BSD</license>
9+
<review status="unreviewed" notes=""/>
10+
<url>https://github.com/ros-controls/ros_controllers/wiki</url>
11+
12+
<depend package="controller_interface"/>
13+
<depend package="forward_command_controller"/>
14+
15+
<export>
16+
<controller_interface plugin="${prefix}/velocity_controllers_plugins.xml" />
17+
</export>
18+
19+
</package>
20+
21+

0 commit comments

Comments
 (0)