Skip to content

Commit

Permalink
Merge branch 'master' into devel_3.7
Browse files Browse the repository at this point in the history
  • Loading branch information
Myzhar authored Feb 24, 2022
2 parents be957f7 + dcd9d97 commit 17c3532
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Open a terminal, clone the repository, update the dependencies and build the pac
$ catkin_make -DCMAKE_BUILD_TYPE=Release
$ source ./devel/setup.bash

#### Update the repository
#### Update the local repository

To update the repository to the latest release you must use the following command to retrieve the latest commits of `zed-ros-wrapper` and of all the submodules:

Expand Down
6 changes: 3 additions & 3 deletions zed_wrapper/urdf/zed_macro.urdf.xacro
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<xacro:macro name="zed_camera" params="name=zed model=zed parent *origin">
<xacro:if value="${model == 'zed'}">
<xacro:property name="baseline" value="0.12" />
<xacro:property name="height" value="0.033" />
<xacro:property name="height" value="0.03" />
<xacro:property name="bottom_slope" value="0.05" />
<xacro:property name="screw_offset_x" value="0.0" />
<xacro:property name="optical_offset_x" value="-0.01" />
Expand All @@ -46,14 +46,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</xacro:if>
<xacro:if value="${model == 'zed2'}">
<xacro:property name="baseline" value="0.12" />
<xacro:property name="height" value="0.033" />
<xacro:property name="height" value="0.03" />
<xacro:property name="bottom_slope" value="0.05" />
<xacro:property name="screw_offset_x" value="0.0" />
<xacro:property name="optical_offset_x" value="-0.01" />
</xacro:if>
<xacro:if value="${model == 'zed2i'}">
<xacro:property name="baseline" value="0.12" />
<xacro:property name="height" value="0.033" />
<xacro:property name="height" value="0.03" />
<xacro:property name="bottom_slope" value="0.0" />
<xacro:property name="screw_offset_x" value="-0.01" />
<xacro:property name="optical_offset_x" value="-0.01" />
Expand Down

0 comments on commit 17c3532

Please sign in to comment.