Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rover 2018 Model #369

Merged
merged 30 commits into from
Feb 23, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
68fa9eb
Created the Initial Rover With Some Broken Physics
garethellis0 Feb 1, 2019
3d996e8
Updated Gazebo Resource Paths In Setup Scripts'
garethellis0 Feb 1, 2019
eb14981
Moved Files Around To Make Gazebo Happy
garethellis0 Feb 1, 2019
9255b7a
Moved Rover To Models Folder
garethellis0 Feb 1, 2019
4a961f3
Fixed Inertia Matrices So The Robot No Longer Explodes
garethellis0 Feb 1, 2019
3d409a1
Moved Robots to robots FOlder
garethellis0 Feb 2, 2019
44d1b0b
Changed Robot Paths In .xacro Files
garethellis0 Feb 2, 2019
ffde4f5
Revamped Gazebo Launch File System
garethellis0 Feb 2, 2019
15a57b5
Removed unused launch file
garethellis0 Feb 2, 2019
5232500
Added some more dependecies to sb_gazebo package.xml
garethellis0 Feb 2, 2019
eae9015
Added basic controllers for rover_2018
garethellis0 Feb 2, 2019
024365f
Updating Rover Model To Be Xacro compatible
garethellis0 Feb 2, 2019
ec98c2e
Added launch file for basic rover course'
garethellis0 Feb 2, 2019
c9a8994
Refactored Launch Files So load_robot.launch is more standalone
garethellis0 Feb 2, 2019
e89fbdd
Moved world_path construction to load_world.launch
garethellis0 Feb 2, 2019
9b44c57
Very basic rover model
garethellis0 Feb 2, 2019
1c97559
Revised Rover Model To Use Relative Positions
garethellis0 Feb 2, 2019
1accbde
Added Tower And Camera To Rover 2018 Model
garethellis0 Feb 9, 2019
8784dc2
Switched x and y in rover_2018 model
garethellis0 Feb 9, 2019
1849dd6
Added Stereo Camera To rover_2018
garethellis0 Feb 9, 2019
7bf1f4e
Removed Unused Sections of rover_2018_control.yaml
garethellis0 Feb 9, 2019
eb7bc37
Addressed PR comments (mostly documentation)
garethellis0 Feb 13, 2019
9f20606
Merge branch 'master' into gareth/rover-2018-model
garethellis0 Feb 13, 2019
bf0a657
Updated travis script to properly fail on non-zero exit codes
garethellis0 Feb 23, 2019
9e0193e
Merge branch 'gareth/rover-2018-model' of github.com:garethellis0/Sno…
garethellis0 Feb 23, 2019
9dfe71e
Merge branch 'master' into gareth/rover-2018-model
garethellis0 Feb 23, 2019
2681774
Fixed sb_gazebo package.xml
garethellis0 Feb 23, 2019
73df4de
Merge branch 'gareth/rover-2018-model' of github.com:garethellis0/Sno…
garethellis0 Feb 23, 2019
e54a7df
Merge branch 'master' into gareth/rover-2018-model
garethellis0 Feb 23, 2019
ca7e146
Merge branch 'master' into gareth/rover-2018-model
RobynCastro Feb 23, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion setup_scripts/install_tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ declare -a new_shell_config_lines=(
# plugins, and resources. Make sure to preserve the path that already exists as well
"export GAZEBO_MODEL_PATH=$DIR/../src/sb_gazebo/models:${GAZEBO_MODEL_PATH}"\
"export GAZEBO_PLUGIN_PATH=$DIR/../src/sb_gazebo/lib:${GAZEBO_PLUGIN_PATH}"\
"export GAZEBO_RESOURCE_PATH=$DIR/../src/sb_gazebo/models:${GAZEBO_RESOURCE_PATH}"\
"export GAZEBO_RESOURCE_PATH=$DIR/../src/sb_gazebo/models:/usr/share/gazebo:/usr/share/gazebo-9:${GAZEBO_RESOURCE_PATH}"\
# Aliases to make development easier
"alias clion=\"clion & disown && exit\""\
"alias rviz=\"rviz & disown && exit\""\
Expand Down
5 changes: 5 additions & 0 deletions src/sb_gazebo/config/rover_2018_control.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
robot:
# Publish all joint states
joint_state_controller:
type: joint_state_controller/JointStateController
publish_rate: 50
5 changes: 0 additions & 5 deletions src/sb_gazebo/launch/elsax_control.launch
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,6 @@
right_centre_wheel_controller"
/>


<include file="$(find sb_gazebo)/launch/general_robot_control.launch">
<arg name="robot" value="elsax"/>
</include>

<!-- This is for jfrost's depthcamera/kinect/zed plugin -->
<node name="zed_transform" pkg="sb_pointcloud_processing" type="pcl_transform" output="screen">
<rosparam param="output_frame"> "zed_pointcloud" </rosparam>
Expand Down
18 changes: 0 additions & 18 deletions src/sb_gazebo/launch/general_robot_control.launch

This file was deleted.

6 changes: 3 additions & 3 deletions src/sb_gazebo/launch/igvc_qualification.launch
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
<!-- Runs a rough approximation of the IGVC Basic Course in Gazebo -->

<!-- Start the world -->
<include file="$(find sb_gazebo)/launch/open_world.launch">
<arg name="world" value="igvc_qualification.world"/>
<include file="$(find sb_gazebo)/launch/load_world_and_robot.launch">
<arg name="world_name" value="igvc_qualification.world"/>
<arg name="x_start_coordinate" value="0"/>
<arg name="y_start_coordinate" value="-12"/>
<arg name="initial_rotation" value="1.5707"/>
<arg name="robot" value="elsax"/>
<arg name="robot_name" value="elsax"/>
</include>

</launch>
41 changes: 41 additions & 0 deletions src/sb_gazebo/launch/load_robot.launch
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<!--
This file launches a robot and it's associated controller
-->
<launch>
<!--
The name of the robot to load, this will be used to construct filepaths
for the files defining the robot
-->
<arg name="robot_name"/>

<!--
The initial position and rotation to spawn the robot at
-->
<arg name="x_start_coordinate" default="0"/>
<arg name="y_start_coordinate" default="0"/>
<arg name="initial_rotation" default="0"/>

<!-- Setup controllers for robot -->
<include file="$(find sb_gazebo)/launch/$(arg robot_name)_control.launch"/>

<!--
- Convert the xacro representation of the robot to xml
- Load the xml representation of the robot to the paramater server
-->
<param name="robot_description"
command="
$(find xacro)/xacro --inorder
'$(find sb_gazebo)/robots/$(arg robot_name).xacro'
"/>

<!-- Push robot_description to factory and spawn robot in gazebo -->
<node name="robot_spawn" pkg="gazebo_ros" type="spawn_model" output="screen"
args="
-urdf -param robot_description
-model $(arg robot_name)
-x $(arg x_start_coordinate)
-y $(arg y_start_coordinate)
-Y $(arg initial_rotation)
"/>

</launch>
15 changes: 15 additions & 0 deletions src/sb_gazebo/launch/load_world.launch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<launch>

<!-- Path to the folder containing the world that we want to launch -->
<arg name="world_name"/>

<!-- Start up the world -->
<include file="$(find sb_gazebo)/launch/gazebo_open_world.launch">
<arg name="world_name" value="$(find sb_gazebo)/worlds/$(arg world_name)"/>
<arg name="gui" value="true"/>
<!-- Remap the tf topic to another topic, so that we can test out things
that create tf's, like robot_pose_ekf -->
<arg name="tf_topic" value="gazebo_tf"/>
</include>

</launch>
28 changes: 28 additions & 0 deletions src/sb_gazebo/launch/load_world_and_robot.launch
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<launch>

<!--
Opens a give world from "sb_gazebo/worlds" and
places a robot with a given name with ".xacro" and ".gazebo" files
in "sb_gazebo/robots" in it at a given x,y and with a given rotation
-->

<arg name="world_name"/>
<arg name="x_start_coordinate"/>
<arg name="y_start_coordinate"/>
<arg name="initial_rotation"/>
<arg name="robot_name"/>

<!-- Start up the world -->
<include file="$(find sb_gazebo)/launch/load_world.launch">
<arg name="world_name" value="$(arg world_name)"/>
</include>

<!-- Load the robot -->
<include file="$(find sb_gazebo)/launch/load_robot.launch">
<arg name="x_start_coordinate" value="$(arg x_start_coordinate)"/>
<arg name="y_start_coordinate" value="$(arg y_start_coordinate)"/>
<arg name="initial_rotation" value="$(arg initial_rotation)"/>
<arg name="robot_name" value="$(arg robot_name)"/>
</include>

</launch>
38 changes: 0 additions & 38 deletions src/sb_gazebo/launch/open_world.launch

This file was deleted.

21 changes: 21 additions & 0 deletions src/sb_gazebo/launch/rover_2018.launch
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<launch>

<!-- Load joint controller configurations from YAML file to parameter server -->
<rosparam file="$(find sb_gazebo)/config/rover_2018_control.yaml" command="load"/>

<!-- load the controllers -->
<node name="controller_spawner"
pkg="controller_manager"
type="spawner" respawn="false"
output="screen" ns="/robot"
args="joint_state_controller
left_centre_wheel_controller
right_centre_wheel_controller"
/>


<include file="$(find sb_gazebo)/launch/general_robot_control.launch">
<arg name="robot" value="rover_2018"/>
</include>

</launch>
16 changes: 16 additions & 0 deletions src/sb_gazebo/launch/rover_2018_control.launch
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<launch>

<!-- Load joint controller configurations from YAML file to parameter server -->
<rosparam file="$(find sb_gazebo)/config/rover_2018_control.yaml" command="load"/>

<!-- load the controllers -->
<node name="controller_spawner"
pkg="controller_manager"
type="spawner" respawn="false"
output="screen" ns="/"
args="
joint_state_controller
"
/>

</launch>
14 changes: 14 additions & 0 deletions src/sb_gazebo/launch/rover_2018_test_course.launch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<launch>

<!-- Runs a rough approximation of the IGVC Basic Course in Gazebo -->

<!-- Start the world -->
<include file="$(find sb_gazebo)/launch/load_world_and_robot.launch">
<arg name="world_name" value="empty.world"/>
<arg name="x_start_coordinate" value="0"/>
<arg name="y_start_coordinate" value="0"/>
<arg name="initial_rotation" value="0"/>
<arg name="robot_name" value="rover_2018"/>
</include>

</launch>
11 changes: 11 additions & 0 deletions src/sb_gazebo/models/rover_2018/model.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" ?>
<model>
<name>rover_2018</name>
<version>1.0</version>
<sdf version="1.6">model.sdf</sdf>
<author>
<name></name>
<email></email>
</author>
<description></description>
</model>
Loading