Rebase from 'upstream'

.clang-format

@@ -0,0 +1,14 @@
+---
+Language: Cpp
+BasedOnStyle: Google
+
+ColumnLimit: 100
+AccessModifierOffset: -2
+AlignAfterOpenBracket: AlwaysBreak
+BreakBeforeBraces: Allman
+ConstructorInitializerIndentWidth: 0
+ContinuationIndentWidth: 2
+DerivePointerAlignment: false
+PointerAlignment: Middle
+ReflowComments: true
+IncludeBlocks: Preserve

.github/workflows/ci.yml

@@ -1,26 +1,35 @@
-name: CI
+name: interactive_marker_twist_server_ci
 
 on:
   push:
-    branches:
-      - humble-devel
   pull_request:
-    branches:
-      - humble-devel
+  schedule:
+    - cron: "0 0 * * *" # every day at midnight
 
 jobs:
   humble_ci:
-    name: Humble CI Job
+    name: Humble OSRF Industrial
+    strategy:
+      matrix:
+        env:
+          - {ROS_REPO: testing, ROS_DISTRO: humble}
+          - {ROS_REPO: main, ROS_DISTRO: humble}
+      fail-fast: false
     runs-on: ubuntu-22.04
     steps:
-      - name: Clone Repository
-        uses: actions/checkout@v3
-      - name: Setup ROS
-        uses: ros-tooling/[email protected]
-        with:
-          required-ros-distributions: humble
-      - name: Build and Test
-        uses: ros-tooling/[email protected]
-        with:
-          package-name: interactive_marker_twist_server
-          target-ros2-distro: humble
+      - uses: actions/checkout@v3
+      - uses: 'ros-industrial/industrial_ci@master'
+        env: ${{matrix.env}}
+  jazzy_ci:
+    name: Jazzy OSRF Industrial
+    strategy:
+      matrix:
+        env:
+          - {ROS_REPO: testing, ROS_DISTRO: jazzy}
+          - {ROS_REPO: main, ROS_DISTRO: jazzy}
+      fail-fast: false
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v3
+      - uses: 'ros-industrial/industrial_ci@master'
+        env: ${{matrix.env}}

.pre-commit-config.yaml

