Merge branch 'release/1.1.2' into 'master'

Release/1.1.2 based on ifm3d v1.3.3

See merge request syntron/support/csr/ifm3d/ifm3d-ros!43

Author: desengph

.gitignore

@@ -3,6 +3,7 @@
 *.swp
 
 ## VSCode and Python
+*.vscode
 .DS_Store
 .huskyrc.json
 out

CHANGELOG.rst

@@ -2,10 +2,14 @@
 Changelog for package ifm3d-ros
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 
-1.1 (unreleased)
-===============
+1.1
+===
 
-1.1.0
+1.1.2
+-----
+* Update Dockerfiles for building the ROS node inside a Docker software container environment: removed glog build and runtime libs
+
+1.1.1
 -----
 * Update camera nodelet for ifm3d >= v1.2.3
   * Switch from looped image retrieval to callback based image retrieval
@@ -34,6 +38,11 @@ Changelog for package ifm3d-ros
 * Robustness improvements:
   * Only publish data to image streams if API frames include the corresponding image data
 
+
+1.1.0
+-----
+* UNRELEASED
+
 1.0
 ===
 

README.md

@@ -11,6 +11,7 @@
 
 | **ifm3d-ros version** | **ifm3d version** | **embedded O3R FW version** | **ROS distribution(s)** |
 | --------------------- | ----------------- | --------------------------- | ----------------------- |
+| 1.1.2                 | 1.3.3             | 1.0.14                      | ROS Noetic              |
 | 1.1.1                 | 1.2.6             | 1.0.14                      | ROS Noetic              |
 | 1.1.0 (unreleased)    | 1.2.3             | 1.0.x                       | ROS Noetic              |
 | 1.0.1                 | 0.93.0            | 0.14.23                     | ROS Noetic              |
@@ -22,6 +23,7 @@ Please see the internal subpackage version structure for a known `ifm3d-ros vers
 
 | **ifm3d-ros version** | **ifm3d_ros_driver** | **ifm3d_ros_msgs** | **ifm3d_ros_examples** |
 | --------------------- | -------------------- | ------------------ | ---------------------- |
+| 1.1.2                 | 1.1.1                | 0.2.0              | 0.2.0                  |
 | 1.1.1                 | 1.1.1                | 0.2.0              | 0.2.0                  |
 | 1.1.0 (unreleased)    | 1.1.0                | 0.2.0              | 0.2.0                  |
 | 1.0.1                 | 1.0.1                | 0.1.0              | 0.1.0                  |

docker/Dockerfile

@@ -28,8 +28,6 @@ RUN apt-get update && apt-get install -y \
     cmake \
     wget \
     libssl-dev \
-    libgoogle-glog-dev \
-    libgoogle-glog0v5 \
     python3-rosdep
 
 # Install ifm3d using the deb files
@@ -69,8 +67,6 @@ RUN apt-get update \
     locales \
     sudo \
     libssl-dev \
-    libgoogle-glog0v5 \
-    libboost-all-dev \
     python3-rosdep \
     && rm -rf /var/lib/apt/lists/*
 
@@ -92,5 +88,3 @@ RUN echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen && \
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
-
-# NOTE: Make sure to run export RMW_IMPLEMENTATION=rmw_cyclonedds_cpp

docker/Dockerfile_buildstage_only

@@ -25,8 +25,6 @@ RUN apt-get update && apt-get install -y \
     libxmlrpc-c++8-dev \
     libproj-dev \
     libcurl4 \
-    libgoogle-glog-dev \
-    libgoogle-glog0v5 \
     build-essential \
     coreutils \
     cmake \

docker/build_container.sh

@@ -6,21 +6,21 @@ set -euo pipefail
 ##############
 ARCH="amd64"
 BASE_IMAGE="amd64/ros"
-TAG=ifm3d-ros_126:noetic-amd64_1.1.1
+TAG=ifm3d-ros_133:noetic-amd64_1.1.2
 
 ##############
 # For ARM64V8:
 ##############
 # ARCH="arm64v8"
 # BASE_IMAGE="arm64v8/ros"
-# TAG=ifm3d-ros_126:noetic-arm64_v8_1.1.1
+# TAG=ifm3d-ros_133:noetic-arm64_v8_1.1.2
 
 ##############
 # Arguments common for both architecture
 ##############
 BUILD_IMAGE_TAG="noetic"
 FINAL_IMAGE_TAG="noetic-ros-core"
-IFM3D_VERSION="1.2.6"
+IFM3D_VERSION="1.3.3"
 IFM3D_ROS_REPO="https://github.com/ifm/ifm3d-ros"
 IFM3D_ROS_BRANCH="dev1.2"
 UBUNTU_VERSION="20.04"

docker/docker-compose_IPC.yml

@@ -3,7 +3,7 @@ services:
 
   ifm3d_ros:
     tty: true
-    image: ifm3d-ros_126:noetic-amd64_1.1.1
+    image: ifm3d-ros_133:noetic-amd64_1.1.2
     restart: unless-stopped
     volumes:
       - ./hosts_IPC:/etc/hosts/

docker/docker-compose_VPU.yml

@@ -2,7 +2,7 @@ version: "2.3"
 services:
   ifm3d_ros:
     tty: true
-    image: ifm3d-ros_126:noetic-arm64_v8_1.1.1
+    image: ifm3d-ros_133:noetic-arm64_v8_1.1.2
 
     restart: unless-stopped
     volumes:
@@ -22,8 +22,6 @@ services:
         . /opt/ros/noetic/setup.sh;
         . /home/ifm/catkin_ws/devel/setup.sh;
         export IFM3D_IP="127.0.0.1";
-        export GLOG_logtostderr=1;
-        export GLOG_minloglevel=3;
         export ROS_MASTER_URI=http://ifm3d_rosmaster:11311;
         export ROS_HOSTNAME=ifm3d_ros;
         echo ROOS_MASTER_URI=$$ROS_MASTER_URI;

docker/docker-compose_docker_network.yml

@@ -2,7 +2,7 @@ version: "2.3"
 services:
   ifm3d_ros:
     tty: true
-    image: ifm3d-ros_126:noetic-arm64_v8_1.1.1
+    image: ifm3d-ros_133:noetic-arm64_v8_1.1.2
 
     extra_hosts:
       - "dockerhost:172.20.0.1"

docker/four_cameras.launch

@@ -2,7 +2,7 @@
 <package format="2">
 
   <name>ifm3d-ros</name>
-  <version>1.1.1</version>
+  <version>1.1.2</version>
   <description>metapackage for the ifm3d-ros package group which interacts with the ifm 3D ToF Camera ROS package</description>
   <maintainer email="[email protected]">ifm robotics group</maintainer>
   <license>Apache 2</license>

ifm3d-ros/package.xml

@@ -5,7 +5,7 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
-find_package(ifm3d 1.2.6 REQUIRED COMPONENTS
+find_package(ifm3d 1.3.3 REQUIRED COMPONENTS
              device
              framegrabber
              )