Skip to content

Commit

Permalink
Merge pull request #171 from Kinovarobotics/opened-pull-requests
Browse files Browse the repository at this point in the history
add modifications from PRs in melodic-devel
  • Loading branch information
felixmaisonneuve authored Jul 16, 2021
2 parents 72fc06e + 804665e commit ee05de8
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 1 deletion.
7 changes: 7 additions & 0 deletions kortex_driver/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,13 @@
<build_depend>message_generation</build_depend>
<exec_depend>message_runtime</exec_depend>
<exec_depend>message_generation</exec_depend>
<exec_depend>gen3_move_it_config</exec_depend>
<exec_depend>gen3_robotiq_2f_85_move_it_config</exec_depend>
<exec_depend>gen3_robotiq_2f_140_move_it_config</exec_depend>
<exec_depend>gen3_lite_gen3_lite_2f_move_it_config</exec_depend>
<exec_depend>robot_state_publisher</exec_depend>
<exec_depend>joint_state_publisher</exec_depend>
<exec_depend>rostest</exec_depend>


<!-- The export tag contains other, unspecified, tags -->
Expand Down
2 changes: 1 addition & 1 deletion kortex_gazebo/launch/spawn_kortex_robot.launch
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<arg name="use_sim_time" default="true"/>
<arg name="debug" default="false" />
<arg name="paused" default="true"/>

<!-- Start Gazebo -->
<include file="$(find kortex_gazebo)/launch/start_gazebo.launch" if="$(arg start_gazebo)">
<arg name="gui" value="$(arg gazebo_gui)"/>
Expand Down
1 change: 1 addition & 0 deletions kortex_gazebo/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<license>BSD</license>
<buildtool_depend>catkin</buildtool_depend>
<build_depend>roslaunch</build_depend>
<run_depend>kortex_control</run_depend>
<run_depend>kortex_driver</run_depend>
<run_depend>robot_state_publisher</run_depend>
<run_depend>rviz</run_depend>
Expand Down

0 comments on commit ee05de8

Please sign in to comment.