Skip to content

Commit

Permalink
Initial Ridgeback commit.
Browse files Browse the repository at this point in the history
  • Loading branch information
tonybaltovski committed Jun 10, 2015
1 parent 8cbc769 commit 640eb58
Show file tree
Hide file tree
Showing 18 changed files with 659 additions and 1,384 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Changelog for package jackal_gazebo
Changelog for package ridgeback_gazebo
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

0.3.0 (2015-01-20)
Expand All @@ -10,7 +10,7 @@ Changelog for package jackal_gazebo

0.2.3 (2014-12-12)
------------------
* Added jackal_race world.
* Added ridgeback_race world.
* Add hector_gazebo_plugins dependency.
* Contributors: Mike Purvis, spourmehr

Expand All @@ -27,7 +27,7 @@ Changelog for package jackal_gazebo

0.2.0 (2014-09-09)
------------------
* Default world for Jackal sim is now a green one.
* Default world for Ridgeback sim is now a green one.
* Add missing dependencies on Gazebo plugin packages.
* Contributors: Mike Purvis

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
cmake_minimum_required(VERSION 2.8.3)
project(jackal_gazebo)
project(ridgeback_gazebo)

find_package(catkin REQUIRED COMPONENTS roslaunch)

catkin_package()

roslaunch_add_file_check(launch/jackal_world.launch)
roslaunch_add_file_check(launch/ridgeback_world.launch)

install(DIRECTORY launch Media worlds
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<arg name="use_sim_time" default="true" />
<arg name="gui" default="true" />
<arg name="headless" default="false" />
<arg name="world_name" default="$(find jackal_gazebo)/worlds/jackal_race.world" />
<arg name="world_name" default="$(find ridgeback_gazebo)/worlds/ridgeback_race.world" />

<!-- Short-term hack to support the original front_laser:=true argument for spawning
the simulator. This will be removed in favour of using the config:=x arg instead. -->
Expand All @@ -11,8 +11,8 @@
<arg name="default_config" value="base" unless="$(arg front_laser)" />
<!-- end of hack -->

<!-- Configuration of Jackal which you would like to simulate.
See jackal_description for details. -->
<!-- Configuration of Ridgeback which you would like to simulate.
See ridgeback_description for details. -->
<arg name="config" default="$(arg default_config)" />

<!-- Launch Gazebo with the specified world -->
Expand All @@ -24,16 +24,16 @@
<arg name="world_name" value="$(arg world_name)" />
</include>

<!-- Load Jackal's description, controllers, and teleop nodes. -->
<include file="$(find jackal_description)/launch/description.launch">
<!-- Load Ridgeback's description, controllers, and teleop nodes. -->
<include file="$(find ridgeback_description)/launch/description.launch">
<arg name="config" value="$(arg config)" />
</include>
<include file="$(find jackal_control)/launch/control.launch" />
<include file="$(find jackal_control)/launch/teleop.launch">
<include file="$(find ridgeback_control)/launch/control.launch" />
<include file="$(find ridgeback_control)/launch/teleop.launch">
<arg name="joystick" value="false"/>
</include>

<!-- Spawn Jackal -->
<!-- Spawn Ridgeback -->
<node name="urdf_spawner" pkg="gazebo_ros" type="spawn_model"
args="-urdf -model jackal -param robot_description -x 0 -y 0 -z 1.0" />
args="-urdf -model ridgeback -param robot_description -x 0 -y 0 -z 1.0" />
</launch>
10 changes: 5 additions & 5 deletions jackal_gazebo/package.xml → ridgeback_gazebo/package.xml
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<?xml version="1.0"?>
<package>
<name>jackal_gazebo</name>
<name>ridgeback_gazebo</name>
<version>0.3.0</version>
<description>Launchfiles to use Jackal in Gazebo.</description>
<description>Launchfiles to use Ridgeback in Gazebo.</description>

<maintainer email="[email protected]">Mike Purvis</maintainer>
<author>Mike Purvis</author>

<license>BSD</license>

<url type="website">http://wiki.ros.org/jackal_gazebo</url>
<url type="website">http://wiki.ros.org/ridgeback_gazebo</url>

<buildtool_depend>catkin</buildtool_depend>
<build_depend>roslaunch</build_depend>
<run_depend>gazebo_ros</run_depend>
<run_depend>gazebo_ros_control</run_depend>
<run_depend>gazebo_plugins</run_depend>
<run_depend>hector_gazebo_plugins</run_depend>
<run_depend version_gte="0.5">jackal_control</run_depend>
<run_depend version_gte="0.5">jackal_description</run_depend>
<run_depend version_gte="0.5">ridgeback_control</run_depend>
<run_depend version_gte="0.5">ridgeback_description</run_depend>

<export>
<gazebo_ros gazebo_media_path="${prefix}"/>
Expand Down
Loading

0 comments on commit 640eb58

Please sign in to comment.