diff --git a/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/description/mujoco/assets/tag36_11_00003.png b/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/description/mujoco/assets/tag36_11_00003.png index 994d7f42a..5fdf2ad30 100644 --- a/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/description/mujoco/assets/tag36_11_00003.png +++ b/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/description/mujoco/assets/tag36_11_00003.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6945a263eadff4ab15a426aad866c00dd9b8c756a10392d8b7e18c0dd0509443 -size 5480 +oid sha256:6c6ef757c14b3b961825df85f6cc196c1dea8bcc65ab4afbdb6d31b7855e20b7 +size 3259 diff --git a/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/description/mujoco/assets/tag36_11_00004.png b/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/description/mujoco/assets/tag36_11_00004.png new file mode 100644 index 000000000..a50d13f95 --- /dev/null +++ b/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/description/mujoco/assets/tag36_11_00004.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a066e8a73f4c801c88f36409c95a6974ca61ecc4a20a755a79d4ada6a2ded355 +size 3265 diff --git a/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/description/mujoco/assets/tag36_11_00005.png b/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/description/mujoco/assets/tag36_11_00005.png new file mode 100644 index 000000000..8bcff332e --- /dev/null +++ b/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/description/mujoco/assets/tag36_11_00005.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:04c87a3eaf6310fc28b6470b9c2eee46373ac07c8abacee1a1d6e972d0dc8371 +size 3265 diff --git a/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/description/mujoco/gen3_7dof_assets.xml b/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/description/mujoco/gen3_7dof_assets.xml index 5ce229ec8..c9c313906 100644 --- a/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/description/mujoco/gen3_7dof_assets.xml +++ b/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/description/mujoco/gen3_7dof_assets.xml @@ -204,10 +204,14 @@ + + + + diff --git a/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/description/mujoco/scene.xml b/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/description/mujoco/scene.xml index ad9574167..21e98ca67 100644 --- a/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/description/mujoco/scene.xml +++ b/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/description/mujoco/scene.xml @@ -182,6 +182,51 @@ + + + + + + + diff --git a/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/description/space_satellite_sim.xacro b/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/description/space_satellite_sim.xacro index c306f2668..561ae4a3b 100644 --- a/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/description/space_satellite_sim.xacro +++ b/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/description/space_satellite_sim.xacro @@ -559,45 +559,32 @@ - - - - - - - - - - + + + - - + + - - - - - - - - - + + - - + + - - - - - - - - - + + - - + + @@ -631,6 +618,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/objectives/calibrate_camera_-_detect_tags.xml b/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/objectives/calibrate_camera_-_detect_tags.xml index 2ebe3a0ec..fd08580a1 100644 --- a/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/objectives/calibrate_camera_-_detect_tags.xml +++ b/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/objectives/calibrate_camera_-_detect_tags.xml @@ -25,7 +25,9 @@ _collapsed="true" computed_poses_vector="{computed_poses_vector}" camera_optical_frame="{camera_optical_frame}" - waypoint_name="Camera Calibration 1" + tag_frame_prefix="{tag_frame_prefix}" + mounting_pose_parent_frame="{mounting_pose_parent_frame}" + waypoint_name="{waypoint_1_name}" camera_image_topic="{camera_image_topic}" camera_info_topic="{camera_info_topic}" /> @@ -34,7 +36,9 @@ _collapsed="true" computed_poses_vector="{computed_poses_vector}" camera_optical_frame="{camera_optical_frame}" - waypoint_name="Camera Calibration 2" + tag_frame_prefix="{tag_frame_prefix}" + mounting_pose_parent_frame="{mounting_pose_parent_frame}" + waypoint_name="{waypoint_2_name}" camera_image_topic="{camera_image_topic}" camera_info_topic="{camera_info_topic}" /> @@ -43,7 +47,9 @@ _collapsed="true" computed_poses_vector="{computed_poses_vector}" camera_optical_frame="{camera_optical_frame}" - waypoint_name="Camera Calibration 3" + tag_frame_prefix="{tag_frame_prefix}" + mounting_pose_parent_frame="{mounting_pose_parent_frame}" + waypoint_name="{waypoint_3_name}" camera_image_topic="{camera_image_topic}" camera_info_topic="{camera_info_topic}" /> @@ -52,7 +58,9 @@ _collapsed="true" computed_poses_vector="{computed_poses_vector}" camera_optical_frame="{camera_optical_frame}" - waypoint_name="Camera Calibration 4" + tag_frame_prefix="{tag_frame_prefix}" + mounting_pose_parent_frame="{mounting_pose_parent_frame}" + waypoint_name="{waypoint_4_name}" camera_image_topic="{camera_image_topic}" camera_info_topic="{camera_info_topic}" /> @@ -142,6 +150,11 @@ name="mounting_pose_save_file" default="calibrated_scene_camera_mounting_pose.txt" /> + + + + + diff --git a/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/objectives/calibrate_camera_at_waypoint_-_detect.xml b/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/objectives/calibrate_camera_at_waypoint_-_detect.xml index 423381e0d..2385e33a8 100644 --- a/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/objectives/calibrate_camera_at_waypoint_-_detect.xml +++ b/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/objectives/calibrate_camera_at_waypoint_-_detect.xml @@ -20,7 +20,7 @@ /> @@ -39,6 +39,7 @@ ID="Camera Pose from Cal Tool - Detect Tags" _collapsed="true" camera_optical_frame="{camera_optical_frame}" + tag_frame_prefix="{tag_frame_prefix}" computed_pose="{computed_pose}" camera_image_topic="{camera_image_topic}" camera_info_topic="{camera_info_topic}" @@ -68,10 +69,17 @@ marker_size="0.05" pose="{average_pose_stamped}" /> + @@ -88,6 +96,11 @@ name="camera_optical_frame" default="{camera_optical_frame}" /> + + + + + + + + + + + + + + + + diff --git a/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/objectives/camera_pose_from_cal_tool_-_detect_tags.xml b/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/objectives/camera_pose_from_cal_tool_-_detect_tags.xml index 56f8e7b7d..a8607df38 100644 --- a/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/objectives/camera_pose_from_cal_tool_-_detect_tags.xml +++ b/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/objectives/camera_pose_from_cal_tool_-_detect_tags.xml @@ -7,7 +7,7 @@ - - - - + diff --git a/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/waypoints/waypoints.yaml b/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/waypoints/waypoints.yaml index 8e11bb5b3..5981fe3b3 100644 --- a/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/waypoints/waypoints.yaml +++ b/src/moveit_pro_kinova_configs/space_satellite_sim_camera_cal/waypoints/waypoints.yaml @@ -306,3 +306,187 @@ twist: [] wrench: [] name: View Tag +- description: Wrist camera views the satellite tags (eye-in-hand cal) + favorite: false + joint_group_names: + - gripper + - manipulator + joint_state: + effort: [] + header: + frame_id: '' + stamp: + nanosec: 0 + sec: 0 + name: + - robotiq_85_left_knuckle_joint + - robotiq_85_left_finger_joint + - robotiq_85_right_finger_joint + - joint_1 + - joint_2 + - joint_3 + - joint_4 + - joint_5 + - joint_6 + - joint_7 + position: + - 0.0029407721601535414 + - 0.00014643648808031575 + - 0.0001464364880981395 + - -0.2415 + - 0.4937 + - -1.3862 + - -2.1321 + - -0.9097 + - -1.5143 + - -0.4093 + velocity: [] + multi_dof_joint_state: + header: + frame_id: '' + stamp: + nanosec: 0 + sec: 0 + joint_names: [] + transforms: [] + twist: [] + wrench: [] + name: Wrist Camera Calibration 1 +- description: Wrist camera views the satellite tags (eye-in-hand cal) + favorite: false + joint_group_names: + - gripper + - manipulator + joint_state: + effort: [] + header: + frame_id: '' + stamp: + nanosec: 0 + sec: 0 + name: + - robotiq_85_left_knuckle_joint + - robotiq_85_left_finger_joint + - robotiq_85_right_finger_joint + - joint_1 + - joint_2 + - joint_3 + - joint_4 + - joint_5 + - joint_6 + - joint_7 + position: + - 0.0029407721601535414 + - 0.00014643648808031575 + - 0.0001464364880981395 + - -0.9033 + - 1.1219 + - -1.2598 + - -1.8335 + - -0.9293 + - -1.5142 + - -1.0942 + velocity: [] + multi_dof_joint_state: + header: + frame_id: '' + stamp: + nanosec: 0 + sec: 0 + joint_names: [] + transforms: [] + twist: [] + wrench: [] + name: Wrist Camera Calibration 2 +- description: Wrist camera views the satellite tags (eye-in-hand cal) + favorite: false + joint_group_names: + - gripper + - manipulator + joint_state: + effort: [] + header: + frame_id: '' + stamp: + nanosec: 0 + sec: 0 + name: + - robotiq_85_left_knuckle_joint + - robotiq_85_left_finger_joint + - robotiq_85_right_finger_joint + - joint_1 + - joint_2 + - joint_3 + - joint_4 + - joint_5 + - joint_6 + - joint_7 + position: + - 0.0029407721601535414 + - 0.00014643648808031575 + - 0.0001464364880981395 + - -1.2524 + - 1.0288 + - -0.8622 + - -2.4734 + - -1.1231 + - -1.2013 + - -0.5478 + velocity: [] + multi_dof_joint_state: + header: + frame_id: '' + stamp: + nanosec: 0 + sec: 0 + joint_names: [] + transforms: [] + twist: [] + wrench: [] + name: Wrist Camera Calibration 3 +- description: Wrist camera views the satellite tags (eye-in-hand cal) + favorite: false + joint_group_names: + - gripper + - manipulator + joint_state: + effort: [] + header: + frame_id: '' + stamp: + nanosec: 0 + sec: 0 + name: + - robotiq_85_left_knuckle_joint + - robotiq_85_left_finger_joint + - robotiq_85_right_finger_joint + - joint_1 + - joint_2 + - joint_3 + - joint_4 + - joint_5 + - joint_6 + - joint_7 + position: + - 0.0029407721601535414 + - 0.00014643648808031575 + - 0.0001464364880981395 + - -0.2284 + - 0.862 + - -1.5603 + - -1.5036 + - -0.93 + - -1.8527 + - -0.8653 + velocity: [] + multi_dof_joint_state: + header: + frame_id: '' + stamp: + nanosec: 0 + sec: 0 + joint_names: [] + transforms: [] + twist: [] + wrench: [] + name: Wrist Camera Calibration 4