Skip to content

Commit

Permalink
Revert "add gazebo_ros_diff_drive" now that ros-simulation/gazebo_ros…
Browse files Browse the repository at this point in the history
…_pkgs#298 is merged.

This reverts commit 40ecea6.
  • Loading branch information
Isaac IY Saito committed Apr 9, 2015
1 parent 373df58 commit c0cd09a
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 610 deletions.
2 changes: 1 addition & 1 deletion tetris_description/urdf/tetris.gazebo.xacro
Expand Up @@ -9,7 +9,7 @@
</gazebo>

<gazebo>
<plugin name="differential_drive_controller" filename="libgazebo_ros_diff_drive_fixed.so">
<plugin name="differential_drive_controller" filename="libgazebo_ros_diff_drive.so">
<alwaysOn>true</alwaysOn>
<updateRate>100</updateRate>
<leftJoint>right_wheel_joint</leftJoint> <!-- intentionally reverted -->
Expand Down
27 changes: 1 addition & 26 deletions tetris_gazebo/CMakeLists.txt
@@ -1,35 +1,10 @@
cmake_minimum_required(VERSION 2.8.3)
project(tetris_gazebo)

find_package(catkin REQUIRED COMPONENTS gazebo_plugins)

# Depend on system install of Gazebo and SDFormat
find_package(gazebo REQUIRED)
find_package(Boost REQUIRED COMPONENTS thread)

include_directories(
${Boost_INCLUDE_DIRS}
${catkin_INCLUDE_DIRS}
${GAZEBO_INCLUDE_DIRS}
)

link_directories(
${catkin_LIBRARY_DIRS}
${GAZEBO_LIBRARY_DIRS}
)

find_package(catkin REQUIRED COMPONENTS)

catkin_package()

add_library(gazebo_ros_diff_drive_fixed src/gazebo_ros_diff_drive.cpp)
target_link_libraries(gazebo_ros_diff_drive_fixed gazebo_ros_utils ${GAZEBO_LIBRARIES} ${catkin_LIBRARIES} ${Boost_LIBRARIES})

install(TARGETS
gazebo_ros_diff_drive_fixed
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
)

install(DIRECTORY launch worlds models
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
USE_SOURCE_PERMISSIONS)

0 comments on commit c0cd09a

Please sign in to comment.