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.

Sign up for GitHub

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

Jump to bottom

7 -> main #347

Merged
merged 41 commits into from
May 25, 2023
Merged

7 -> main #347

merged 41 commits into from
May 25, 2023

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented May 24, 2023

➡️ Forward port

Port gz-sensors7 to main

Branch comparison: main...gz-sensors7

Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)

methylDragon and others added 30 commits November 30, 2022 13:29
@methylDragon
ign -> gz Migrate Ignition Headers : gz-sensors (#260)
36f5d84 
* Migrate headers

Signed-off-by: methylDragon <[email protected]>

* Add redirection headers

Signed-off-by: methylDragon <[email protected]>

* Migrate include statements

Signed-off-by: methylDragon <[email protected]>

* Leave ignition as primary in headers to fix ABI

Signed-off-by: methylDragon <[email protected]>

* Update ignition names

Signed-off-by: Nate Koenig <[email protected]>

* tweaks

Signed-off-by: Nate Koenig <[email protected]>

Signed-off-by: methylDragon <[email protected]>
Signed-off-by: Nate Koenig <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>
@nkoenig
3.5.0 pre1 (#291)
f677195 
Signed-off-by: Nate Koenig <[email protected]>

Signed-off-by: Nate Koenig <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>
@nkoenig
3.5.0 release (#292)
425359e 
Signed-off-by: Nate Koenig <[email protected]>

Signed-off-by: Nate Koenig <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>
Initial merge
eb35d4b 
Signed-off-by: Nate Koenig <[email protected]>
Forward port 3 to 6
55e9974 
Signed-off-by: Nate Koenig <[email protected]>
@iche033
fix links
1f75c5f 
Signed-off-by: Ian Chen <[email protected]>
@ahcorde
Merge pull request #313 from gazebosim/nkoenig/3-to-6-20230130
e0e73b9 
Forward port 3 to 6
@iche033
set custom projection values from sdf
7872955 
Signed-off-by: Ian Chen <[email protected]>
@iche033
remove debug img
5b9d804 
Signed-off-by: Ian Chen <[email protected]>
@iche033
CMakel tweak
98288bd 
Signed-off-by: Ian Chen <[email protected]>
@iche033
Merge branch 'gz-sensors7' into set_projection
7887703
@ahcorde
Merge branch 'gz-sensors7' into set_projection
2b10b48
@iche033
floating point values
0d7a5ff 
Signed-off-by: Ian Chen <[email protected]>
@iche033
Merge branch 'gz-sensors7' into set_projection
b6b4187
@nkoenig
6.7.0 prerelease (#320)
b13bf0d 
Signed-off-by: Nate Koenig <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>
@iche033 @ahcorde
Merge pull request #314 from gazebosim/set_projection
d6568aa 
This PR allows users to specify custom camera projection using the <projection> values from SDF (in addition to <instrinscs>, see #293).

Also bumped sdformat dep version as it need gazebosim/sdformat#1203

---------

Signed-off-by: Ian Chen <[email protected]>
Co-authored-by: Alejandro Hernández Cordero <[email protected]>
@ahcorde @iche033
Added Camera Info topic support for cameras (#285)
898570d 
* Added Camera Info topic support for cameras

---------

Signed-off-by: ahcorde <[email protected]>
Signed-off-by: Alejandro Hernández Cordero <[email protected]>
Co-authored-by: Ian Chen <[email protected]>
@nkoenig
6.7.0 release (#323)
d2dff1a 
Signed-off-by: Nate Koenig <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>
@iche033
clean up rendering resources (#324)
e03feb1 
Signed-off-by: Ian Chen <[email protected]>
@vvasco
Added trigger to BoundingBoxCamera (#322)
0bab350 
This adds the possibility to trigger a BoundingBoxCamera.
---------
Signed-off-by: Valentina Vasco <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Co-authored-by: Ian Chen <[email protected]>
@iche033
Fix Camera info test (#326)
6c24247 
* fix camera info test

---------

Signed-off-by: Ian Chen <[email protected]>
@iche033
Merge branch 'ign-sensors3' into merge_3_6_20230224
fc7fa51
@iche033
Fix flaky triggered bounding box camera test (#329)
2d52be7 
Signed-off-by: Ian Chen <[email protected]>
@iche033
merge from ign-sensors6
42335b0 
Signed-off-by: Ian Chen <[email protected]>
@iche033
Fix links in Changelog (#330)
07d3e0f 
Signed-off-by: Ian Chen <[email protected]>
@iche033
Merge pull request #327 from gazebosim/merge_3_6_20230224
187ee0e 
3 -> 6
@iche033
Merge branch 'ign-sensors6' into merge_6_7_20230301
8ae2717
@iche033
6 -> 7
140950a 
6 -> 7
@scpeters
Rename COPYING to LICENSE (#334)
632804a 
The LICENSE file contained a copy of the stanze
used at the top of source code files, while the
actual license was in the COPYING file. So remove
the stanza and put the actual Apache 2.0 license text
in LICENSE.

Similar to gazebosim/gz-math#521.

Signed-off-by: Steve Peters <[email protected]>
@scpeters
CI workflow: use checkout v3 (#335)
cb18240 
Version v2 of the actions/checkout workflow is deprecated,
so switch to v3.

Part of gazebo-tooling/release-tools#862.

Signed-off-by: Steve Peters <[email protected]>
scpeters and others added 11 commits March 24, 2023 14:41
@scpeters
Merge branch 'ign-sensors3' into scpeters/merge_3_6
894652f
@mjcarroll
port: ign-sensors3 -> ign-sensors6 (#337)
f25ac3c 
Merge ign-sensors3 ➡️  ign-sensors6

Signed-off-by: Michael Carroll <[email protected]>
@scpeters
Merge branch 'ign-sensors6' into scpeters/merge_6_7
0885b4d
@iche033
Merge pull request #338 from gazebosim/scpeters/merge_6_7
e19d8c2 
Merge ign-sensors6 ➡️  gz-sensors7
@iche033
destroy sensor in destructor (#340)
d412d9d 
Signed-off-by: Ian Chen <[email protected]>
@iche033
prepare for 7.2.0 release (#341)
ab0659b 
Signed-off-by: Ian Chen <[email protected]>
@azeey
Update version number in Changelog (#344)
7f864e5 
Signed-off-by: Addisu Z. Taddese <[email protected]>
@iche033
Generate default trigger topic name if empty (#343)
49d9aaa 

Signed-off-by: Ian Chen <[email protected]>
@iche033
Fix flaky trigger camera test (#346)
f88ac60 
Signed-off-by: Ian Chen <[email protected]>
@tejalbarnwal
Add support for bayer images to camera sensor (#336)
60dac3d 
Signed-off-by: tejalbarnwal <[email protected]>
@iche033
merge from gz-sensors7
aefadf9 
Signed-off-by: Ian Chen <[email protected]>
@github-actions github-actions bot added the 🎵 harmonic Gazebo Harmonic label May 24, 2023
@iche033 iche033 changed the title Merge 7 main 20230524 7 -> main May 24, 2023
@codecov
Copy link

codecov bot commented May 24, 2023

Codecov Report

Merging #347 (2bcaa88) into main (4075656) will decrease coverage by 0.13%.
The diff coverage is 60.75%.

❗ Current head 2bcaa88 differs from pull request most recent head aefadf9. Consider uploading reports for the commit aefadf9 to get more accurate results

@@            Coverage Diff             @@
##             main     #347      +/-   ##
==========================================
- Coverage   72.08%   71.95%   -0.13%     
==========================================
  Files          38       38              
  Lines        4800     4868      +68     
==========================================
+ Hits         3460     3503      +43     
- Misses       1340     1365      +25
Impacted Files Coverage Δ
src/CameraSensor.cc 75.92% <48.14%> (-3.97%) ⬇️
src/BoundingBoxCameraSensor.cc 62.04% <87.50%> (+3.93%) ⬆️
src/RenderingSensor.cc 97.50% <100.00%> (ø)

... and 1 file with indirect coverage changes

@iche033
Copy link
Contributor Author

iche033 commented May 24, 2023 •
edited
Loading

INTEGRATION_dvl rendering test is failing. I think it's been failing on main on Jammy github actions for a while along with other rendering tests. The other rendering test failures were fixed in #324 but dvl is added in harmonic so it's not been addressed yet.

@iche033 iche033 merged commit e1a8c1f into main May 25, 2023
@iche033 iche033 deleted the merge_7_main_20230524 branch May 25, 2023 16:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ahcorde ahcorde ahcorde approved these changes

@mjcarroll mjcarroll mjcarroll approved these changes

Assignees
No one assigned
Labels
🎵 harmonic Gazebo Harmonic
Projects
Core development
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@iche033 @mjcarroll @ahcorde @methylDragon @nkoenig @vvasco @scpeters @azeey @tejalbarnwal