Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -117,4 +117,4 @@ ENV USER_WS=${USER_WS}
WORKDIR $USER_WS

# Set up the user's .bashrc file and shell.
CMD ["/usr/bin/bash"]
CMD ["/usr/bin/bash"]
2 changes: 1 addition & 1 deletion docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ services:
dev:
volumes:
# Allow access to host hardware e.g. RealSense cameras
- /dev:/dev
- /dev:/dev
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,4 @@ def generate_launch_description():
protective_stop_manager_node,
]

return LaunchDescription(nodes_to_launch)
return LaunchDescription(nodes_to_launch)
2 changes: 1 addition & 1 deletion src/example_robot_hw/launch/agent_bridge.launch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
<include
file="$(find-pkg-share example_robot_hw)/launch/camera_driver.launch.py"
/>
</launch>
</launch>
2 changes: 1 addition & 1 deletion src/example_robot_hw/launch/camera_driver.launch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
<arg name="scene_camera_serial_no" value="'11111111'" />
<arg name="wrist_mounted_camera_serial_no" value="'11111111'" />
</include>
</launch>
</launch>
2 changes: 1 addition & 1 deletion src/example_robot_hw/launch/rs_cameras.launch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,4 @@
value="/wrist_mounted_camera/depth_registered/image_rect"
/>
</include>
</launch>
</launch>
6 changes: 2 additions & 4 deletions src/example_robot_hw/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@
<version>0.0.1</version>
<description>My robot configuration package</description>

<maintainer email="support@picknik.ai">
MoveIt Pro User
</maintainer>
<license>Apache-2.0</license>
<maintainer email="support@picknik.ai">MoveIt Pro User</maintainer>
<license>BSD-3-Clause</license>

<buildtool_depend>ament_cmake</buildtool_depend>
<depend>example_robot_sim</depend>
Expand Down
2 changes: 1 addition & 1 deletion src/example_robot_mock/config/moveit/joint_jog.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Planning groups to use in JointJog, and their corresponding JVC controllers.
# The number of elements in `planning_groups` and `controllers` must match.
planning_groups: ['manipulator']
controllers: ['joint_velocity_controller']
controllers: ['joint_velocity_controller']
6 changes: 3 additions & 3 deletions src/example_robot_mock/config/moveit/joint_limits.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# joint_limits.yaml allows overriding per-joint URDF values used for motion planning and speicyfing additional dynamic limits.
# - Positions limits can be overriden `has_position_limits`, `min_position` and `max_position`.
# - Velocity limits can be overriden with `has_velocity_limits` and `max_velocity`.
# joint_limits.yaml allows overriding per-joint URDF values used for motion planning and specifying additional dynamic limits.
# - Positions limits can be overridden `has_position_limits`, `min_position` and `max_position`.
# - Velocity limits can be overridden with `has_velocity_limits` and `max_velocity`.
# - Acceleration limits can be set with `has_acceleration_limits` and `max_acceleration`.
# - Jerk limits can be set with `has_jerk_limits` and `max_jerk`.
joint_limits:
Expand Down
2 changes: 1 addition & 1 deletion src/example_robot_mock/objectives/close_gripper.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@
</MetadataFields>
</SubTree>
</TreeNodesModel>
</root>
</root>
2 changes: 1 addition & 1 deletion src/example_robot_mock/objectives/open_gripper.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@
</MetadataFields>
</SubTree>
</TreeNodesModel>
</root>
</root>
2 changes: 1 addition & 1 deletion src/example_robot_mock/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<description>Example of a mock robot</description>

<maintainer email="support@picknik.ai">MoveIt Pro User</maintainer>
<license>Apache-2.0</license>
<license>BSD-3-Clause</license>

<buildtool_depend>ament_cmake</buildtool_depend>
<export>
Expand Down
2 changes: 1 addition & 1 deletion src/example_robot_sim/config/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ ros2_control:
- "joint_state_broadcaster"
- "force_torque_sensor_broadcaster"
- "joint_trajectory_admittance_controller"
- "robotiq_gripper_controller"
- "robotiq_gripper_controller"
Loading
Loading