Skip to content

Commit

Permalink
use license apache 2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
ipa-uhr-mk authored and fmessmer committed Jul 21, 2017
1 parent ae6efa0 commit 07ddf65
Show file tree
Hide file tree
Showing 49 changed files with 621 additions and 264 deletions.
2 changes: 1 addition & 1 deletion cob_collision_monitor/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<maintainer email="mathias.luedtke@ipa.fraunhofer.de">Mathias Lüdtke</maintainer>

<license>LGPLv3</license>
<license>Apache 2.0</license>

<url type="website">http://wiki.ros.org/cob_collision_monitor</url>

Expand Down
19 changes: 18 additions & 1 deletion cob_collision_monitor/src/collision_monitor_capability.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
/*
* Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/


#include <moveit/move_group/move_group_capability.h>
#include "valid_state_publisher.h"

Expand All @@ -16,4 +33,4 @@ class CollisionMonitor : public move_group::MoveGroupCapability
}

#include <pluginlib/class_list_macros.h>
PLUGINLIB_EXPORT_CLASS(cob_collision_monitor::CollisionMonitor, move_group::MoveGroupCapability)
PLUGINLIB_EXPORT_CLASS(cob_collision_monitor::CollisionMonitor, move_group::MoveGroupCapability)
17 changes: 17 additions & 0 deletions cob_collision_monitor/src/collision_monitor_node.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
/*
* Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/


#include "valid_state_publisher.h"


Expand Down
17 changes: 17 additions & 0 deletions cob_collision_monitor/src/valid_state_publisher.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
/*
* Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/


#ifndef COB_COLLISION_MONITOR_VALID_STATE_PUBLISHER_H
#define COB_COLLISION_MONITOR_VALID_STATE_PUBLISHER_H

Expand Down
2 changes: 1 addition & 1 deletion cob_grasp_generation/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<author>Felix Messmer</author>
<maintainer email="fxm@ipa.fhg.de">Felix Messmer</maintainer>

<license>BSD</license>
<license>Apache 2.0</license>

<url type="website">http://ros.org/wiki/cob_manipulation/</url>
<url type="bugtracker">https://github.com/ipa320/cob_manipulation/issues</url>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,19 @@
#! /usr/bin/env python
#!/usr/bin/env python
#
# Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.


import rospy

Expand Down
18 changes: 17 additions & 1 deletion cob_grasp_generation/scripts/generate_grasps_client.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,20 @@
#! /usr/bin/env python
#!/usr/bin/env python
#
# Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.


import rospy

import actionlib
Expand Down
18 changes: 17 additions & 1 deletion cob_grasp_generation/scripts/query_grasps_client.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,20 @@
#! /usr/bin/env python
#!/usr/bin/env python
#
# Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.


import rospy

import actionlib
Expand Down
18 changes: 17 additions & 1 deletion cob_grasp_generation/scripts/show_grasps_client.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,20 @@
#! /usr/bin/env python
#!/usr/bin/env python
#
# Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.


import rospy

import actionlib
Expand Down
17 changes: 17 additions & 0 deletions cob_grasp_generation/src/cob_grasp_generation/analyzegrasp3d.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
#!/usr/bin/env python
#
# Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.


"""Analyze Grasp 3D - own module: a collection of several function for analyzing the grasps
"""
from openravepy import *
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
#!/usr/bin/env python
#
# Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.


"""Generates a database of grasps
"""
#libs and modules
Expand Down
2 changes: 1 addition & 1 deletion cob_kinematics/ikfast/src/ikfast_lbr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
/// See the License for the specific language governing permissions and
/// limitations under the License.
///
/// ikfast version 61 generated on 2012-10-19 19:21:24.890849
/// ikfast version 61 generated on 2012-11-23 19:10:48.288028
/// To compile with gcc:
/// gcc -lstdc++ ik.cpp
/// To compile without any main function as a shared object (might need -llapack):
Expand Down
21 changes: 20 additions & 1 deletion cob_kinematics/ikfast/src/ikfast_ur10.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
/// autogenerated analytical inverse kinematics code from ikfast program part of OpenRAVE
/// \author Rosen Diankov
///
/// Licensed under the Apache License, Version 2.0 (the "License");
/// you may not use this file except in compliance with the License.
/// You may obtain a copy of the License at
/// http://www.apache.org/licenses/LICENSE-2.0
///
/// Unless required by applicable law or agreed to in writing, software
/// distributed under the License is distributed on an "AS IS" BASIS,
/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
/// See the License for the specific language governing permissions and
/// limitations under the License.
///
/// ikfast version 61 generated on 2012-11-23 19:10:48.288028
/// To compile with gcc:
/// gcc -lstdc++ ik.cpp
/// To compile without any main function as a shared object (might need -llapack):
/// gcc -fPIC -lstdc++ -DIKFAST_NO_MAIN -DIKFAST_CLIBRARY -shared -Wl,-soname,libik.so -o libik.so ik.cpp
#define IKFAST_HAS_LIBRARY
#include "ikfast.h" // found inside share/openrave-X.Y/python/ikfast.h
using namespace ikfast;
Expand Down Expand Up @@ -294,4 +313,4 @@ int main(int argc, char* argv[])
return 0;
}
*/
#endif
#endif
2 changes: 1 addition & 1 deletion cob_kinematics/ikfast/src/ikfast_ur5.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
/// See the License for the specific language governing permissions and
/// limitations under the License.
///
/// ikfast version 61 generated on 2012-10-22 11:25:24.391773
/// ikfast version 61 generated on 2012-11-23 19:10:48.288028
/// To compile with gcc:
/// gcc -lstdc++ ik.cpp
/// To compile without any main function as a shared object (might need -llapack):
Expand Down
2 changes: 1 addition & 1 deletion cob_kinematics/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<maintainer email="mdl@ipa.fhg.de">Mathias Luedtke</maintainer>
<maintainer email="fxm@ipa.fhg.de">Felix Messmer</maintainer>

