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

Merge ign-gazebo6 ➡️ gz-sim7 #1676

Merged
merged 17 commits into from
Oct 6, 2022
Merged

Merge ign-gazebo6 ➡️ gz-sim7 #1676

merged 17 commits into from
Oct 6, 2022

Conversation

chapulina
Copy link
Contributor

➡️ Forward port

Port ign-gazebo6 ➡️ gz-sim7

Branch comparision: gz-sim7...ign-gazebo6

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

AzulRadio and others added 13 commits August 11, 2022 16:47
* Replace pose in ViewAngle with GzPose

Signed-off-by: youhy <[email protected]>
* implement Pose3d with GzPose

Signed-off-by: youhy <[email protected]>
Co-authored-by: Jenn Nguyen <[email protected]>
* replace PlotIcon with GzPlotIcon for Light.qml

* replace PlotIcon with GzPlotIcon for Physics.qml

* replace PlotIcon with GzPlotIcon for SphericalCoordinates.qml

Signed-off-by: youhy <[email protected]>
* Replace color widgets for Light.qml with GzColor

* Replace color widgets for Material.qml with GzColor

Signed-off-by: youhy <[email protected]>
Co-authored-by: Jenn Nguyen <[email protected]>
By specifying the log record period, the user is able to control how often the simulator records states. A new command line arg --record-period is added (gazebo-classic also has the same arg name)

Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
* prep for 6.11.0 release

Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
* ball drop test

Signed-off-by: Dharini Dutia <[email protected]>

* applied feedback

Signed-off-by: Dharini Dutia <[email protected]>

* added world force

Signed-off-by: Dharini Dutia <[email protected]>

* typo

Signed-off-by: Dharini Dutia <[email protected]>

* updating upstream from lrauv

Signed-off-by: Dharini Dutia <[email protected]>

* fixing mass, inertia and drag coeff

Signed-off-by: Dharini Dutia <[email protected]>

* velocity and transform tests with multiple models

Signed-off-by: Dharini Dutia <[email protected]>

* fix cpplint

Signed-off-by: Dharini Dutia <[email protected]>

* feedback

Signed-off-by: Dharini Dutia <[email protected]>

* reverting to old stateDot

Signed-off-by: Dharini Dutia <[email protected]>

Signed-off-by: Dharini Dutia <[email protected]>
Adding some API docs for changes from #1076

Signed-off-by: Kenji Brameld <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
@github-actions github-actions bot added the 🌱 garden Ignition Garden label Aug 29, 2022
@chapulina chapulina marked this pull request as draft August 29, 2022 22:19
@chapulina
Copy link
Contributor Author

Keeping it as draft because there are features mixed in, and we're in feature freeze. I'm going to cherry-pick #1643 which is a bug fix I need on Jammy.

@nkoenig nkoenig marked this pull request as ready for review October 6, 2022 16:45
Signed-off-by: Nate Koenig <[email protected]>
@nkoenig nkoenig mentioned this pull request Oct 6, 2022
8 tasks
Nate Koenig added 3 commits October 6, 2022 11:06
Signed-off-by: Nate Koenig <[email protected]>
Signed-off-by: Nate Koenig <[email protected]>
Signed-off-by: Nate Koenig <[email protected]>
@codecov
Copy link

codecov bot commented Oct 6, 2022

Codecov Report

Merging #1676 (6a8594b) into gz-sim7 (e7dfa29) will increase coverage by 0.27%.
The diff coverage is 67.56%.

@@             Coverage Diff             @@
##           gz-sim7    #1676      +/-   ##
===========================================
+ Coverage    63.88%   64.16%   +0.27%     
===========================================
  Files          334      335       +1     
  Lines        26346    26508     +162     
===========================================
+ Hits         16831    17008     +177     
+ Misses        9515     9500      -15     
Impacted Files Coverage Δ
include/gz/sim/ServerConfig.hh 100.00% <ø> (ø)
.../plugins/component_inspector/ComponentInspector.cc 5.78% <0.00%> (+0.29%) ⬆️
...stems/joint_state_publisher/JointStatePublisher.hh 100.00% <ø> (ø)
src/gz.cc 65.19% <80.00%> (+0.22%) ⬆️
src/systems/scene_broadcaster/SceneBroadcaster.cc 92.21% <83.33%> (-0.27%) ⬇️
src/EntityComponentManager.cc 90.04% <100.00%> (+0.02%) ⬆️
src/ServerConfig.cc 82.92% <100.00%> (+0.59%) ⬆️
src/ServerPrivate.cc 82.96% <100.00%> (+0.15%) ⬆️
src/systems/hydrodynamics/Hydrodynamics.cc 89.26% <100.00%> (ø)
src/systems/log/LogRecord.cc 79.23% <100.00%> (+1.00%) ⬆️
... and 2 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@nkoenig nkoenig merged commit 1258c52 into gz-sim7 Oct 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🌱 garden Ignition Garden
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

7 participants