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

[sdf7] Changelog links to BitBucket backup #238

Merged
merged 5 commits into from
May 6, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .hgignore → .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
syntax: glob

build
build_*
Expand Down
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
432 changes: 216 additions & 216 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 @@ -26,7 +26,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
44 changes: 22 additions & 22 deletions Migration.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,22 +75,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-requests/245)

## SDF protocol 1.5 to 1.6

Expand All @@ -106,78 +106,78 @@ 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** `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-requests/325)

1. **surface.sdf** `category_bitmask` element
+ description: Bitmask for category of collision filtering.
Expand All @@ -186,16 +186,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 @@ -6,7 +6,7 @@ pipelines:
script:
# Dependencies
- apt update
- apt -y install cmake build-essential lcov curl mercurial lsb-release wget
- apt -y install cmake build-essential lcov curl git lsb-release wget
libtinyxml-dev libxml2-utils ruby-dev libboost-dev
python-psutil cppcheck
# Static checking before building - fail fast
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
2 changes: 1 addition & 1 deletion sdf/1.4/physics.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
<description>
Flag to enable dynamic rescaling of moment of inertia in constrained directions.
See gazebo pull request 1114 for the implementation of this feature.
https://bitbucket.org/osrf/gazebo/pull-request/1114
https://osrf-migration.github.io/gazebo-gh-pages/#!/osrf/gazebo/pull-request/1114
</description>
</element>
</element> <!-- End Solver -->
Expand Down
4 changes: 2 additions & 2 deletions sdf/1.5/joint.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<description>
Flag to interpret the axis xyz element in the parent model frame instead
of joint frame. Provided for Gazebo compatibility
(see https://bitbucket.org/osrf/gazebo/issue/494 ).
(see https://github.com/osrf/gazebo/issue/494 ).
</description>
</element>
<element name="dynamics" required="0">
Expand Down Expand Up @@ -114,7 +114,7 @@
<description>
Flag to interpret the axis xyz element in the parent model frame instead
of joint frame. Provided for Gazebo compatibility
(see https://bitbucket.org/osrf/gazebo/issue/494 ).
(see https://github.com/osrf/gazebo/issue/494 ).
</description>
</element>
<element name="dynamics" required="0">
Expand Down
2 changes: 1 addition & 1 deletion sdf/1.5/physics.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
<description>
Flag to enable dynamic rescaling of moment of inertia in constrained directions.
See gazebo pull request 1114 for the implementation of this feature.
https://bitbucket.org/osrf/gazebo/pull-request/1114
https://osrf-migration.github.io/gazebo-gh-pages/#!/osrf/gazebo/pull-request/1114
</description>
</element>
</element> <!-- End Solver -->
Expand Down
4 changes: 2 additions & 2 deletions sdf/1.6/joint.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<description>
Flag to interpret the axis xyz element in the parent model frame instead
of joint frame. Provided for Gazebo compatibility
(see https://bitbucket.org/osrf/gazebo/issue/494 ).
(see https://github.com/osrf/gazebo/issue/494 ).
</description>
</element>
<element name="dynamics" required="0">
Expand Down Expand Up @@ -125,7 +125,7 @@
<description>
Flag to interpret the axis xyz element in the parent model frame instead
of joint frame. Provided for Gazebo compatibility
(see https://bitbucket.org/osrf/gazebo/issue/494 ).
(see https://github.com/osrf/gazebo/issue/494 ).
</description>
</element>
<element name="dynamics" required="0">
Expand Down
6 changes: 3 additions & 3 deletions sdf/1.6/physics.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@
<description>
Flag to enable dynamic rescaling of moment of inertia in constrained directions.
See gazebo pull request 1114 for the implementation of this feature.
https://bitbucket.org/osrf/gazebo/pull-request/1114
https://osrf-migration.github.io/gazebo-gh-pages/#!/osrf/gazebo/pull-request/1114
</description>
</element>
<element name="friction_model" type="string" default="pyramid_model" required="0">
Expand All @@ -213,8 +213,8 @@
cone_model: friction force magnitude limited in proportion to normal force.

See gazebo pull request 1522 for the implementation of this feature.
https://bitbucket.org/osrf/gazebo/pull-request/1522
https://bitbucket.org/osrf/gazebo/commits/8c05ad64967c
https://osrf-migration.github.io/gazebo-gh-pages/#!/osrf/gazebo/pull-request/1522
https://github.com/osrf/gazebo/commit/968dccafdfbfca09c9b3326f855612076fed7e6f
</description>
</element>
</element> <!-- End Solver -->
Expand Down
30 changes: 15 additions & 15 deletions sdf/Migration.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ but with improved human-readability.
+ type: unsigned int
+ default: 2
+ required: 0
+ [pull request 293](https://bitbucket.org/osrf/sdformat/pull-requests/293)
+ [Bitbucket pull request 293](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/293)

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. **model.sdf** `enable_wind` element
+ description: If set to true, all links in the model
Expand All @@ -40,54 +40,54 @@ but with improved human-readability.
+ 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** `friction_model` element
+ description: Name of ODE friction model to use. Valid values include:
+ pyramid_model: (default) friction forces limited in two directions
in proportion to normal force.
+ box_model: friction forces limited to constant in two directions.
+ cone_model: friction force magnitude limited in proportion to normal force.
See [gazebo pull request 1522](https://bitbucket.org/osrf/gazebo/pull-request/1522)
(merged in [gazebo 8c05ad64967c](https://bitbucket.org/osrf/gazebo/commits/8c05ad64967c))
See [gazebo pull request 1522](https://osrf-migration.github.io/gazebo-gh-pages/#!/osrf/gazebo/pull-request/1522)
(merged in [gazebo 8c05ad64967c](https://github.com/osrf/gazebo/commit/968dccafdfbfca09c9b3326f855612076fed7e6f))
for the implementation of this feature.
+ type: string
+ default: "pyramid_model"
+ required: 0
+ [pull request 294](https://bitbucket.org/osrf/sdformat/pull-requests/294)
+ [Bitbucket pull request 294](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/294)

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)

### Modifications

1. `gravity` and `magnetic_field` elements are moved
from `physics` to `world`
+ [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. 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)

4 changes: 2 additions & 2 deletions src/Param_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ TEST(Param, HexUInt)
TEST(Param, HexFloat)
{
// Microsoft does not parse hex values properly.
// https://bitbucket.org/osrf/sdformat/issues/114
// https://github.com/osrf/sdformat/issues/114
#ifndef _MSC_VER
sdf::Param floatParam("key", "float", "0", false, "description");
float value;
Expand Down Expand Up @@ -193,7 +193,7 @@ TEST(Param, HexDouble)
EXPECT_DOUBLE_EQ(value, 0.0);

// Microsoft does not parse hex values properly.
// https://bitbucket.org/osrf/sdformat/issues/114
// https://github.com/osrf/sdformat/issues/114
#ifndef _MSC_VER
EXPECT_TRUE(doubleParam.SetFromString("0x01"));
EXPECT_TRUE(doubleParam.Get<double>(value));
Expand Down