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

4 to 5 #877

Merged
merged 34 commits into from
Jun 25, 2021
Merged

4 to 5 #877

merged 34 commits into from
Jun 25, 2021

Conversation

ahcorde
Copy link
Contributor

@ahcorde ahcorde commented Jun 23, 2021 •
edited by chapulina
Loading

➡️ Forward port

Port 4 to 5

Branch comparison: ign-gazebo5...ign-gazebo4

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

Require gazebosim/sdformat#598

adlarkin and others added 30 commits April 29, 2021 14:16
@adlarkin
Fix documentation for EntityComponentManager::EachNew (#795)
4ee7d57 
Signed-off-by: Ashton Larkin <ashton@openrobotics.org>
@mcres @chapulina @mabelzhang
Add functionalities for optical tactile plugin (#431)
064b3ec 
Signed-off-by: Martiño Crespo <marticres@gmail.com>
Signed-off-by: Mabel Zhang <mabel@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>

Co-authored-by: Louise Poubel <louise@openrobotics.org>
Co-authored-by: Mabel Zhang <mabel@openrobotics.org>
@mcres
Contacts visualization (#234)
d3738cb 
Signed-off-by: Martiño Crespo <marticres@gmail.com>
@nkoenig
Backport #763 (#804)
86811f8 
Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
@ahcorde @mrushyendra
@chapulina @luca-della-vedova
[Backport #536 3 ⬅️ 4] Add service and GUI to configure physics param…
cceec4e 
…eters (#812)

* Add service and GUI to configure physics parameters (step size and real time factor) (#536)

Signed-off-by: Maganty Rushyendra <mrushyendra@yahoo.com.sg>
Signed-off-by: Luca Della Vedova <luca@openrobotics.org>
Signed-off-by: ahcorde <ahcorde@gmail.com>

Co-authored-by: mrushyendra <mrushyendra@yahoo.com.sg>
Co-authored-by: Louise Poubel <louise@openrobotics.org>
Co-authored-by: Luca Della Vedova <luca@openrobotics.org>
@nkoenig
Trigger delay (#817)
86fe608 
* Working on a trigger delay

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Updated tests

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Update documentation

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix spelling

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
@chapulina
Remove tools/code_check and update codecov (#814)
3d4caa8 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@Lobotuerk
Adding HaltMotion (Or new suggested name) to physics plugin (#728)
27ef720 
* tested halt motion feature

Signed-off-by: Tomas Lorente <jtlorente@ekumenlabs.com>

* added flag to turn off movement halting

Signed-off-by: Tomas Lorente <jtlorente@ekumenlabs.com>

* Moved logic into gamelogic

Signed-off-by: Tomas Lorente <jtlorente@ekumenlabs.com>

* docs

Signed-off-by: Tomas Lorente <jtlorente@ekumenlabs.com>

* moved everything into gamelogic

Signed-off-by: Tomas Lorente <jtlorente@ekumenlabs.com>

* test added

Signed-off-by: Tomas Lorente <jtlorente@ekumenlabs.com>

* Fix codecheck

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
@iche033
add conversion for particle scatter ratio field (#791)
b18f6ca 
* add conversion for particle scatter ratio field

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

* update integration test

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

* update comment

Signed-off-by: Ian Chen <ichen@osrfoundation.org>
Merging 3 to 4
20abc25 
Signed-off-by: Nate Koenig <nate@openrobotics.org>
@nkoenig
Merge pull request #828 from ignitionrobotics/3-to-4-2021-05-20
6619271 
3 to 4 2021 05 20
@nkoenig
Prepare for 4.9.0 release (#829)
996684c 
Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
@nkoenig
Make halt motiona act like a brake (#830)
be5581f 
Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
@nkoenig
4.9.1 prep (#831)
c970caf 
Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
@ahcorde
Use moveToHelper from ign-rendering (#825)
0cacbd5 
Signed-off-by: ahcorde <ahcorde@gmail.com>
@ahcorde
Remove unused headers in video_recoder plugin (#834)
3480302 
Signed-off-by: ahcorde <ahcorde@gmail.com>
@ahcorde @mjcarroll
Removed duplicated code with rendering::sceneFromFirstRenderEngine (#819
65e8b04 
)

Signed-off-by: ahcorde <ahcorde@gmail.com>

Co-authored-by: Michael Carroll <michael@openrobotics.org>
@ahcorde
Cleanup and alphabetize plugin headers (#838)
ee895b8 
Signed-off-by: ahcorde <ahcorde@gmail.com>
@LolaSegura
Using math::SpeedLimiter on the ackermann_steering controller. (#837)
657ca6d 
Signed-off-by: LolaSegura <lsegura@ekumenlabs.com>
@iche033
remove unneeded check (#857)
5694336 
Signed-off-by: Ian Chen <ichen@osrfoundation.org>
@jennuine
added follow camera offset service (#855)
31676f5 
Signed-off-by: Jenn Nguyen <jenn@openrobotics.org>
@adlarkin
Fix potentially flaky integration component test case (#848)
5a3b1b8 
Signed-off-by: Ashton Larkin <ashton@openrobotics.org>
@iche033
Add Particle Emitter tutorial (#860)
24d8949 
* add initial draft

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

* fix scatter ratio image path, minor tweaks

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

* formatting

Signed-off-by: Ian Chen <ichen@osrfoundation.org>
@Blast545
Fix WindEffects Plugin bug, not configuring new links (#844)
44f2e92 
* Fix issue not configuring links added after start

Signed-off-by: Jorge Perez <jjperez@ekumenlabs.com>

* Add a test checking the fix

Signed-off-by: Jorge Perez <jjperez@ekumenlabs.com>
@chapulina
New example: get an ECM snapshot from an external program (#859)
7c6c70a 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@LolaSegura @chapulina
@francocipollone @scpeters
Using math::SpeedLimiter on the diff_drive controller. (#833)
7876ca3 
* Change the diff_drive_system test to cover min_acceleration
  and min_velocity limits. Added those limits to the .sdf file.

Signed-off-by: LolaSegura <lsegura@ekumenlabs.com>

Co-authored-by: Louise Poubel <louise@openrobotics.org>
Co-authored-by: Franco Cipollone <53065142+francocipollone@users.noreply.github.com>
Co-authored-by: Steve Peters <scpeters@openrobotics.org>
@chapulina @ahcorde
Depend on ign-rendering 3.5 (#867)
8abfc3b 
Signed-off-by: Louise Poubel <louise@openrobotics.org>

Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
@francocipollone
Enables confirmation dialog when closing Gazebo. (#850)
fada73c 
Signed-off-by: Franco Cipollone <franco.c@ekumenlabs.com>
@adlarkin
Refactor RenderUtil::Update with helper functions (#858)
a1ebffa 
Signed-off-by: Ashton Larkin <ashton@openrobotics.org>
@jennuine
Set gui camera pose (#863)
483684f 
Signed-off-by: Jenn Nguyen <jenn@openrobotics.org>
Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
@github-actions github-actions bot added the 🏢 edifice Ignition Edifice label Jun 23, 2021
@chapulina chapulina added the needs upstream release Blocked by a release of an upstream library label Jun 23, 2021
This was referenced Jun 23, 2021
Merged
Merged
chapulina added a commit that referenced this pull request Jun 23, 2021
@chapulina
Depend on SDF 11.2, rendering 5.1 and GUI 5.1 (#877)
7983d2d 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina
Copy link
Contributor

There are multiple new test failures that seem to be related to slip (ackermann, diff drive, wheel slip...). Do you know if we need a new ign-physics release to fix those, @scpeters ?

@chapulina
Depend on SDF 11.2, rendering 5.1 and GUI 5.1. Fix Windows. (#877)
acc627a 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@scpeters
Copy link
Member

There are multiple new test failures that seem to be related to slip (ackermann, diff drive, wheel slip...). Do you know if we need a new ign-physics release to fix those, @scpeters ?

it could be related to the SpeedLimiter changes in #833 and #837 (cc @LolaSegura @francocipollone). I'll take a look this afternoon

@chapulina chapulina removed the needs upstream release Blocked by a release of an upstream library label Jun 24, 2021
@chapulina chapulina mentioned this pull request Jun 25, 2021
Closed
@chapulina
Copy link
Contributor

I'm not being able to reproduce this locally, I've tried a few different combinations of branches and dependencies.

I re-ran CI for the ign-gazebo5 branch, and it looks like the tests started failing there:

https://github.com/ignitionrobotics/ign-gazebo/runs/2916861022?check_suite_focus=true

  The following tests FAILED:
  	 51 - INTEGRATION_ackermann_steering_system (Failed)
  	 61 - INTEGRATION_breadcrumbs (Failed)
  	 73 - INTEGRATION_diff_drive_system (Failed)
  	107 - INTEGRATION_logical_camera_system (Failed)
  	129 - INTEGRATION_performer_detector (Failed)
  	131 - INTEGRATION_physics_system (Failed)
  	155 - INTEGRATION_wheel_slip (Failed)

The good news is that the failures are not introduced by this PR. The bad news is that we have all these new test failures to deal with.

I suggest we ignore these failures for this PR, and look into them on top of the release branches.

For completeness, I've triggered Jenkins CI for all stable branches:

  • ign-gazebo5: Build Status
  • ign-gazebo4: Build Status
  • ign-gazebo3: Build Status

@chapulina
Copy link
Contributor

I've triggered Jenkins CI for all stable branches:

Well, at least the failures are happening only on Edifice.

chapulina
chapulina approved these changes Jun 25, 2021
View reviewed changes
Copy link
Contributor

@chapulina chapulina left a comment

Choose a reason for hiding this comment

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

LGTM, I didn't notice any new test failures and the changes look ok.

@chapulina chapulina merged commit ee6a29e into ign-gazebo5 Jun 25, 2021
@chapulina chapulina deleted the ahcorde/4_to_5 branch June 25, 2021 22:24
@ibrahiminfinite ibrahiminfinite mentioned this pull request Jun 28, 2021
Closed
This was referenced Jun 28, 2021
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chapulina chapulina chapulina approved these changes

@azeey azeey Awaiting requested review from azeey azeey is a code owner

@iche033 iche033 Awaiting requested review from iche033 iche033 is a code owner

Assignees
No one assigned
Labels
🏢 edifice Ignition Edifice
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.