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

5 -> 6 #1322

Merged
merged 14 commits into from
Feb 7, 2022
Merged

5 -> 6 #1322

merged 14 commits into from
Feb 7, 2022

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Feb 4, 2022 •
edited
Loading

➡️ Forward port

Port ign-gazebo5 to ign-gazebo6

Branch comparison: ign-gazebo6...ign-gazebo5

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

chapulina and others added 9 commits December 22, 2021 10:46
@chapulina
🎈 4.14.0 (#1261)
2a076e9 
Signed-off-by: Louise Poubel <[email protected]>
@chapulina
Prevent GzScene3D 💥 if another scene is already loaded (#1294)
6f58c91 
Signed-off-by: Louise Poubel <[email protected]>
@chapulina
Remove EachNew calls from sensor PreUpdates (#1281)
650b746 
Signed-off-by: Louise Poubel <[email protected]>
@chapulina
Buoyancy: fix center of volume's reference frame (#1302)
749884d 
Signed-off-by: Louise Poubel <[email protected]>
@arjo129
Log an error if JointPositionController cannot find the joint. (citad…
ebb3a9a 
…el retarget) (#1314)

In the event a user enters the wrong name for a certain joint, the JointPositionController system will silently fail. This PR adds a simple error message that tells the user that the joint was not found.

Signed-off-by: Arjo Chakravarty <[email protected]>
@chapulina
3 ➡️ 5
37a3a46 
Signed-off-by: Louise Poubel <[email protected]>
@iche033
Merge pull request #1315 from ignitionrobotics/chapulina/3_to_5
c8d3f06 
3 ➡️ 5
@iche033
Limit thruster system's input thrust cmd (#1318)
986e30f 
* limit thrust cmd

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

* check and error when max < min

Signed-off-by: Ian Chen <[email protected]>
@iche033
merge from ign-gazebo5
6ec4ae2 
Signed-off-by: Ian Chen <[email protected]>
@iche033 iche033 requested a review from chapulina as a code owner February 4, 2022 05:28
@github-actions github-actions bot added the 🏯 fortress Ignition Fortress label Feb 4, 2022
@iche033
Copy link
Contributor Author

iche033 commented Feb 4, 2022

looks like the changes from #1302 broke the BuoyancyTest.RestoringMoments test in ign-gazebo6. Locally the test fails with this output:

/home/ian/code/ign_f_ws2/src/ign-gazebo/test/integration/buoyancy.cc:159: Failure
The difference between minUniformRoll and -0.15 is 0.10002078209942011, which exceeds 1e-1, where
minUniformRoll evaluates to -0.049979217900579881,
-0.15 evaluates to -0.14999999999999999, and
1e-1 evaluates to 0.10000000000000001.

Maybe @arjo129 has an idea on what causes this failure?

@iche033
Copy link
Contributor Author

iche033 commented Feb 4, 2022 •
edited
Loading

looks like the changes from #1302 broke the BuoyancyTest.RestoringMoments test in ign-gazebo6. Locally the test fails with this output:

I increased the tolerance by a small amount (3e-5) for the test to pass in 756fa13. Let me know if that's not the right thing to do.

@codecov
Copy link

codecov bot commented Feb 4, 2022 •
edited
Loading

Codecov Report

Merging #1322 (a98f044) into ign-gazebo6 (1ef2c62) will decrease coverage by 0.00%.
The diff coverage is 68.60%.

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

Impacted file tree graph

@@               Coverage Diff               @@
##           ign-gazebo6    #1322      +/-   ##
===============================================
- Coverage        62.05%   62.05%   -0.01%     
===============================================
  Files              278      278              
  Lines            23315    23370      +55     
===============================================
+ Hits             14469    14502      +33     
- Misses            8846     8868      +22
Impacted Files Coverage Δ
...clude/ignition/gazebo/components/CenterOfVolume.hh 100.00% <ø> (ø)
...int_position_controller/JointPositionController.cc 71.85% <0.00%> (-2.20%) ⬇️
src/systems/air_pressure/AirPressure.cc 72.15% <69.23%> (-1.09%) ⬇️
src/systems/altimeter/Altimeter.cc 72.83% <69.23%> (-1.14%) ⬇️
src/systems/logical_camera/LogicalCamera.cc 74.41% <69.23%> (-1.23%) ⬇️
src/systems/magnetometer/Magnetometer.cc 70.11% <69.23%> (-0.78%) ⬇️
src/systems/imu/Imu.cc 71.73% <71.42%> (-0.88%) ⬇️
src/systems/thruster/Thruster.cc 90.26% <75.00%> (-1.82%) ⬇️
src/systems/buoyancy/Buoyancy.cc 82.52% <100.00%> (-0.09%) ⬇️

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 1ef2c62...2b409b0. Read the comment docs.

arjo129
arjo129 approved these changes Feb 7, 2022
View reviewed changes
Copy link
Contributor

@arjo129 arjo129 left a comment

Choose a reason for hiding this comment

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

Tested this and seems to work. LGTM.

@iche033 iche033 merged commit eeb80cd into ign-gazebo6 Feb 7, 2022
@iche033 iche033 deleted the merge_5_6_20220203 branch February 7, 2022 22:20
@iche033 iche033 mentioned this pull request Feb 14, 2022
Merged
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nkoenig nkoenig nkoenig approved these changes

@arjo129 arjo129 arjo129 approved these changes

@chapulina chapulina Awaiting requested review from chapulina

Assignees
No one assigned
Labels
🏯 fortress Ignition Fortress
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@iche033 @arjo129 @nkoenig @chapulina