Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix thermal camera topic mapping #776

Merged
merged 1 commit into from
Feb 3, 2021

Conversation

iche033
Copy link
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 [email protected]

Signed-off-by: Ian Chen <[email protected]>
@iche033 iche033 requested a review from adlarkin February 2, 2021 23:53
@osrf-jenkins
Copy link

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

Copy link
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
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 <[email protected]>

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

Signed-off-by: Ashton Larkin <[email protected]>

* fix topic mapping (#776)

Signed-off-by: Ian Chen <[email protected]>

* add thermal camera visual, fix location and textures

Signed-off-by: Ashton Larkin <[email protected]>

* update hfov assuming degrees in spec

Signed-off-by: Ashton Larkin <[email protected]>

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

Signed-off-by: Ashton Larkin <[email protected]>

* set thermal default to 0 for HD2 vehicle_topics.launch

Signed-off-by: Ashton Larkin <[email protected]>

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

* adding thermal camera to cerberus m100

Signed-off-by: Ian Chen <[email protected]>

* fix bridge

Signed-off-by: Ian Chen <[email protected]>

* update thermal camera spec

Signed-off-by: Ian Chen <[email protected]>

* new config_2

Signed-off-by: Ian Chen <[email protected]>

* remove config_2

Signed-off-by: Ian Chen <[email protected]>

* reuse config_1 files

Signed-off-by: Ian Chen <[email protected]>

Co-authored-by: Ian Chen <[email protected]>
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