Skip to content

Merge the master branch onto the ros2 branch#146

Closed
clalancette wants to merge 18 commits intoros2from
ros2-merge-master
Closed

Merge the master branch onto the ros2 branch#146
clalancette wants to merge 18 commits intoros2from
ros2-merge-master

Conversation

@clalancette
Copy link
Copy Markdown
Contributor

This merge is meant to get the latest fixes from the master branch onto the ros2 branch. In particular, the changes that are most interesting here are:

  1. Changes to fix URDF parsing when different locales are used.
  2. Addition of the the "version" attribute to URDF.
  3. Addition of some tests.

There are also a bunch of other minor fixes and such in here.

This is meant to be merged as a merge commit; that's so that we don't change any of the commits that we are merging in.

jslee02 and others added 16 commits October 10, 2017 10:37
* Add in some tests for the strToDouble conversion.

Note that this only tests that some simple cases do the correct
thing.  We can't reliably check the locale fixing
code because we can't depend on any particular locales being
installed on test machines.

Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>

* Alphabetize the test list.

Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
It is not locale-safe, so switch to using the strToDouble
utility from urdfdom_headers instead.

Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
* skip test directory when building tests is not requested

* include CTest
* Travis: run unit tests in non-english locale as well

* Add test for color parsing

* add extra tests that run it all in Dutch
* require urdfdom_headers 1.0.3 (strToDouble)

* bump to 1.0.3 to match urdfdom_headers
* assign correct MaterialPtr to all visuals

So far, only the first visual in visual_array got the correct MaterialPtr assigned.

* fix errors

* tolerate undefined materials with a warning

* Minor style fixups.

Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
* Add in support for a version tag.

This is already specified by the xsd, so just make sure we
implement it and enforce it in the code.

Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>

* Switch to a class for version parsing.

The previous attempt used a float to store the version number.
That has two problems:

1.  It runs into locale issues, and
2.  The XSD specifies it as a string

This alternative introduces a class to do parsing of the version
string.  Besides conforming to the XSD, and getting us away
from the locale issues, it also allows us to provide additional
constraints on the version (like not allowing negative numbers).
The UDFVersion class ends up living in the header file so we
can write tests against it.

Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>

* Remove bogus comment.

Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
There is currently no explicit test for correct float parsing for eg `xyz` vectors
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@clalancette
Copy link
Copy Markdown
Contributor Author

ROS 2 CI:

  • Linux Build Status
  • Linux-aarch64 Build Status
  • macOS Build Status
  • Windows Build Status

hwiedPro and others added 2 commits October 30, 2020 15:30
* Add extra argument for output file
* Add deprecated warning
* Add usage string

Co-authored-by: hwied <hwiedemann@gmx.net>
Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
@clalancette
Copy link
Copy Markdown
Contributor Author

Now that we landed #148, I've re-merged this with that commit in place. I'll run another CI on ros2 infrastructure for now. Once we have this in, I'll go back to trying to make this work for both ROS 1, ROS 2, and external builders.

@clalancette
Copy link
Copy Markdown
Contributor Author

clalancette commented Nov 4, 2020

CI:

  • Linux Build Status
  • Linux-aarch64 Build Status
  • macOS Build Status
  • Windows Build Status

@scpeters
Copy link
Copy Markdown
Contributor

scpeters commented Nov 4, 2020

  • Windows Build Status

windows build failed with an unrelated Qt installation issue

@clalancette
Copy link
Copy Markdown
Contributor Author

windows build failed with an unrelated Qt installation issue

Yeah, that's an ongoing issue with CI right now. It's being worked on.

But I do think we should hold off on this until we get a green CI for Windows. If anything is going to break, it is going to be Windows ;).

@sloretz
Copy link
Copy Markdown
Contributor

sloretz commented Nov 5, 2020

Does this repo need a ros2 branch? It looks like it's a plain CMake package. How about going the other direction - merging ros2 into master and using that from now on.

@clalancette
Copy link
Copy Markdown
Contributor Author

Does this repo need a ros2 branch? It looks like it's a plain CMake package. How about going the other direction - merging ros2 into master and using that from now on.

That is the eventual plan. In order to get there, I need to basically do what I said in #148 (comment), which is to make the vendor packages optional, restore travis, and also deal with the package.xml (since it exists on the ros2 branch, but not on the master branch).

That was enough work that I felt like it was better to synchronize them this way (to get these changes into ROS 2), and then work on bringing the ros2 branch back into master.

@clalancette
Copy link
Copy Markdown
Contributor Author

Superseded by #158, where we merge the two branches together onto the master branch.

@clalancette clalancette deleted the ros2-merge-master branch February 14, 2022 16:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants