Skip to content

Commit

Permalink
more fixes, new version of script
Browse files Browse the repository at this point in the history
Signed-off-by: Louise Poubel <[email protected]>
  • Loading branch information
chapulina committed Apr 17, 2020
1 parent 9fa00ae commit d6f4e7f
Show file tree
Hide file tree
Showing 7 changed files with 127 additions and 127 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ set (CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
# to choose the flag -std=gnu++14 instead of -std=c++14 when the C++14
# features are requested. Explicitly turning this flag off will force cmake to
# choose -std=c++14.
# See https://bitbucket.org/ignitionrobotics/ign-cmake/issues/13 for more info.
# See https://github.com/ignitionrobotics/ign-cmake/issues/13 for more info.
set(CMAKE_CXX_EXTENSIONS off)

# Include GNUInstallDirs to get canonical paths
Expand Down
160 changes: 80 additions & 80 deletions Changelog.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion INSTALL_WIN32.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Windows `cmd` for configuring and building.

1. Clone sdformat

hg clone https://bitbucket.org/osrf/sdformat
git clone https://github.com/osrf/sdformat

1. Load your compiler setup, e.g. (note that we are asking for the 64-bit toolchain here):

Expand Down
84 changes: 42 additions & 42 deletions Migration.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ but with improved human-readability..

1. + Change installation path of SDF description files to allow side-by-side installation.
+ `{prefix}/share/sdformat/1.*/*.sdf` -> `{prefix}/share/sdformat8/1.*/*.sdf`
+ [pull request 538](https://bitbucket.org/osrf/sdformat/pull-requests/538)
+ [BitBucket pull request 538](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/538)

## SDFormat 5.x to 6.x

Expand Down Expand Up @@ -170,22 +170,22 @@ but with improved human-readability..
1. **`gravity` and `magnetic_field` elements are moved from `physics` to `world`**
+ In physics element: gravity and `magnetic_field` tags have been moved
from Physics to World element.
+ [pull request 247](https://bitbucket.org/osrf/sdformat/pull-requests/247)
+ [gazebo pull request 2090](https://bitbucket.org/osrf/gazebo/pull-requests/2090)
+ [BitBucket pull request 247](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/247)
+ [gazebo pull request 2090](https://osrf-migration.github.io/gazebo-gh-pages/#!/osrf/gazebo/pull-requests/2090)

1. **New noise for IMU**
+ A new style for representing the noise properties of an `imu` was implemented
in [pull request 199](https://bitbucket.org/osrf/sdformat/pull-requests/199)
in [BitBucket pull request 199](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/199)
for sdf 1.5 and the old style was declared as deprecated.
The old style has been removed from sdf 1.6 with the conversion script
updating to the new style.
+ [pull request 199](https://bitbucket.org/osrf/sdformat/pull-requests/199)
+ [pull request 243](https://bitbucket.org/osrf/sdformat/pull-requests/243)
+ [pull request 244](https://bitbucket.org/osrf/sdformat/pull-requests/244)
+ [BitBucket pull request 199](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/199)
+ [BitBucket pull request 243](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/243)
+ [BitBucket pull request 244](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/244)

1. **Lump:: prefix in link names**
+ Changed to `_fixed_joint_lump__` to avoid confusion with scoped names
+ [Pull request 245](https://bitbucket.org/osrf/sdformat/pull-request/245)
+ [BitBucket pull request 245](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-request/245)

## SDF protocol 1.6 to 1.7

Expand All @@ -198,7 +198,7 @@ but with improved human-readability..
+ type: string
+ default: ""
+ required: *
+ [pull request 603](https://bitbucket.org/osrf/sdformat/pull-requests/603)
+ [BitBucket pull request 603](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/603)

1. **joint.sdf** `//axis/xyz/@expressed_in` and `//axis2/xyz/@expressed_in` attributes
+ description: The name of the frame in which the `//axis/xyz` value is
Expand All @@ -208,7 +208,7 @@ but with improved human-readability..
+ type: string
+ default: ""
+ required: 0
+ [pull request 589](https://bitbucket.org/osrf/sdformat/pull-requests/589)
+ [BitBucket pull request 589](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/589)

1. **model.sdf** `//model/@canonical_link` attribute
+ description: The name of the canonical link in this model to which the
Expand All @@ -218,17 +218,17 @@ but with improved human-readability..
+ type: string
+ default: ""
+ required: 0
+ [pull request 601](https://bitbucket.org/osrf/sdformat/pull-requests/601)
+ [BitBucket pull request 601](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/601)

1. **world.sdf** `//world/frame` element is now allowed.
+ [pull request 603](https://bitbucket.org/osrf/sdformat/pull-requests/603)
+ [BitBucket pull request 603](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/603)

### Modifications

1. A non-static model must have at least one link, as specified in the
[proposal](http://sdformat.org/tutorials?tut=pose_frame_semantics_proposal&cat=pose_semantics_docs&#2-model-frame-and-canonical-link).
+ [pull request 601](https://bitbucket.org/osrf/sdformat/pull-requests/601)
+ [pull request 626](https://bitbucket.org/osrf/sdformat/pull-requests/626)
+ [BitBucket pull request 601](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/601)
+ [BitBucket pull request 626](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/626)

1. Unique names for all sibling elements:
+ As described in the [proposal](http://sdformat.org/tutorials?tut=pose_frame_semantics_proposal&cat=pose_semantics_docs&#3-2-unique-names-for-all-sibling-elements),
Expand All @@ -238,7 +238,7 @@ but with improved human-readability..
Some existing SDFormat models may not comply with this requirement.
The `ign sdf --check` command can be used to identify models that violate
this requirement.
+ [pull request 600](https://bitbucket.org/osrf/sdformat/pull-requests/600)
+ [BitBucket pull request 600](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/600)

1. Reserved names:
+ As described in the [proposal](http://sdformat.org/tutorials?tut=pose_frame_semantics_proposal&cat=pose_semantics_docs&#3-3-reserved-names),
Expand All @@ -253,10 +253,10 @@ but with improved human-readability..
for implicit model / world frames, respectively).

1. **joint.sdf** `//joint/child` may no longer be specified as `world`.
+ [pull request 634](https://bitbucket.org/osrf/sdformat/pull-requests/634)
+ [BitBucket pull request 634](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/634)

1. **pose.sdf** `//pose/@frame` attribute is renamed to `//pose/@relative_to`.
+ [pull request 597](https://bitbucket.org/osrf/sdformat/pull-requests/597)
+ [BitBucket pull request 597](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/597)

### Removals

Expand All @@ -278,33 +278,33 @@ but with improved human-readability..
+ projector
+ sensor
+ visual
+ [pull request 603](https://bitbucket.org/osrf/sdformat/pull-requests/603)
+ [BitBucket pull request 603](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/603)

1. **actor.sdf** `static` element was deprecated in
[pull request 280](https://bitbucket.org/osrf/sdformat/pull-requests/280)
[BitBucket pull request 280](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/280)
and is now removed.
+ [pull request 588](https://bitbucket.org/osrf/sdformat/pull-requests/588)
+ [BitBucket pull request 588](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/588)

1. **imu.sdf** `topic` element was deprecated in
[pull request 532](https://bitbucket.org/osrf/sdformat/pull-requests/532)
[BitBucket pull request 532](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/532)
and is now removed.
+ [pull request 588](https://bitbucket.org/osrf/sdformat/pull-requests/588)
+ [BitBucket pull request 588](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/588)

1. **joint.sdf** `//axis/use_parent_model_frame` and `//axis2/use_parent_model_frame` elements
are removed in favor of the `//axis/xyz/@expressed_in` and
`//axis2/xyz/@expressed_in` attributes.
When migrating from sdf 1.6, a `use_parent_model_frame` value
of `true` will be mapped to a value of `__model__` for the `expressed_in`
attribute.
+ [pull request 589](https://bitbucket.org/osrf/sdformat/pull-requests/589)
+ [BitBucket pull request 589](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/589)

1. **joint.sdf** `//physics/ode/provide_feedback` was deprecated in
[pull request 38](https://bitbucket.org/osrf/sdformat/pull-requests/38)
[BitBucket pull request 38](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/38)
and is now removed.
+ [pull request 588](https://bitbucket.org/osrf/sdformat/pull-requests/588)
+ [BitBucket pull request 588](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/588)

1. **world.sdf** `//world/joint` was removed as it has never been used.
+ [pull request 637](https://bitbucket.org/osrf/sdformat/pull-requests/637)
+ [BitBucket pull request 637](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/637)

## SDF protocol 1.5 to 1.6

Expand All @@ -320,82 +320,82 @@ but with improved human-readability..
+ min: 0.0
+ max: 1.0
+ required: 0
+ [pull request 466](https://bitbucket.org/osrf/sdformat/pull-requests/466)
+ [BitBucket pull request 466](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/466)

1. **camera.sdf** `depth_camera/clip` sub-elements: `near`, `far`
+ description: Clipping parameters for depth camera on rgbd camera sensor.
+ [pull request 628](https://bitbucket.org/osrf/sdformat/pull-requests/628)
+ [BitBucket pull request 628](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/628)

1. **camera.sdf** `intrinsics` sub-elements: `fx`, `fy`, `cx`, `cy`, `s`
+ description: Camera intrinsic parameters for setting a custom perspective projection matrix.
+ [pull request 496](https://bitbucket.org/osrf/sdformat/pull-requests/496)
+ [BitBucket pull request 496](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/496)

1. **link.sdf** `enable_wind` element
+ description: If true, the link is affected by the wind
+ type: bool
+ default: false
+ required: 0
+ [pull request 240](https://bitbucket.org/osrf/sdformat/pull-requests/240)
+ [BitBucket pull request 240](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/240)

1. **link.sdf** `light` element
+ included from `light.sdf` with `required="*"`,
so a link can have any number of attached lights.
+ [pull request 373](https://bitbucket.org/osrf/sdformat/pull-requests/373)
+ [BitBucket pull request 373](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/373)

1. **model.sdf** `enable_wind` element
+ description: If set to true, all links in the model will be affected by
the wind. Can be overriden by the link wind property.
+ type: bool
+ default: false
+ required: 0
+ [pull request 240](https://bitbucket.org/osrf/sdformat/pull-requests/240)
+ [BitBucket pull request 240](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/240)

1. **model_state.sdf** `scale` element
+ description: Scale for the 3 dimensions of the model.
+ type: vector3
+ default: "1 1 1"
+ required: 0
+ [pull request 246](https://bitbucket.org/osrf/sdformat/pull-requests/246)
+ [BitBucket pull request 246](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/246)

1. **physics.sdf** `dart::collision_detector` element
+ description: The collision detector for DART to use.
Can be dart, fcl, bullet or ode.
+ type: string
+ default: fcl
+ required: 0
+ [pull request 440](https://bitbucket.org/osrf/sdformat/pull-requests/440)
+ [BitBucket pull request 440](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/440)

1. **physics.sdf** `dart::solver::solver_type` element
+ description: The DART LCP/constraint solver to use.
Either dantzig or pgs (projected Gauss-Seidel)
+ type: string
+ default: dantzig
+ required: 0
+ [pull request 369](https://bitbucket.org/osrf/sdformat/pull-requests/369)
+ [BitBucket pull request 369](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/369)

1. **physics.sdf** `island_threads` element under `ode::solver`
+ description: Number of threads to use for "islands" of disconnected models.
+ type: int
+ default: 0
+ required: 0
+ [pull request 380](https://bitbucket.org/osrf/sdformat/pull-requests/380)
+ [BitBucket pull request 380](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/380)

1. **physics.sdf** `thread_position_correction` element under `ode::solver`
+ description: Flag to use threading to speed up position correction computation.
+ type: bool
+ default: 0
+ required: 0
+ [pull request 380](https://bitbucket.org/osrf/sdformat/pull-requests/380)
+ [BitBucket pull request 380](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/380)

1. **sonar.sdf** `geometry` element
+ description: The sonar collision shape. Currently supported geometries are: "cone" and "sphere".
+ type: string
+ default: "cone"
+ required: 0
+ [pull request 495](https://bitbucket.org/osrf/sdformat/pull-requests/495)
+ [BitBucket pull request 495](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/495)

1. **state.sdf** allow `light` tags within `insertions` element
* [pull request 325](https://bitbucket.org/osrf/sdformat/pull-request/325)
* [BitBucket pull request 325](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-request/325)

1. **surface.sdf** `category_bitmask` element
+ description: Bitmask for category of collision filtering.
Expand All @@ -404,16 +404,16 @@ but with improved human-readability..
+ type: unsigned int
+ default: 65535
+ required: 0
+ [pull request 318](https://bitbucket.org/osrf/sdformat/pull-requests/318)
+ [BitBucket pull request 318](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/318)

1. **world.sdf** `wind` element
+ description: The wind tag specifies the type and properties of the wind.
+ required: 0
+ [pull request 240](https://bitbucket.org/osrf/sdformat/pull-requests/240)
+ [BitBucket pull request 240](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/240)

1. **world.sdf** `wind::linear_velocity` element
+ description: Linear velocity of the wind.
+ type: vector3
+ default: "0 0 0"
+ required: 0
+ [pull request 240](https://bitbucket.org/osrf/sdformat/pull-requests/240)
+ [BitBucket pull request 240](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/240)
2 changes: 1 addition & 1 deletion bitbucket-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pipelines:
- sh -c 'echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-stable.list'
- wget http://packages.osrfoundation.org/gazebo.key -O - | apt-key add -
- apt-get update
- apt -y install cmake build-essential curl git mercurial libtinyxml-dev libxml2-utils ruby-dev python-psutil cppcheck
- apt -y install cmake build-essential curl git libtinyxml-dev libxml2-utils ruby-dev python-psutil cppcheck
- gcc -v
- g++ -v
- gcov -v
Expand Down
2 changes: 1 addition & 1 deletion doc/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ <h2 style="text-align:center;">
<dd><a href="http://sdf.com/wiki/Tutorials">Tutorials</a></dd>
<dd><a href="http://sdf.com/downloads.html">Download</a></dd>
-->
<dd><a href="https://bitbucket.org/osrf/sdf/issues/new">Report Documentation Issues</a></dd>
<dd><a href="https://github.com/osrf/sdf/issues/new">Report Documentation Issues</a></dd>
</dl>
</div>
<div>
Expand Down
2 changes: 1 addition & 1 deletion doc/mainpage.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Desctiption Format API. The code reference is divided into the groups below.
Should you find problems with this documentation - typos, unclear phrases,
or insufficient detail - please create a <a
href="https://bitbucket.org/osrf/sdf/issues/new">new bitbucket issue</a>.
href="https://github.com/osrf/sdf/issues/new">new GitHub issue</a>.
Include sufficient detail to quickly locate the problematic documentation,
and set the issue's fields accordingly: Assignee - blank; Kind - bug;
Priority - minor; Version - blank.
Expand Down

0 comments on commit d6f4e7f

Please sign in to comment.