@@ -0,0 +1,143 @@
+
+# To use:
+#
+#     pre-commit run -a
+#
+# Or:
+#
+#     pre-commit install  # (runs every time you commit in git)
+#
+# To update this file:
+#
+#     pre-commit autoupdate
+#
+# See https://github.com/pre-commit/pre-commit
+
+repos:
+  # Standard hooks
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v5.0.0
+    hooks:
+      - id: check-added-large-files
+      - id: check-ast
+      - id: check-case-conflict
+      - id: check-docstring-first
+      - id: check-merge-conflict
+      - id: check-symlinks
+      - id: check-xml
+      - id: check-yaml
+        args: ["--allow-multiple-documents"]
+      - id: debug-statements
+      - id: end-of-file-fixer
+      - id: mixed-line-ending
+      - id: trailing-whitespace
+        exclude_types: [rst]
+      - id: fix-byte-order-marker
+
+
+  # Python hooks
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.19.0
+    hooks:
+    -   id: pyupgrade
+        args: [--py36-plus]
+
+  # PyDocStyle
+  - repo: https://github.com/PyCQA/pydocstyle
+    rev: 6.3.0
+    hooks:
+    - id: pydocstyle
+      args: ["--ignore=D100,D101,D102,D103,D104,D105,D106,D107,D203,D212,D404"]
+
+  - repo: https://github.com/psf/black
+    rev: 24.10.0
+    hooks:
+      - id: black
+        args: ["--line-length=99"]
+
+  - repo: https://github.com/pycqa/flake8
+    rev: 7.1.1
+    hooks:
+    - id: flake8
+      args: ["--extend-ignore=E501"]
+
+  # CPP hooks
+  - repo: https://github.com/pre-commit/mirrors-clang-format
+    rev: v19.1.3
+    hooks:
+      - id: clang-format
+        args: ['-fallback-style=none', '-i']
+
+  - repo: local
+    hooks:
+      - id: ament_cppcheck
+        name: ament_cppcheck
+        description: Static code analysis of C/C++ files.
+        entry: env AMENT_CPPCHECK_ALLOW_SLOW_VERSIONS=1 ament_cppcheck
+        language: system
+        files: \.(h\+\+|h|hh|hxx|hpp|cuh|c|cc|cpp|cu|c\+\+|cxx|tpp|txx)$
+
+  - repo: local
+    hooks:
+      - id: ament_cpplint
+        name: ament_cpplint
+        description: Static code analysis of C/C++ files.
+        entry: ament_cpplint
+        language: system
+        files: \.(h\+\+|h|hh|hxx|hpp|cuh|c|cc|cpp|cu|c\+\+|cxx|tpp|txx)$
+        args: ["--linelength=100", "--filter=-whitespace/newline"]
+
+  # Cmake hooks
+  - repo: local
+    hooks:
+      - id: ament_lint_cmake
+        name: ament_lint_cmake
+        description: Check format of CMakeLists.txt files.
+        entry: ament_lint_cmake
+        language: system
+        files: CMakeLists\.txt$
+
+  # Copyright
+  - repo: local
+    hooks:
+      - id: ament_copyright
+        name: ament_copyright
+        description: Check if copyright notice is available in all files.
+        entry: ament_copyright
+        language: system
+        exclude: .*/conf\.py$
+
+  # Docs - RestructuredText hooks
+  - repo: https://github.com/PyCQA/doc8
+    rev: v1.1.2
+    hooks:
+      - id: doc8
+        args: ['--max-line-length=100', '--ignore=D001']
+        exclude: CHANGELOG\.rst$
+
+  - repo: https://github.com/pre-commit/pygrep-hooks
+    rev: v1.10.0
+    hooks:
+      - id: rst-backticks
+        exclude: CHANGELOG\.rst$
+      - id: rst-directive-colons
+      - id: rst-inline-touching-normal
+
+  # Spellcheck in comments and docs
+  # skipping of *.svg files is not working...
+  - repo: https://github.com/codespell-project/codespell
+    rev: v2.3.0
+    hooks:
+      - id: codespell
+        args: ['--write-changes', '--uri-ignore-words-list=ist', '-L manuel']
+        exclude: CHANGELOG\.rst|\.(svg|pyc|drawio)$
+
+  - repo: https://github.com/python-jsonschema/check-jsonschema
+    rev: 0.29.4
+    hooks:
+      - id: check-github-workflows
+        args: ["--verbose"]
+      - id: check-github-actions
+        args: ["--verbose"]
+      - id: check-dependabot
+        args: ["--verbose"]

CHANGELOG.rst

@@ -2,6 +2,13 @@
 Changelog for package interactive_marker_twist_server
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.1.1 (2024-11-19)
+------------------
+* Fixed linting.
+* Updated CI for Humble and Jazzy.
+* Add the use_stamped_msgs param to allow support for publishing TwistStamped messages instead of Twist
+* Contributors: Chris Iverach-Brereton, Tony Baltovski
+
 2.1.0 (2023-03-06)
 ------------------
 * Updated CI for Humble.

CMakeLists.txt

@@ -40,7 +40,13 @@ install(DIRECTORY
 
 if(BUILD_TESTING)
   find_package(ament_lint_auto REQUIRED)
+  list(APPEND AMENT_LINT_AUTO_EXCLUDE
+    ament_cmake_cpplint
+    ament_cmake_uncrustify
+  )
+  set(ament_cmake_clang_format_CONFIG_FILE .clang-format)
   ament_lint_auto_find_test_dependencies()
 endif()
 
+
 ament_package()

package.xml

@@ -1,6 +1,6 @@
 <package format="2">
   <name>interactive_marker_twist_server</name>
-  <version>2.1.0</version>
+  <version>2.1.1</version>
   <description>Interactive control for generic Twist-based robots using interactive markers</description>
   <maintainer email="[email protected]">Mike Purvis</maintainer>
   <license>BSD</license>