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

Migrate M-710iC support pkgs from experimental repository #254

Merged

Conversation

gavanderhoorn
Copy link
Member

@gavanderhoorn gavanderhoorn commented Feb 28, 2019

As per subject.

This migrates all packages related to the M-710iC from fanuc_experimental to fanuc, with the commit history that touches those packages.

This obviously leads to duplicate commits (as many touch multiple packages) and changes hashes, but there is no way to maintain the original commits while also importing them into this repository. At least this way the full history is present here as well. PR and issue references have been updated where necessary to still refer to fanuc_experimental.

No functional changes have been made to any of the packages. This is a straight import of the artefacts from fanuc_experimental with only some minor updates to the package manifests (such as references to fanuc_experimental and the wiki).

gavanderhoorn and others added 18 commits July 31, 2015 14:02
Add preamble on all files except those generated by tools.

 - launch files
 - package manifests
 - roslaunch tests
 - xacros
These targets don't exist when using isolated builds or when packages are
build that depend on binary distributions that provide the specified targets.

Newer versions of CMake will print copious warnings about the targets not
existing, so remove them.
'xacro.py' has been deprecated for some time now.
In preparation of future changes making use of the improved xacro supported in
Jade and newer ROS releases.
Allows supporting libraries to check contents / structure  of the manifests
gainst the provided schema.

See [1] for more information.

[1] http://www.ros.org/reps/rep-0140.html#schema
For stand-alone use of the models, the top-level xacro macros should be
used.
As of 7e14866 we don't use our own 'pi'
anymore, so the constants xacro is no longer needed.

Ref: ros-industrial/fanuc@822ff1a.
Squashed commits:

 * Add Fanuc M710iC/45M
 * Add inorder for xacro
 * Move /45M roslaunch tests to their own file.
 * Correct name of roslaunch test for /50.
 * m710ic: mention supported variants in manifest.
 * Use as many links as possible from the M-710iC50
 * Re-use meshes from M710iC50
 * Reword note about using meshes from /50 variant.
@gavanderhoorn gavanderhoorn merged commit d6ec058 into ros-industrial:indigo-devel Mar 27, 2019
@gavanderhoorn gavanderhoorn deleted the migrate_m710ic branch March 27, 2019 13:43
@gavanderhoorn
Copy link
Member Author

Thanks @shaun-edwards 👍

gavanderhoorn added a commit to ros-industrial/fanuc_experimental that referenced this pull request Mar 27, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants