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

Triggered Camera #846

Merged
merged 13 commits into from Mar 2, 2022
Merged

Conversation

WilliamLewww
Copy link
Contributor

@WilliamLewww WilliamLewww commented Feb 8, 2022

🎉 Triggered Camera

Related Pull Requests:

Reference issue:

Summary

Adds the SDF required to enable triggered cameras:

<camera>
  <triggered>true</triggered>
  <trigger_topic>/camera/trigger</trigger_topic>
  <horizontal_fov>1.05</horizontal_fov>
  <image>
    <width>256</width>
    <height>257</height>
  </image>
  <clip>
    <near>0.1</near>
    <far>10.0</far>
  </clip>
</camera>

Checklist

  • Signed all commits for DCO
  • Added tests
  • Added example and/or tutorial
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • codecheck passed (See contributing)
  • All tests passed (See test coverage)
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers

Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining Signed-off-by messages.

Signed-off-by: William Lew <WilliamMilesLew@gmail.com>
Signed-off-by: William Lew <WilliamMilesLew@gmail.com>
@github-actions github-actions bot added the 🏯 fortress Ignition Fortress label Feb 8, 2022
@osrf-triage osrf-triage added this to Inbox in Core development Feb 8, 2022
ahcorde
ahcorde previously requested changes Feb 8, 2022
Copy link
Collaborator

@ahcorde ahcorde left a comment

Choose a reason for hiding this comment

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

Missing tests

Core development automation moved this from Inbox to In review Feb 8, 2022
Copy link
Contributor

@nkoenig nkoenig left a comment

Choose a reason for hiding this comment

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

Can you also add to the Camera_TEST.cc to cover these new features?

include/sdf/Camera.hh Outdated Show resolved Hide resolved
src/Camera.cc Outdated Show resolved Hide resolved
src/Camera.cc Show resolved Hide resolved
Signed-off-by: William Lew <WilliamMilesLew@gmail.com>
Copy link
Member

@scpeters scpeters left a comment

Choose a reason for hiding this comment

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

gazebo_ros_pkgs doesn't allow the trigger topic name to be configurable. I think we can do the same, unless someone thinks it is important to add this

@nkoenig
Copy link
Contributor

nkoenig commented Feb 10, 2022

gazebo_ros_pkgs doesn't allow the trigger topic name to be configurable. I think we can do the same, unless someone thinks it is important to add this

I think you're referring to the SetTrigger function, which would be needed when creating the DOM programmatically.

@scpeters
Copy link
Member

scpeters commented Feb 10, 2022

gazebo_ros_pkgs doesn't allow the trigger topic name to be configurable. I think we can do the same, unless someone thinks it is important to add this

I think you're referring to the SetTrigger function, which would be needed when creating the DOM programmatically.

I was referring to the fact that gazebo_ros_pkgs creates the trigger topic with a hard-coded image_trigger topic name:

My question is whether the trigger topic name should be configurable

@nkoenig
Copy link
Contributor

nkoenig commented Feb 14, 2022

gazebo_ros_pkgs doesn't allow the trigger topic name to be configurable. I think we can do the same, unless someone thinks it is important to add this

I think you're referring to the SetTrigger function, which would be needed when creating the DOM programmatically.

I was referring to the fact that gazebo_ros_pkgs creates the trigger topic with a hard-coded image_trigger topic name:

My question is whether the trigger topic name should be configurable

Ahh, thanks. Yeah, that would be nice.

@scpeters
Copy link
Member

make a prerelease once this is merged to help test gazebosim/gz-sensors#194

@codecov-commenter
Copy link

codecov-commenter commented Feb 18, 2022

Codecov Report

Merging #846 (8c3bd2b) into sdf12 (5e3605f) will increase coverage by 0.01%.
The diff coverage is 100.00%.

❗ Current head 8c3bd2b differs from pull request most recent head 65375c0. Consider uploading reports for the commit 65375c0 to get more accurate results

Impacted file tree graph

@@            Coverage Diff             @@
##            sdf12     #846      +/-   ##
==========================================
+ Coverage   90.88%   90.89%   +0.01%     
==========================================
  Files          78       78              
  Lines       12636    12650      +14     
==========================================
+ Hits        11484    11498      +14     
  Misses       1152     1152              
Impacted Files Coverage Δ
src/Camera.cc 87.55% <100.00%> (+0.37%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5e3605f...65375c0. Read the comment docs.

@scpeters
Copy link
Member

did we say the trigger topic name should be configurable?

@WilliamLewww
Copy link
Contributor Author

WilliamLewww commented Feb 18, 2022

did we say the trigger topic name should be configurable?

Oh yea, I'll go add that change!

<camera>
  <triggered>true</triggered>
  <trigger_topic>/camera/trigger</trigger_topic>
  <horizontal_fov>1.05</horizontal_fov>
  <image>
    <width>256</width>
    <height>257</height>
  </image>
  <clip>
    <near>0.1</near>
    <far>10.0</far>
  </clip>
</camera>

@nkoenig nkoenig enabled auto-merge (squash) March 1, 2022 16:00
@WilliamLewww
Copy link
Contributor Author

Re-requesting review to complete auto-merge.

@azeey azeey disabled auto-merge March 1, 2022 19:36
@azeey
Copy link
Collaborator

azeey commented Mar 1, 2022

I disabled the auto-merge. In general, we prefer to have a manual merge so that the author has a chance to modify the commit message such that it concisely captures the core ideas of the pull request.

From https://ignitionrobotics.org/docs/all/contributing#process

Make sure the commit message concisely captures the core ideas of the pull request and contains all authors' signatures.

@chapulina
Copy link
Contributor

I disabled the auto-merge. In general, we prefer to have a manual merge so that the author has a chance to modify the commit message such that it concisely captures the core ideas of the pull request.

The auto-merge option allows editing the commit message, right? If the auto-merge is not working for us, we should disable it, but I think it should be compatible with our contribution process.

@azeey
Copy link
Collaborator

azeey commented Mar 1, 2022

The auto-merge option allows editing the commit message, right? If the auto-merge is not working for us, we should disable it, but I think it should be compatible with our contribution process.

Ah, it does. My mistake.

@scpeters
Copy link
Member

scpeters commented Mar 2, 2022

I think @ahcorde concerns about the tests have been addressed, so I'll merge

@scpeters scpeters dismissed ahcorde’s stale review March 2, 2022 02:28

tests have been added

@scpeters scpeters merged commit 82cac04 into gazebosim:sdf12 Mar 2, 2022
Core development automation moved this from In review to Done Mar 2, 2022
@chapulina chapulina moved this from Done to Highlights in Core development Mar 3, 2022
@osrf-triage
Copy link

This pull request has been mentioned on Gazebo Community. There might be relevant details there:

https://community.gazebosim.org/t/new-ignition-releases-2022-04-13-fortress-edifice/1367/1

@j-rivero j-rivero removed this from Highlights in Core development May 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏯 fortress Ignition Fortress
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants