Skip to content

Commit

Permalink
Merge pull request #19 from Tordjx/main
Browse files Browse the repository at this point in the history
Added camera_eye virtual frame
  • Loading branch information
stephane-caron authored Jul 31, 2024
2 parents ea51ab4 + b0313ee commit ac8a380
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ All notable changes to this project will be documented in this file.
- Camera variant of the URDF
- python: Add "variant" keyword argument to `load_in_pinocchio`
- Added camera support mass and camera to the "camera" variant

- Added camera eye to the "camera" variant
### Changed

- **Breaking:** Uppercase paths in Python for consistency with `robot_descriptions.py`
Expand Down
20 changes: 20 additions & 0 deletions urdf/upkie_camera.urdf
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,26 @@ Conventions in this file are detailed in:
<parent link="camera_support"/>
<child link="camera"/>
</joint>
<link name="camera_eye">
<!-- virtual link -->
<inertial>
<!-- mass should not be zero [1] -->
<mass value="0.001"/>
<origin rpy="0 0 0" xyz="0 0 0"/>
<inertia ixx="0" ixy="0" ixz="0" iyy="0" iyz="0" izz="0"/>
</inertial>
<visual>
<geometry>
<box size="0 0 0"/>
</geometry>
<material name="black"/>
</visual>
</link>
<joint name="camera_eye_fix" type="fixed">
<origin rpy="0 0 0" xyz="0.00875 0 0.005"/>
<parent link="camera"/>
<child link="camera_eye"/>
</joint>
<!-- Left leg -->
<!-- Left hip -->
<link name="left_hip_qdd100_stator">
Expand Down
22 changes: 18 additions & 4 deletions xacro/torso.xacro
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,25 @@
rpy="0 0 0" xyz="0 0 0"
mass="0.061"
len_x="0.0175" len_y="0.091" len_z="0.028" />
</link>
<joint name="camera_fix" type="fixed">
<origin rpy="0 0 0" xyz="0.045 0 0"/>
<parent link="camera_support"/>
<child link="camera"/>
</joint>
<link name="camera_eye">
<xacro:virtual_link_inertia />
<visual>
<geometry>
<box size="0 0 0"/>
</geometry>
<material name="black"/>
</visual>
</link>
<joint name="camera_fix" type="fixed">
<origin rpy="0 0 0" xyz="0.045 0 0"/>
<parent link="camera_support"/>
<child link="camera"/>
<joint name="camera_eye_fix" type="fixed">
<origin rpy="0 0 0" xyz="0.00875 0 0.005"/>
<parent link="camera"/>
<child link="camera_eye"/>
</joint>
</xacro:if>

Expand Down

0 comments on commit ac8a380

Please sign in to comment.