Skip to content

Commit 3cb843a

Browse files
MikeWrockMikeWrock
authored
Sync V6.5 to main (#29)
* Syncing 6.5 to main
1 parent 6e9547c commit 3cb843a

32 files changed

+163
-51
lines changed

‎src/example_behaviors/COLCON_IGNORE‎

Whitespace-only changes.

‎src/fanuc_sim/CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ set(DEST_DIR "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/description/")
1414
install(DIRECTORY "${PICKNIK_ACCESSORIES_SHARE_DIR}"
1515
DESTINATION "${DEST_DIR}"
1616
FILES_MATCHING PATTERN "*")
17-
1817
install(
1918
DIRECTORY
2019
config

‎src/lab_sim/config/config.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ objectives:
4242
- "moveit_studio::behaviors::MTCCoreBehaviorsLoader"
4343
- "moveit_studio::behaviors::ServoBehaviorsLoader"
4444
- "moveit_studio::behaviors::VisionBehaviorsLoader"
45-
- "example_behaviors::ExampleBehaviorsLoader"
4645
# Specify source folder for objectives
4746
# [Required]
4847
objective_library_paths:

‎src/lab_sim/objectives/pick_and_place_example.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
task="{mtc_pick_task}"
2525
/>
2626
<Action ID="SetupMTCCurrentState" task="{mtc_pick_task}" />
27+
<!-- The following behavior can be found in the example_behaviors package. Remove the COLCON_IGNORE file and `moveit_pro build user_workspace` to use. -->
2728
<Action
2829
ID="SetupMtcPickFromPose"
2930
grasp_pose="{pick_pose}"
@@ -51,6 +52,7 @@
5152
orientation_xyzw="0;1;0;0"
5253
stamped_pose="{place_pose}"
5354
/>
55+
<!-- The following behavior can be found in the example_behaviors package. Remove the COLCON_IGNORE file and `moveit_pro build user_workspace` to use. -->
5456
<Action
5557
ID="SetupMtcPlaceFromPose"
5658
place_pose="{place_pose}"

‎src/lab_sim/objectives/plan_and_save_trajectory.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
/>
4040
<Action ID="PlanMTCTask" solution="{mtc_solution}" task="{mtc_task}" />
4141
<Action ID="WaitForUserTrajectoryApproval" />
42+
<!-- The following behavior can be found in the example_behaviors package. Remove the COLCON_IGNORE file and `moveit_pro build user_workspace` to use. -->
4243
<Action
4344
ID="ConvertMtcSolutionToJointTrajectory"
4445
joint_trajectory="{joint_trajectory_msg}"

‎src/moveit_pro_kinova_configs/kinova_gen3_base_config/description/kortex_robot.xacro‎

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
<?xml version="1.0"?>
2+
3+
<robot xmlns:xacro="http://ros.org/wiki/xacro">
4+
5+
<xacro:macro name="load_robot" params="
6+
parent
7+
*origin
8+
prefix
9+
arm
10+
gripper
11+
gripper_joint_name
12+
dof
13+
vision
14+
robot_ip
15+
username
16+
password
17+
port
18+
port_realtime
19+
session_inactivity_timeout_ms
20+
connection_inactivity_timeout_ms
21+
use_internal_bus_gripper_comm:=false
22+
use_fake_hardware:=false
23+
fake_sensor_commands:=false
24+
sim_gazebo:=false
25+
sim_ignition:=false
26+
sim_isaac:=false
27+
isaac_joint_commands:=/isaac_joint_commands
28+
isaac_joint_states:=/isaac_joint_states
29+
use_external_cable:=false
30+
initial_positions:=${dict(joint_1=0.0,joint_2=0.0,joint_3=0.0,joint_4=0.0,joint_5=0.0,joint_6=0.0,joint_7=0.0)}
31+
gripper_max_velocity:=100.0
32+
gripper_max_force:=100.0
33+
gripper_com_port:=/dev/ttyUSB0
34+
moveit_active:=false">
35+
36+
<!-- Include and load arm macro files -->
37+
<xacro:include filename="$(find kortex_description)/arms/${arm}/${dof}dof/urdf/${arm}_macro.xacro" />
38+
39+
<!-- Load the arm -->
40+
<xacro:load_arm
41+
parent="${parent}"
42+
dof="${dof}"
43+
vision="${vision}"
44+
robot_ip="${robot_ip}"
45+
username="${username}"
46+
password="${password}"
47+
port="${port}"
48+
port_realtime="${port_realtime}"
49+
session_inactivity_timeout_ms="${session_inactivity_timeout_ms}"
50+
connection_inactivity_timeout_ms="${connection_inactivity_timeout_ms}"
51+
prefix="${prefix}"
52+
use_internal_bus_gripper_comm="${use_internal_bus_gripper_comm}"
53+
use_fake_hardware="${use_fake_hardware}"
54+
fake_sensor_commands="${fake_sensor_commands}"
55+
sim_gazebo="${sim_gazebo}"
56+
sim_ignition="${sim_ignition}"
57+
sim_isaac="${sim_isaac}"
58+
gripper_joint_name="${gripper_joint_name}"
59+
gripper_max_velocity="${gripper_max_velocity}"
60+
gripper_max_force="${gripper_max_force}"
61+
use_external_cable="${use_external_cable}"
62+
initial_positions="${initial_positions}">
63+
<xacro:insert_block name="origin" />
64+
</xacro:load_arm>
65+
66+
<!-- If no gripper, define tool frame here -->
67+
<xacro:if value="${not gripper}">
68+
<link name="${prefix}tool_frame"/>
69+
<joint name="${prefix}tool_frame_joint" type="fixed">
70+
<origin xyz="0 0 0" rpy="0 0 0" />
71+
<parent link="${prefix}${last_arm_link}" />
72+
<child link="${prefix}tool_frame" />
73+
<axis xyz="0 0 0" />
74+
</joint>
75+
</xacro:if>
76+
77+
<!-- Include and load the gripper if defined -->
78+
<xacro:unless value="${not gripper}">
79+
<xacro:include filename="$(find kinova_gen3_base_config)/description/robotiq_2f_85_macro.xacro" />
80+
<!-- last_arm_link is defined in "$(find kortex_description)/arms/${arm}/urdf/${arm}_macro.xacro" -->
81+
<xacro:load_gripper
82+
parent="${prefix}${last_arm_link}"
83+
prefix="${prefix}"
84+
use_fake_hardware="${use_fake_hardware}"
85+
fake_sensor_commands="${fake_sensor_commands}"
86+
sim_ignition="${sim_ignition}"
87+
sim_isaac="${sim_isaac}"
88+
isaac_joint_commands="${isaac_joint_commands}"
89+
isaac_joint_states="${isaac_joint_states}"
90+
com_port="${gripper_com_port}"
91+
use_internal_bus_gripper_comm="${use_internal_bus_gripper_comm}"
92+
moveit_active="${moveit_active}"/>
93+
</xacro:unless>
94+
95+
</xacro:macro>
96+
97+
</robot>

‎src/moveit_pro_kinova_configs/kinova_gen3_base_config/description/picknik_kinova_gen3.xacro‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<xacro:arg name="wrist_realsense" default="true" />
2727

2828
<!-- Import macros for main hardware components -->
29-
<xacro:include filename="$(find kortex_description)/robots/kortex_robot.xacro" />
29+
<xacro:include filename="$(find kinova_gen3_base_config)/description/kortex_robot.xacro" />
3030
<xacro:include filename="$(find picknik_accessories)/descriptions/sensors/realsense_d415.urdf.xacro"/>
3131

3232
<!-- Import environment macros -->

‎src/moveit_pro_kinova_configs/kinova_gen3_base_config/description/robotiq_2f_85_macro.xacro‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?xml version="1.0"?>
2+
<robot name="robotiq_2f_85_model" xmlns:xacro="http://ros.org/wiki/xacro">
3+
<xacro:macro name="load_gripper" params="
4+
parent
5+
prefix
6+
use_fake_hardware:=false
7+
fake_sensor_commands:=false
8+
sim_ignition:=false
9+
sim_isaac:=false
10+
isaac_joint_commands:=/isaac_joint_commands
11+
isaac_joint_states:=/isaac_joint_states
12+
use_internal_bus_gripper_comm:=false
13+
com_port:=/dev/ttyUSB0
14+
moveit_active:=false">
15+
<xacro:include filename="$(find robotiq_description)/urdf/robotiq_2f_85_macro.urdf.xacro" />
16+
17+
<!-- Hardware talks directly to the gripper so we don't need ros2_control unless we are simulating -->
18+
<xacro:property name="include_ros2_control" value="false"/>
19+
<xacro:if value="${sim_ignition or sim_isaac or use_fake_hardware or not use_internal_bus_gripper_comm}">
20+
<xacro:property name="include_ros2_control" value="true"/>
21+
</xacro:if>
22+
23+
<xacro:robotiq_gripper
24+
name="RobotiqGripperHardwareInterface"
25+
prefix="${prefix}"
26+
parent="${parent}"
27+
include_ros2_control="${include_ros2_control}"
28+
com_port="${com_port}"
29+
use_fake_hardware="${use_fake_hardware}"
30+
mock_sensor_commands="${fake_sensor_commands}"
31+
sim_ignition="${sim_ignition}"
32+
sim_isaac="${sim_isaac}"
33+
isaac_joint_commands="${isaac_joint_commands}"
34+
isaac_joint_states="${isaac_joint_states}">
35+
<origin xyz="0 0 0" rpy="0 0 0" />
36+
</xacro:robotiq_gripper>
37+
</xacro:macro>
38+
</robot>

‎src/moveit_pro_mobile_manipulation/mobile_manipulation_config/objectives/00_solution_-_move_to_initial_pose.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<?xml version="1.0" encoding="UTF-8" ?>
21
<root
32
BTCPP_format="4"
43
main_tree_to_execute="00 Solution - Move to Initial Pose"
@@ -7,7 +6,7 @@
76
<BehaviorTree
87
ID="00 Solution - Move to Initial Pose"
98
_description="Move to a pre-defined waypoint"
10-
_favorite="true"
9+
_favorite="false"
1110
_hardcoded="false"
1211
>
1312
<Control ID="Sequence" name="TopLevelSequence">

‎src/moveit_pro_mobile_manipulation/mobile_manipulation_config/objectives/01_solution_-_create_a_pose.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
<?xml version="1.0" encoding="UTF-8" ?>
21
<root BTCPP_format="4" main_tree_to_execute="01 Solution - Create a Pose">
32
<!--//////////-->
43
<BehaviorTree
54
ID="01 Solution - Create a Pose"
65
_description="Creates a pose relative to a frame"
7-
_favorite="true"
6+
_favorite="false"
87
>
98
<Control ID="Sequence" name="TopLevelSequence">
109
<Action

0 commit comments

Comments
 (0)