<license>LGPL</license>
<license>Apache 2.0</license>

<url type="website">http://ros.org/wiki/cob_manipulation/</url>
<url type="bugtracker">https://github.com/ipa320/cob_manipulation/issues</url>
Expand Down
19 changes: 18 additions & 1 deletion cob_kinematics/ros/bin/genikfast.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
#!/usr/bin/env python
#
# Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.


import openravepy
from openravepy.ikfast import *
import sys
Expand Down Expand Up @@ -31,4 +48,4 @@
code=solver.writeIkSolver(chaintree,lang='cpp')
finally:
openravepy.RaveDestroy()
open(sys.argv[2],'w').write(code)
open(sys.argv[2],'w').write(code)
62 changes: 14 additions & 48 deletions cob_kinematics/ros/src/ikfast_plugin.cpp
Original file line number Diff line number Diff line change
@@ -1,53 +1,19 @@
/*!
*****************************************************************
* \note
* Copyright (c) 2012 \n
* Fraunhofer Institute for Manufacturing Engineering
* and Automation (IPA) \n\n
/*
* Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA)
*
*****************************************************************
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* \note
* ROS stack name: cob_manipulation
* \note
* ROS package name: cob_kinematics
*
* \author
* Author: Mathias Lüdtke
*
* \brief
* IKfast ROS kinematics plug-in that integrates auto-generated analytical IK solvers
*
*****************************************************************
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. \n
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. \n
* - Neither the name of the Fraunhofer Institute for Manufacturing
* Engineering and Automation (IPA) nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission. \n
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License LGPL as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License LGPL for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License LGPL along with this program.
* If not, see <http://www.gnu.org/licenses/>.
*
****************************************************************/
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/


#include <ros/ros.h>

Expand Down
Loading

0 comments on commit 07ddf65

Please sign in to comment.