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 15 -> main #1486

Merged
merged 9 commits into from
Oct 8, 2024
Merged

Merge 15 -> main #1486

merged 9 commits into from
Oct 8, 2024

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Oct 8, 2024

➡️ Forward port

Port sdf15 to main

Branch comparison: main...sdf15

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

scpeters and others added 9 commits August 26, 2024 15:42
* Bump to 15.0.0~pre1

---------

Signed-off-by: Steve Peters <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Co-authored-by: Ian Chen <[email protected]>
* Fix symbol checking test

The test that checks for prefixed binary symbols was broken when
compiled with DebWithRelInfo since it was checking debugging symbols
that broke the heuristics used.

The commit fixes it doing a couple of actions:
 - Include the length of the namespace sdf: 3sdf
 - Check only dynamic symbols being exported

Signed-off-by: Jose Luis Rivero <[email protected]>

* Update test/integration/all_symbols_have_version.bash.in

Co-authored-by: Steve Peters <[email protected]>
Signed-off-by: Jose Luis Rivero <[email protected]>

---------

Signed-off-by: Jose Luis Rivero <[email protected]>
Co-authored-by: Steve Peters <[email protected]>
(cherry picked from commit 904706c)
This makes several changes to the specification for the
//state element in SDFormat 1.12.

* //link_state changes: use pairs of vector3 datatypes to
  represent twist, spatial acceleration, and wrenches instead
  of a pose datatype, which distorts the angular values by
  interpreting them as Euler angles. The new elements for
  velocity and acceleration have names starting with linear_
  or angular_, while the replacement for wrench is force and
  torque.
* //joint_state changes: refactor //joint_state/angle and
  //joint_state/angle/@axis to //joint_state/axis_state/position
  and //joint_state/axis2_state/position. Also add velocity,
  acceleration, and effort to joint axis states.
* degrees attribute: add a boolean degrees attribute to the
  //link_state/angular_* elements and joint axis position,
  velocity, and acceleration elements. When true, this causes
  data with units involving radians to interpret it as involving
  degrees instead. The attribute does not affect prismatic joints.
* Specify model state within a model using //model/model_state
  or when including a model with //model/include/model_state
  and //state/include/model_state.

Signed-off-by: Steve Peters <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
@scpeters scpeters merged commit bcb9067 into main Oct 8, 2024
12 checks passed
@scpeters scpeters deleted the merge_15_main_20241007 branch October 8, 2024 06:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants