Skip to content

Commit

Permalink
Merge branch 'hotfix/documentation-v1.1.0' into 'master'
Browse files Browse the repository at this point in the history
Hotfix/documentation v1.1.0

See merge request syntron/support/csr/ifm3d/ifm3d-ros2!34
  • Loading branch information
dekhanra committed May 22, 2024
2 parents a89ad39 + 6a8ff9d commit d069ce3
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 2 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ Changelog for package ifm3d-ros2
1.1
===

1.1.0 (unreleased preparations for FW 1.4 release)
------------------
* Update for compatibility with O3R FW 1.4.x and ifm3d >= 1.4.3
* Tested with FW 1.4.22 and ifm3d API 1.4.3
* Tested with FW 1.4.22 and ifm3d API 1.5.3

1.1.0
------------------
* Update for compatibility with O3R FW >= 1.0.14 and ifm3d >= 1.2.6
Expand Down
6 changes: 5 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ RUN apt-get update && apt-get install -y \
libxmlrpc-c++8-dev \
wget \
&& rm -rf /var/lib/apt/lists/*

# Update libcurl4 library for the dependancy of ifm3dAPI 1.4.3 & requires libcurl4 version 16
RUN apt-get update && apt-get upgrade libcurl4
# Install ifm3d using the deb files
RUN mkdir /home/ifm/ifm3d
ADD https://github.com/ifm/ifm3d/releases/download/v${IFM3D_VERSION}/ifm3d-ubuntu-${UBUNTU_VERSION}-${ARCH}-debs_${IFM3D_VERSION}.tar /home/ifm/ifm3d
Expand Down Expand Up @@ -82,6 +83,9 @@ RUN apt-get update \
python3-rosdep \
&& rm -rf /var/lib/apt/lists/*

# Update libcurl4 library for the dependancy of ifm3dAPI 1.4.3 & requires libcurl4 version 16
RUN apt-get update && apt-get upgrade libcurl4

# Install ifm3d
RUN cd /home/ifm/ifm3d &&\
dpkg -i *.deb
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ This release is intended to be used with the O3R camera platform ONLY. For other

| ifm3d_ros2 version | ifm3d version | (O3R) embedded FW versions | ROS 2 distribution |
| ------------------ | ------------- | -------------------------- | ------------------ |
| 1.1.0 | 1.2.6, 1.3.3 | 1.0.14, 1.1.x | Humble |
| 1.1.0 | 1.4.3 | 1.0.14, 1.1.x, 1.4.x | Humble |
| 1.0.1 | 0.93.0 | 0.14.23 | Foxy |

### Deprecated ifm3d-ros2 Versions
Expand Down

0 comments on commit d069ce3

Please sign in to comment.