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

Trajectory Interpolator (Against Kinetic Devel) #197

Open
wants to merge 2 commits into
base: kinetic-devel
Choose a base branch
from

Conversation

Jmeyer1292
Copy link
Contributor

No description provided.

@@ -11,6 +11,7 @@
<maintainer email="[email protected]">Jonathan Meyer</maintainer>

<license>Apache 2.0</license>
<license>BSD</license>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The license on the source files still says Apache 2.0

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I lifted some code from the ecl library, which is licensed as BSD. I imagine I should include the BSD clause in that source file? I have no idea how this dual licensing stuff would work.

@Jmeyer1292
Copy link
Contributor Author

So I resurrected this PR after closing it a while ago after discussing with @Levi-Armstrong. It amused me that this is not too different from what MoveIt was doing and I wanted to keep the code around somewhere.

@@ -0,0 +1,232 @@
/**

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this the code that is BSD? If so, I think it needs to be labeled BSD similar to the others that are marked Apache.

// else
// {
// std::cout << "It did not work\n";
// }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Commented code

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.

3 participants