Skip to content

[Humble] Added support for Flir PTU-5.#334

Open
mergify[bot] wants to merge 1 commit into
humblefrom
mergify/bp/humble/pr-330
Open

[Humble] Added support for Flir PTU-5.#334
mergify[bot] wants to merge 1 commit into
humblefrom
mergify/bp/humble/pr-330

Conversation

@mergify
Copy link
Copy Markdown

@mergify mergify Bot commented May 6, 2026

Backport of #330 to Humble.

* Added support for Flir PTU-5.

* Add generator test with package server

---------

Co-authored-by: Luis Camero <lcamero@clearpathrobotics.com>
(cherry picked from commit 209b636)

# Conflicts:
#	.github/workflows/ci.yml
#	clearpath_generator_common/clearpath_generator_common/description/sensors.py
#	clearpath_generator_common/clearpath_generator_common/param/platform.py
#	clearpath_sensors_description/package.xml
@mergify mergify Bot requested a review from a team as a code owner May 6, 2026 18:05
@mergify mergify Bot requested review from tonybaltovski and removed request for a team May 6, 2026 18:05
@mergify mergify Bot added the conflicts label May 6, 2026
@mergify mergify Bot requested a review from nnarain-cpr May 6, 2026 18:05
@mergify mergify Bot added the conflicts label May 6, 2026
@mergify
Copy link
Copy Markdown
Author

mergify Bot commented May 6, 2026

Cherry-pick of 209b636 has failed:

On branch mergify/bp/humble/pr-330
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit 209b636.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   clearpath_sensors_description/urdf/flir_ptu.urdf.xacro

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/ci.yml
	both modified:   clearpath_generator_common/clearpath_generator_common/description/sensors.py
	both modified:   clearpath_generator_common/clearpath_generator_common/param/platform.py
	both modified:   clearpath_sensors_description/package.xml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant