diff --git a/stretch_core/rviz/stretch_simple_test.rviz b/stretch_core/rviz/stretch_simple_test.rviz index 65dfc7f..fd6eb98 100644 --- a/stretch_core/rviz/stretch_simple_test.rviz +++ b/stretch_core/rviz/stretch_simple_test.rviz @@ -8,9 +8,7 @@ Panels: - /Status1 - /RobotModel1 - /RobotModel1/Links1 - - /RobotModel1/Links1/link_gripper1 - - /RobotModel1/Links1/link_lift1 - - /RobotModel1/Links1/link_wrist_yaw1 + - /RobotModel1/Links1/link_gripper_finger_left1 Splitter Ratio: 0.5 Tree Height: 1484 - Class: rviz/Selection @@ -62,7 +60,7 @@ Visualization Manager: Collision Enabled: false Enabled: true Links: - All Links Enabled: true + All Links Enabled: false Expand Joint Details: false Expand Link Details: false Expand Tree: false @@ -120,7 +118,7 @@ Visualization Manager: Value: true link_arm_l0: Alpha: 1 - Show Axes: true + Show Axes: false Show Trail: false Value: true link_arm_l1: @@ -168,9 +166,13 @@ Visualization Manager: Show Axes: false Show Trail: false Value: true + link_grasp_center: + Alpha: 1 + Show Axes: false + Show Trail: false link_gripper: Alpha: 1 - Show Axes: true + Show Axes: false Show Trail: false Value: true link_gripper_finger_left: @@ -223,6 +225,11 @@ Visualization Manager: Show Axes: false Show Trail: false Value: true + link_puller: + Alpha: 1 + Show Axes: false + Show Trail: false + Value: false link_right_wheel: Alpha: 1 Show Axes: false @@ -363,25 +370,25 @@ Visualization Manager: Views: Current: Class: rviz/Orbit - Distance: 0.8282229900360107 + Distance: 0.9523301124572754 Enable Stereo Rendering: Stereo Eye Separation: 0.05999999865889549 Stereo Focal Distance: 1 Swap Stereo Eyes: false Value: false Focal Point: - X: -0.09536467492580414 - Y: -0.08481967449188232 - Z: 0.6443694829940796 + X: -0.060830965638160706 + Y: -0.08009408414363861 + Z: 0.6235455274581909 Focal Shape Fixed Size: true Focal Shape Size: 0.05000000074505806 Invert Z Axis: false Name: Current View Near Clip Distance: 0.009999999776482582 - Pitch: 0.7597976326942444 + Pitch: 0.8447968363761902 Target Frame: Value: Orbit (rviz) - Yaw: 5.240455150604248 + Yaw: 5.8704514503479 Saved: ~ Window Geometry: Displays: @@ -389,7 +396,7 @@ Window Geometry: Height: 1781 Hide Left Dock: false Hide Right Dock: false - QMainWindow State: 000000ff00000000fd0000000400000000000001d800000657fc0200000008fb0000001200530065006c0065006300740069006f006e00000001e10000009b0000005c00fffffffb0000001e0054006f006f006c002000500072006f007000650072007400690065007302000001ed000001df00000185000000a3fb000000120056006900650077007300200054006f006f02000001df000002110000018500000122fb000000200054006f006f006c002000500072006f0070006500720074006900650073003203000002880000011d000002210000017afb000000100044006900730070006c006100790073010000003d00000657000000c900fffffffb0000002000730065006c0065006300740069006f006e00200062007500660066006500720200000138000000aa0000023a00000294fb00000014005700690064006500530074006500720065006f02000000e6000000d2000003ee0000030bfb0000000c004b0069006e0065006300740200000186000001060000030c00000261000000010000010f00000363fc0200000003fb0000001e0054006f006f006c002000500072006f00700065007200740069006500730100000041000000780000000000000000fb0000000a00560069006500770073000000003d00000363000000a400fffffffb0000001200530065006c0065006300740069006f006e010000025a000000b200000000000000000000000200000490000000a9fc0100000001fb0000000a00560069006500770073030000004e00000080000002e1000001970000000300000ba60000003efc0100000002fb0000000800540069006d0065010000000000000ba6000002eb00fffffffb0000000800540069006d00650100000000000004500000000000000000000009c80000065700000004000000040000000800000008fc0000000100000002000000010000000a0054006f006f006c00730100000000ffffffff0000000000000000 + QMainWindow State: 000000ff00000000fd00000004000000000000025700000657fc0200000008fb0000001200530065006c0065006300740069006f006e00000001e10000009b0000005c00fffffffb0000001e0054006f006f006c002000500072006f007000650072007400690065007302000001ed000001df00000185000000a3fb000000120056006900650077007300200054006f006f02000001df000002110000018500000122fb000000200054006f006f006c002000500072006f0070006500720074006900650073003203000002880000011d000002210000017afb000000100044006900730070006c006100790073010000003d00000657000000c900fffffffb0000002000730065006c0065006300740069006f006e00200062007500660066006500720200000138000000aa0000023a00000294fb00000014005700690064006500530074006500720065006f02000000e6000000d2000003ee0000030bfb0000000c004b0069006e0065006300740200000186000001060000030c00000261000000010000010f00000363fc0200000003fb0000001e0054006f006f006c002000500072006f00700065007200740069006500730100000041000000780000000000000000fb0000000a00560069006500770073000000003d00000363000000a400fffffffb0000001200530065006c0065006300740069006f006e010000025a000000b200000000000000000000000200000490000000a9fc0100000001fb0000000a00560069006500770073030000004e00000080000002e1000001970000000300000ba60000003efc0100000002fb0000000800540069006d0065010000000000000ba6000002eb00fffffffb0000000800540069006d00650100000000000004500000000000000000000009490000065700000004000000040000000800000008fc0000000100000002000000010000000a0054006f006f006c00730100000000ffffffff0000000000000000 Selection: collapsed: false Time: diff --git a/stretch_description/meshes/link_straight_gripper.STL b/stretch_description/meshes/link_straight_gripper.STL new file mode 100644 index 0000000..1703253 Binary files /dev/null and b/stretch_description/meshes/link_straight_gripper.STL differ diff --git a/stretch_description/meshes/link_wrist_USB_board_camera.STL b/stretch_description/meshes/link_wrist_USB_board_camera.STL new file mode 100644 index 0000000..aaaf531 Binary files /dev/null and b/stretch_description/meshes/link_wrist_USB_board_camera.STL differ diff --git a/stretch_description/meshes/link_wrist_pitch.STL b/stretch_description/meshes/link_wrist_pitch.STL new file mode 100644 index 0000000..fbbc231 Binary files /dev/null and b/stretch_description/meshes/link_wrist_pitch.STL differ diff --git a/stretch_description/meshes/link_wrist_roll.STL b/stretch_description/meshes/link_wrist_roll.STL new file mode 100644 index 0000000..f0fb8f4 Binary files /dev/null and b/stretch_description/meshes/link_wrist_roll.STL differ diff --git a/stretch_description/meshes/link_wrist_yaw_bottom.STL b/stretch_description/meshes/link_wrist_yaw_bottom.STL new file mode 100644 index 0000000..ed4bde1 Binary files /dev/null and b/stretch_description/meshes/link_wrist_yaw_bottom.STL differ diff --git a/stretch_description/urdf/stretch_description.xacro b/stretch_description/urdf/stretch_description.xacro index 953a690..817eecc 100644 --- a/stretch_description/urdf/stretch_description.xacro +++ b/stretch_description/urdf/stretch_description.xacro @@ -1,10 +1,15 @@ - + + + + - + + + diff --git a/stretch_description/urdf/stretch_dex_wrist_beta.xacro b/stretch_description/urdf/stretch_dex_wrist_beta.xacro new file mode 100644 index 0000000..5484680 --- /dev/null +++ b/stretch_description/urdf/stretch_dex_wrist_beta.xacro @@ -0,0 +1,434 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/stretch_description/urdf/stretch_wrist_USB_board_camera.xacro b/stretch_description/urdf/stretch_wrist_USB_board_camera.xacro new file mode 100644 index 0000000..0510657 --- /dev/null +++ b/stretch_description/urdf/stretch_wrist_USB_board_camera.xacro @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +