From 9e0716c152afd81a280afe4de22938e5f487ecf0 Mon Sep 17 00:00:00 2001 From: dominikn Date: Tue, 5 Dec 2023 18:33:19 +0100 Subject: [PATCH] pre-comit fixes --- .wordlist.txt | 2 +- tools/Dockerfile | 3 +-- tools/compose.yaml | 2 +- tools/healthcheck.cpp | 14 ++++++++++++++ 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.wordlist.txt b/.wordlist.txt index cd94d3d1..0bd3d804 100644 --- a/.wordlist.txt +++ b/.wordlist.txt @@ -130,4 +130,4 @@ localhost SHM UDPv CustomUdpTransport -UDPv \ No newline at end of file +UDPv diff --git a/tools/Dockerfile b/tools/Dockerfile index 0113bd60..e605f893 100644 --- a/tools/Dockerfile +++ b/tools/Dockerfile @@ -71,7 +71,7 @@ RUN MYDISTRO=${PREFIX:-ros}; MYDISTRO=${MYDISTRO//-/} && \ rm -rf build log ## =========================== Final Stage =============================== -FROM husarnet/ros:${PREFIX}${ROS_DISTRO}-ros-core +FROM husarnet/ros:${PREFIX}${ROS_DISTRO}-ros-core ARG ROS_DISTRO ARG PREFIX @@ -98,4 +98,3 @@ COPY tools/healthcheck.sh / HEALTHCHECK --interval=7s --timeout=2s --start-period=5s --retries=5 \ CMD ["/healthcheck.sh"] - diff --git a/tools/compose.yaml b/tools/compose.yaml index 012b5cb5..1c3a93fd 100644 --- a/tools/compose.yaml +++ b/tools/compose.yaml @@ -1,5 +1,5 @@ # Quick Start -# +# # 1. run `docker compose up` on the robot # 3. You can use teleop_twist_keyboard to control the robot in robot1 namespace: # `ros2 run teleop_twist_keyboard teleop_twist_keyboard --ros-args -r __ns:=/robot1` diff --git a/tools/healthcheck.cpp b/tools/healthcheck.cpp index ff80c352..a6d3294f 100644 --- a/tools/healthcheck.cpp +++ b/tools/healthcheck.cpp @@ -1,3 +1,17 @@ +// Copyright 2023 Husarion sp. z o.o. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + #include "fstream" #include "nav_msgs/msg/odometry.hpp" #include "rclcpp/rclcpp.hpp"