diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 02b5afd..398059e 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -31,7 +31,7 @@ jobs:
name: ${{ matrix.env.ROS_DISTRO }}-${{ matrix.env.ROS_REPO }}
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: cache target_ws
uses: pat-s/always-upload-cache@v3.0.11
with:
diff --git a/.github/workflows/format.yaml b/.github/workflows/format.yaml
index 4ce089c..b786460 100644
--- a/.github/workflows/format.yaml
+++ b/.github/workflows/format.yaml
@@ -15,9 +15,9 @@ jobs:
name: Format
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
- - uses: actions/setup-python@v4
+ - uses: actions/checkout@v4
+ - uses: actions/setup-python@v5
with:
- python-version: '3.10'
- - uses: pre-commit/action@v3.0.0
+ python-version: '3.8'
+ - uses: pre-commit/action@v3.0.1
id: precommit
diff --git a/.github/workflows/prerelease.yaml b/.github/workflows/prerelease.yaml
index ab03242..3ebae22 100644
--- a/.github/workflows/prerelease.yaml
+++ b/.github/workflows/prerelease.yaml
@@ -19,6 +19,6 @@ jobs:
name: rolling
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: industrial_ci
uses: ros-industrial/industrial_ci@master
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 41af260..4fbcfe0 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
- rev: v4.3.0
+ rev: v4.5.0
hooks:
- id: check-added-large-files
- id: check-case-conflict
@@ -13,13 +13,13 @@ repos:
- id: trailing-whitespace
- repo: https://github.com/codespell-project/codespell
- rev: v2.2.2
+ rev: v2.2.6
hooks:
- id: codespell
args: ['--write-changes', '--ignore-words=.codespell_words']
- repo: https://github.com/cheshirekow/cmake-format-precommit
- rev: v0.6.10
+ rev: v0.6.13
hooks:
- id: cmake-format
- id: cmake-lint
diff --git a/marine_acoustic_msgs/CMakeLists.txt b/marine_acoustic_msgs/CMakeLists.txt
index cdb9dbd..1cb9285 100644
--- a/marine_acoustic_msgs/CMakeLists.txt
+++ b/marine_acoustic_msgs/CMakeLists.txt
@@ -1,25 +1,38 @@
cmake_minimum_required(VERSION 3.5)
+
project(marine_acoustic_msgs)
+# Default to C++17
+if(NOT CMAKE_CXX_STANDARD)
+ set(CMAKE_CXX_STANDARD 17)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+endif()
+if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+ add_compile_options(-Wall -Wextra -Wpedantic)
+endif()
+
find_package(ament_cmake REQUIRED)
+find_package(geometry_msgs REQUIRED)
find_package(rosidl_default_generators REQUIRED)
find_package(std_msgs REQUIRED)
-find_package(geometry_msgs REQUIRED)
-
-set(MSG_FILES)
-
-file(
- GLOB rosMsgFiles
- RELATIVE "${${PROJECT_NAME}_SOURCE_DIR}"
- "${${PROJECT_NAME}_SOURCE_DIR}/msg/*.msg")
-foreach(rosMsg ${rosMsgFiles})
- message(STATUS "Processing message file: ${rosMsg}")
- set(MSG_FILES ${MSG_FILES} ${rosMsg})
-endforeach(rosMsg)
+# cmake-format: off
+set(MSG_FILES
+ "msg/DetectionFlag.msg"
+ "msg/Dvl.msg"
+ "msg/PingInfo.msg"
+ "msg/ProjectedSonarImage.msg"
+ "msg/RawSonarImage.msg"
+ "msg/SonarDetections.msg"
+ "msg/SonarImageData.msg"
+ "msg/SonarRanges.msg"
+)
-rosidl_generate_interfaces(${PROJECT_NAME} ${MSG_FILES} DEPENDENCIES std_msgs
- geometry_msgs)
+rosidl_generate_interfaces(${PROJECT_NAME}
+ ${MSG_FILES}
+ DEPENDENCIES geometry_msgs std_msgs
+)
+# cmake-format: on
ament_export_dependencies(rosidl_default_runtime)
diff --git a/marine_acoustic_msgs/package.xml b/marine_acoustic_msgs/package.xml
index 67b7f1c..a17b0a9 100644
--- a/marine_acoustic_msgs/package.xml
+++ b/marine_acoustic_msgs/package.xml
@@ -7,6 +7,7 @@
Laura Lindzey
+ Roland Arsenault
BSD-3-Clause
@@ -19,16 +20,12 @@
ament_cmake
rosidl_default_generators
- std_msgs
- geometry_msgs
-
- std_msgs
+ std_msgs
+ geometry_msgs
rosidl_default_runtime
- rosidl_interface_packages
- std_msgs
- geometry_msgs
+ rosidl_interface_packages
ament_cmake
diff --git a/marine_sensor_msgs/CMakeLists.txt b/marine_sensor_msgs/CMakeLists.txt
index 0afa487..f9af3f4 100644
--- a/marine_sensor_msgs/CMakeLists.txt
+++ b/marine_sensor_msgs/CMakeLists.txt
@@ -1,26 +1,34 @@
cmake_minimum_required(VERSION 3.5)
+
project(marine_sensor_msgs)
+# Default to C++17
+if(NOT CMAKE_CXX_STANDARD)
+ set(CMAKE_CXX_STANDARD 17)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+endif()
+if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+ add_compile_options(-Wall -Wextra -Wpedantic)
+endif()
+
find_package(ament_cmake REQUIRED)
-find_package(rosidl_default_generators REQUIRED)
find_package(builtin_interfaces REQUIRED)
-find_package(std_msgs REQUIRED)
find_package(geometry_msgs REQUIRED)
+find_package(rosidl_default_generators REQUIRED)
+find_package(std_msgs REQUIRED)
-set(MSG_FILES)
-
-file(
- GLOB rosMsgFiles
- RELATIVE "${${PROJECT_NAME}_SOURCE_DIR}"
- "${${PROJECT_NAME}_SOURCE_DIR}/msg/*.msg")
-
-foreach(rosMsg ${rosMsgFiles})
- message(STATUS "Processing message file: ${rosMsg}")
- set(MSG_FILES ${MSG_FILES} ${rosMsg})
-endforeach(rosMsg)
+# cmake-format: off
+set(MSG_FILES
+ "msg/RadarEcho.msg"
+ "msg/RadarSector.msg"
+ "msg/TurbidityNTU.msg"
+)
-rosidl_generate_interfaces(${PROJECT_NAME} ${MSG_FILES} DEPENDENCIES
- builtin_interfaces std_msgs geometry_msgs)
+rosidl_generate_interfaces(${PROJECT_NAME}
+ ${MSG_FILES}
+ DEPENDENCIES builtin_interfaces geometry_msgs std_msgs
+)
+# cmake-format: on
ament_export_dependencies(rosidl_default_runtime)
diff --git a/marine_sensor_msgs/package.xml b/marine_sensor_msgs/package.xml
index 8eda250..9de0d0c 100644
--- a/marine_sensor_msgs/package.xml
+++ b/marine_sensor_msgs/package.xml
@@ -7,27 +7,24 @@
Laura Lindzey
+ Roland Arsenault
BSD-3-Clause
Aaron Marburg
Laura Lindzey
+ Roland Arsenault
ament_cmake
rosidl_default_generators
- builtin_interfaces
- std_msgs
- geometry_msgs
-
- std_msgs
+ builtin_interfaces
+ std_msgs
+ geometry_msgs
rosidl_default_runtime
- rosidl_interface_packages
- builtin_interfaces
- std_msgs
- geometry_msgs
+ rosidl_interface_packages
ament_cmake