Skip to content

Commit

Permalink
Copyright fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
ethanfowler committed Aug 30, 2019
1 parent 24c7b9b commit 158e24d
Show file tree
Hide file tree
Showing 31 changed files with 252 additions and 278 deletions.
8 changes: 3 additions & 5 deletions sr_example/scripts/sr_example/advanced/sr_latching_example.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,15 @@
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the Free
# Software Foundation, either version 2 of the License, or (at your option)
# any later version.
# Software Foundation version 2 of the License.
#
# 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 General Public License for
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
# more details.
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see <http://www.gnu.org/licenses/>.
#
# with this program. If not, see <http://www.gnu.org/licenses/>.

"""
This program is a simple script that runs the hand through different given poses.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,15 @@
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the Free
# Software Foundation, either version 2 of the License, or (at your option)
# any later version.
# Software Foundation version 2 of the License.
#
# 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 General Public License for
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
# more details.
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see <http://www.gnu.org/licenses/>.
#
# with this program. If not, see <http://www.gnu.org/licenses/>.

"""
This example demonstrates how two joints can have their positions 'linked' by
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,15 @@
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the Free
# Software Foundation, either version 2 of the License, or (at your option)
# any later version.
# Software Foundation version 2 of the License.
#
# 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 General Public License for
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
# more details.
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see <http://www.gnu.org/licenses/>.
# with this program. If not, see <http://www.gnu.org/licenses/>.
#
# -*- coding: utf-8 -*-

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,15 @@
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the Free
# Software Foundation, either version 2 of the License, or (at your option)
# any later version.
# Software Foundation version 2 of the License.
#
# 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 General Public License for
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
# more details.
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see <http://www.gnu.org/licenses/>.
#
# with this program. If not, see <http://www.gnu.org/licenses/>.

"""
This is a simple subscriber example, subscribing to the joint_states topic and printing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,15 @@
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the Free
# Software Foundation, either version 2 of the License, or (at your option)
# any later version.
# Software Foundation version 2 of the License.
#
# 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 General Public License for
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
# more details.
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see <http://www.gnu.org/licenses/>.
# with this program. If not, see <http://www.gnu.org/licenses/>.

import rospy
from copy import deepcopy
Expand Down
53 changes: 18 additions & 35 deletions sr_example/src/link_joints.cpp
Original file line number Diff line number Diff line change
@@ -1,39 +1,22 @@
/**
* @file link_joints.cpp
* @author Ugo Cupcic <[email protected]>, Contact <[email protected]>
* @date Thu Jul 8 16:57:22 2010
*
*
* Copyright 2011 Shadow Robot Company Ltd.
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, either version 2 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 General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
* @file link_joints.cpp
* @author Ugo Cupcic <[email protected]>, Contact <[email protected]>
* @date Thu Jul 8 16:57:22 2010
*
*
* Copyright 2011 Shadow Robot Company Ltd.
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, either version 2 of the License, or (at your option)
* any later version.
* Software Foundation version 2 of the License.
*
* 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 General Public License for
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
* with this program. If not, see <http://www.gnu.org/licenses/>.
*
* This example demonstrates how two joints can have their positions 'linked' by
* having a child joint subscribing to the parent joint's controller state topic.
Expand Down Expand Up @@ -74,11 +57,11 @@ ros::Subscriber sub;
ros::Publisher pub;

/**
* The callback function is called each time a message is received on the
* controller
*
* @param msg message of type sr_hand::joints_data
*/
* The callback function is called each time a message is received on the
* controller
*
* @param msg message of type sr_hand::joints_data
*/
void callback(const control_msgs::JointControllerStateConstPtr &msg)
{
// publish the message
Expand All @@ -90,13 +73,13 @@ void callback(const control_msgs::JointControllerStateConstPtr &msg)
}

/**
* The main: initialise a ros node, a subscriber and a publisher
*
* @param argc
* @param argv
*
* @return 0 on success
*/
* The main: initialise a ros node, a subscriber and a publisher
*
* @param argc
* @param argv
*
* @return 0 on success
*/
int main(int argc, char **argv)
{
// init the ros node
Expand Down
8 changes: 2 additions & 6 deletions sr_grasp/src/sr_grasp/utils.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
#!/usr/bin/env python

# ##########################################################################
# Copyright (c) 2014 Shadow Robot Company Ltd.
# Copyright 2014 Shadow Robot Company Ltd.
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the Free
# Software Foundation, either version 2 of the License, or (at your option)
# any later version.
# Software Foundation version 2 of the License.
#
# This program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
Expand All @@ -15,8 +13,6 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see <http://www.gnu.org/licenses/>.
#
# ###########################################################################

import rospy
from moveit_msgs.msg import Grasp
Expand Down
8 changes: 2 additions & 6 deletions sr_grasp/test/test_grasp.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
#!/usr/bin/env python

# ##########################################################################
# Copyright (c) 2014 Shadow Robot Company Ltd.
# Copyright 2014 Shadow Robot Company Ltd.
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the Free
# Software Foundation, either version 2 of the License, or (at your option)
# any later version.
# Software Foundation version 2 of the License.
#
# This program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
Expand All @@ -15,8 +13,6 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see <http://www.gnu.org/licenses/>.
#
# ###########################################################################


import unittest
Expand Down
8 changes: 2 additions & 6 deletions sr_grasp/test/test_grasp_contact.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
#!/usr/bin/env python

# ##########################################################################
# Copyright (c) 2014 Shadow Robot Company Ltd.
# Copyright 2014 Shadow Robot Company Ltd.
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the Free
# Software Foundation, either version 2 of the License, or (at your option)
# any later version.
# Software Foundation version 2 of the License.
#
# This program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
Expand All @@ -15,8 +13,6 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see <http://www.gnu.org/licenses/>.
#
# ###########################################################################

import os
import unittest
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
exclude_files=\.*
Original file line number Diff line number Diff line change
Expand Up @@ -71,20 +71,20 @@ class HandKinematicsPlugin :
{
public:
/** @class
* @brief Plugin-able interface to the Shadow hand kinematics
*/
* @brief Plugin-able interface to the Shadow hand kinematics
*/
HandKinematicsPlugin();

/**
* @brief Specifies if the node is active or not
* @return True if the node is active, false otherwise.
*/
* @brief Specifies if the node is active or not
* @return True if the node is active, false otherwise.
*/
bool isActive();

/**
* @brief Given a desired pose of the end-effector, compute the joint angles to reach it
* @return True if a valid solution was found, false otherwise
*/
* @brief Given a desired pose of the end-effector, compute the joint angles to reach it
* @return True if a valid solution was found, false otherwise
*/
virtual bool getPositionIK(const geometry_msgs::Pose &ik_pose,
const std::vector<double> &ik_seed_state,
std::vector<double> &solution,
Expand Down Expand Up @@ -112,10 +112,10 @@ virtual bool searchPositionIK(const geometry_msgs::Pose &ik_pose,


/**
* @brief Given a desired pose of the end-effector, search for the joint angles required to reach it.
* This particular method is intended for "searching" for a solutions by stepping through the redundancy
* (or other numerical routines).
*/
* @brief Given a desired pose of the end-effector, search for the joint angles required to reach it.
* This particular method is intended for "searching" for a solutions by stepping through the redundancy
* (or other numerical routines).
*/
virtual bool searchPositionIK(const geometry_msgs::Pose &ik_pose,
const std::vector<double> &ik_seed_state,
double timeout,
Expand All @@ -126,10 +126,10 @@ virtual bool searchPositionIK(const geometry_msgs::Pose &ik_pose,
kinematics::KinematicsQueryOptions()) const;

/**
* @brief Given a desired pose of the end-effector, search for the joint angles required to reach it.
* This particular method is intended for "searching" for a solutions by stepping through the redundancy
* (or other numerical routines).
*/
* @brief Given a desired pose of the end-effector, search for the joint angles required to reach it.
* This particular method is intended for "searching" for a solutions by stepping through the redundancy
* (or other numerical routines).
*/
virtual bool searchPositionIK(const geometry_msgs::Pose &ik_pose,
const std::vector<double> &ik_seed_state,
double timeout,
Expand All @@ -142,21 +142,21 @@ virtual bool searchPositionIK(const geometry_msgs::Pose &ik_pose,


/**
* @brief Given a set of joint angles and a set of links, compute their pose
* @param link_names - set of links for which poses are to be computed
* @param joint_angles - the contains the joint angles
* @param poses - the response contains pose information for all the requested links
* @return True if a valid solution was found, false otherwise
*/
* @brief Given a set of joint angles and a set of links, compute their pose
* @param link_names - set of links for which poses are to be computed
* @param joint_angles - the contains the joint angles
* @param poses - the response contains pose information for all the requested links
* @return True if a valid solution was found, false otherwise
*/
virtual bool getPositionFK(const std::vector<std::string> &link_names,
const std::vector<double> &joint_angles,
std::vector<geometry_msgs::Pose> &poses) const;


/**
* @brief Initialization function for the kinematics
* @return True if initialization was successful, false otherwise
*/
* @brief Initialization function for the kinematics
* @return True if initialization was successful, false otherwise
*/
virtual bool initialize(const std::string &robot_description,
const std::string &group_name,
const std::string &base_frame,
Expand All @@ -165,13 +165,13 @@ virtual bool initialize(const std::string &robot_description,


/**
* @brief Return all the joint names in the order they are used internally
*/
* @brief Return all the joint names in the order they are used internally
*/
const std::vector<std::string> &getJointNames() const;

/**
* @brief Return all the link names in the order they are represented internally
*/
* @brief Return all the link names in the order they are represented internally
*/
const std::vector<std::string> &getLinkNames() const;

protected:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
exclude_files=\.*
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
exclude_files=\.*
Loading

0 comments on commit 158e24d

Please sign in to comment.