Skip to content

Fix thermal camera topic mapping#776

Merged
adlarkin merged 1 commit intoadlarkin/add_thermal_camerafrom
iche033/add_thermal_camera
Feb 3, 2021
Merged

Fix thermal camera topic mapping#776
adlarkin merged 1 commit intoadlarkin/add_thermal_camerafrom
iche033/add_thermal_camera

Conversation

@iche033
Copy link
Copy Markdown
Contributor

@iche033 iche033 commented Feb 2, 2021

changes so it works with the current thermal camera topic names

  • topic: no /image suffix
  • camera_topic: incorrectly crops sensor name in topic string

fixing the topic names in ign-gazebo breaks existing behavior so using this workaround for now.

Signed-off-by: Ian Chen ichen@osrfoundation.org

Signed-off-by: Ian Chen <ichen@osrfoundation.org>
@iche033 iche033 requested a review from adlarkin February 2, 2021 23:53
@osrf-jenkins
Copy link
Copy Markdown

Build finished. 21 tests run, 0 skipped, 1 failed.

Copy link
Copy Markdown
Contributor

@adlarkin adlarkin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, thanks for the fixes! Just one minor question below.

Also, do we need the optical frame publishers for the thermal camera, or can we leave them out?

@iche033
Copy link
Copy Markdown
Contributor Author

iche033 commented Feb 3, 2021

Also, do we need the optical frame publishers for the thermal camera, or can we leave them out?

Since they are also cameras that produce sensor_msgs/Image data so we follow this ROS REP and provide an optical frame. I'm not sure if teams will use it though.

@adlarkin adlarkin merged commit f24adf0 into adlarkin/add_thermal_camera Feb 3, 2021
@adlarkin adlarkin deleted the iche033/add_thermal_camera branch February 3, 2021 01:38
nkoenig pushed a commit that referenced this pull request Feb 11, 2021
* starting to add thermal camera to marble_hd2_sensor_config_1

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* add optical frame publisher, camera info topic, and more thermal camera sensor parameters

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* fix topic mapping (#776)

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* add thermal camera visual, fix location and textures

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* update hfov assuming degrees in spec

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* break out thermal camera addition to HD2 configs 3 and 4

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* set thermal default to 0 for HD2 vehicle_topics.launch

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* New config with thermal camera: CERBERUS_M100_SENSOR_CONFIG_2 (#777)

* adding thermal camera to cerberus m100

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* fix bridge

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* update thermal camera spec

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* new config_2

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* remove config_2

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* reuse config_1 files

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

Co-authored-by: Ian Chen <ichen@osrfoundation.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants