From f457a86cce591280d27409bacbdad16b4458b32d Mon Sep 17 00:00:00 2001 From: ipa-uhr-mk Date: Tue, 18 Jul 2017 18:02:00 +0200 Subject: [PATCH] use license apache 2.0 --- .../cob_base_drive_chain/CanCtrlPltfCOb3.h | 67 ++++------------- .../common/src/CanCtrlPltfCOb3.cpp | 67 ++++------------- cob_base_drive_chain/package.xml | 2 +- .../ros/src/cob_base_drive_chain.cpp | 64 ++++------------ .../cob_bms_driver/cob_bms_driver_node.h | 17 +++++ cob_bms_driver/package.xml | 2 +- cob_bms_driver/src/cob_bms_driver_node.cpp | 17 +++++ cob_bms_driver/src/fake_bms.py | 15 ++++ cob_bms_driver/src/power_state_aggregator.py | 15 ++++ .../include/cob_camera_sensors/AVTPikeCam.h | 68 ++++------------- .../cob_camera_sensors/AbstractColorCamera.h | 68 ++++------------- .../AbstractRangeImagingSensor.h | 68 ++++------------- .../include/cob_camera_sensors/StdAfx.h | 19 ++++- .../include/cob_camera_sensors/Swissranger.h | 69 ++++------------- .../cob_camera_sensors/VirtualColorCam.h | 67 ++++------------- .../cob_camera_sensors/VirtualRangeCam.h | 68 ++++------------- cob_camera_sensors/common/src/AVTPikeCam.cpp | 65 ++++------------ .../common/src/AbstractColorCamera.cpp | 68 ++++------------- .../common/src/AbstractRangeImagingSensor.cpp | 68 ++++------------- cob_camera_sensors/common/src/StdAfx.cpp | 19 ++++- cob_camera_sensors/common/src/Swissranger.cpp | 69 +++++------------ .../common/src/VirtualColorCam.cpp | 69 +++++------------ .../common/src/VirtualRangeCam.cpp | 68 ++++------------- cob_camera_sensors/package.xml | 2 +- .../ros/scripts/set_camera_info.py | 17 ++++- .../ros/src/all_camera_viewer.cpp | 63 ++++------------ cob_camera_sensors/ros/src/all_cameras.cpp | 63 ++++------------ cob_camera_sensors/ros/src/color_camera.cpp | 63 ++++------------ cob_camera_sensors/ros/src/tof_camera.cpp | 63 ++++------------ .../ros/src/tof_camera_viewer.cpp | 63 ++++------------ cob_camera_sensors/ros/src/undistort_tof.cpp | 63 ++++------------ .../cob_canopen_motor/CanDriveHarmonica.h | 65 ++++------------ .../include/cob_canopen_motor/CanDriveItf.h | 63 ++++------------ .../include/cob_canopen_motor/DriveParam.h | 63 ++++------------ .../include/cob_canopen_motor/ElmoRecorder.h | 67 ++++------------- .../include/cob_canopen_motor/SDOSegmented.h | 64 ++++------------ .../common/src/CanDriveHarmonica.cpp | 65 ++++------------ cob_canopen_motor/common/src/ElmoRecorder.cpp | 64 ++++------------ cob_canopen_motor/package.xml | 2 +- cob_driver/package.xml | 2 +- cob_elmo_homing/package.xml | 2 +- cob_elmo_homing/src/plugin.cpp | 17 +++++ .../common/include/cob_generic_can/CanESD.h | 63 ++++------------ .../common/include/cob_generic_can/CanItf.h | 63 ++++------------ .../common/include/cob_generic_can/CanMsg.h | 63 ++++------------ .../include/cob_generic_can/CanPeakSys.h | 63 ++++------------ .../include/cob_generic_can/CanPeakSysUSB.h | 64 ++++------------ .../include/cob_generic_can/SocketCan.h | 52 ++++--------- cob_generic_can/common/src/CanESD.cpp | 64 ++++------------ cob_generic_can/common/src/CanPeakSys.cpp | 64 ++++------------ cob_generic_can/common/src/CanPeakSysUSB.cpp | 64 ++++------------ cob_generic_can/common/src/SocketCan.cpp | 52 ++++--------- cob_generic_can/package.xml | 2 +- .../common/include/cob_head_axis/ElmoCtrl.h | 62 ++++------------ cob_head_axis/common/src/ElmoCtrl.cpp | 61 ++++----------- cob_head_axis/package.xml | 2 +- cob_head_axis/ros/src/cob_head_axis.cpp | 62 ++++------------ cob_head_axis/ros/src/dummy_head.py | 15 ++++ cob_light/common/include/breathColorMode.h | 65 ++++------------ cob_light/common/include/breathMode.h | 65 ++++------------ cob_light/common/include/circleColorMode.h | 16 ++++ cob_light/common/include/colorUtils.h | 65 ++++------------ cob_light/common/include/concurrentQueue.h | 17 +++++ cob_light/common/include/distApproxMode.h | 16 ++++ cob_light/common/include/fadeColorMode.h | 65 ++++------------ cob_light/common/include/flashMode.h | 65 ++++------------ cob_light/common/include/glowColorMode.h | 65 ++++------------ cob_light/common/include/mode.h | 65 ++++------------ cob_light/common/include/modeExecutor.h | 65 ++++------------ cob_light/common/include/modeFactory.h | 65 ++++------------ cob_light/common/include/modeRunner.h | 67 ++++------------- cob_light/common/include/sequenceMode.h | 65 ++++------------ cob_light/common/include/serialIO.h | 65 ++++------------ cob_light/common/include/staticMode.h | 65 ++++------------ cob_light/common/include/sweepColorMode.h | 16 ++++ cob_light/common/include/xmasMode.h | 17 +++++ cob_light/common/src/modeExecutor.cpp | 65 ++++------------ cob_light/common/src/modeFactory.cpp | 65 ++++------------ cob_light/common/src/serialIO.cpp | 65 ++++------------ cob_light/package.xml | 2 +- cob_light/ros/include/colorO.h | 65 ++++------------ cob_light/ros/include/colorOSim.h | 65 ++++------------ cob_light/ros/include/iColorO.h | 65 ++++------------ cob_light/ros/include/ms35.h | 65 ++++------------ cob_light/ros/include/stageprofi.h | 64 ++++------------ cob_light/ros/scripts/light_action_test.py | 15 ++++ cob_light/ros/scripts/light_service_test.py | 15 ++++ cob_light/ros/scripts/test.py | 60 +++------------ cob_light/ros/scripts/test_sprofi_circle.py | 59 +++------------ cob_light/ros/scripts/test_sprofi_modes.py | 59 +++------------ cob_light/ros/scripts/test_sprofi_part.py | 59 +++------------ cob_light/ros/src/cob_light.cpp | 65 ++++------------ cob_light/ros/src/colorO.cpp | 65 ++++------------ cob_light/ros/src/colorOSim.cpp | 64 ++++------------ cob_light/ros/src/ms35.cpp | 65 ++++------------ cob_light/ros/src/stageprofi.cpp | 64 ++++------------ cob_mimic/package.xml | 2 +- cob_mimic/src/test_mimic.py | 17 ++++- cob_phidget_em_state/package.xml | 2 +- .../scripts/em_state_phidget.py | 15 ++++ cob_phidget_power_state/package.xml | 2 +- .../scripts/power_state_phidget.py | 15 ++++ .../common/include/cob_phidgets/phidget.h | 74 ++++--------------- .../common/include/cob_phidgets/phidgetik.h | 70 ++++-------------- cob_phidgets/common/src/phidget.cpp | 69 ++++------------- cob_phidgets/common/src/phidgetik.cpp | 70 ++++-------------- cob_phidgets/package.xml | 2 +- .../include/cob_phidgets/phidget_manager.h | 70 ++++-------------- .../ros/include/cob_phidgets/phidgetik_ros.h | 70 ++++-------------- cob_phidgets/ros/src/ifkit.c | 17 +++++ cob_phidgets/ros/src/phidget_manager.cpp | 70 ++++-------------- cob_phidgets/ros/src/phidget_sensors_node.cpp | 70 ++++-------------- cob_phidgets/ros/src/phidgetik_ros.cpp | 70 ++++-------------- .../ros/src/phidgets_range_sensors.cpp | 17 +++++ cob_phidgets/ros/src/set_device_name.cpp | 22 +++++- .../ros/src/simulated_range_sensors.py | 15 ++++ cob_phidgets/ros/src/tablet_leer.c | 17 +++++ .../include/cob_relayboard/CmdRelaisBoard.h | 44 ++++------- .../common/include/cob_relayboard/Mutex.h | 64 ++++------------ .../include/cob_relayboard/SerRelayBoard.h | 64 ++++------------ .../common/include/cob_relayboard/SerialIO.h | 64 ++++------------ .../common/include/cob_relayboard/StrUtil.h | 64 ++++------------ cob_relayboard/common/src/SerRelayBoard.cpp | 63 ++++------------ cob_relayboard/common/src/SerialIO.cpp | 64 ++++------------ cob_relayboard/common/src/StrUtil.cpp | 64 ++++------------ cob_relayboard/package.xml | 2 +- .../ros/src/cob_relayboard_node.cpp | 64 ++++------------ cob_relayboard/ros/src/new_method.py | 15 ++++ cob_relayboard/ros/src/relayboard_sim.py | 15 ++++ .../cob_scan_unifier/scan_unifier_node.h | 73 ++++-------------- cob_scan_unifier/package.xml | 2 +- cob_scan_unifier/src/scan_unifier_node.cpp | 73 ++++-------------- cob_sick_lms1xx/common/include/lms1xx.h | 34 ++++----- cob_sick_lms1xx/common/src/lms1xx.cpp | 34 ++++----- cob_sick_lms1xx/common/src/test.cpp | 34 ++++----- cob_sick_lms1xx/doc/Doxyfile | 17 +++++ cob_sick_lms1xx/package.xml | 2 +- cob_sick_lms1xx/ros/src/lms1xx_node.cpp | 17 +++++ cob_sick_lms1xx/ros/src/set_config.cpp | 16 +++- .../common/include/cob_sick_s300/Errors.hpp | 17 +++++ .../LaserScannerConfiguration.hpp | 17 +++++ .../common/include/cob_sick_s300/Logger.hpp | 62 ++++------------ .../include/cob_sick_s300/ScannerSickS300.h | 64 ++++------------ .../common/include/cob_sick_s300/SerialIO.h | 64 ++++------------ .../include/cob_sick_s300/TelegramS300.h | 64 ++++------------ .../common/include/cob_sick_s300/Units.hpp | 16 +++- cob_sick_s300/common/src/Errors.cpp | 16 ++++ .../common/src/LaserScannerConfiguration.cpp | 19 ++++- cob_sick_s300/common/src/Logger.cpp | 62 ++++------------ cob_sick_s300/common/src/ScannerSickS300.cpp | 64 ++++------------ cob_sick_s300/common/src/SerialIO.cpp | 64 ++++------------ cob_sick_s300/package.xml | 2 +- cob_sick_s300/ros/src/cob_scan_filter.cpp | 64 ++++------------ cob_sick_s300/ros/src/cob_sick_s300.cpp | 64 ++++------------ cob_sound/package.xml | 2 +- cob_sound/ros/src/sound.cpp | 17 +++++ cob_sound/ros/src/test_client.py | 17 ++++- .../UndercarriageCtrlGeom.h | 64 ++++------------ .../common/src/UndercarriageCtrlGeom.cpp | 64 ++++------------ cob_undercarriage_ctrl/package.xml | 2 +- .../ros/src/cob_undercarriage_ctrl.cpp | 66 ++++------------- .../common/include/cob_utilities/IniFile.h | 64 ++++------------ .../common/include/cob_utilities/MathSup.h | 64 ++++------------ .../common/include/cob_utilities/Mutex.h | 64 ++++------------ .../common/include/cob_utilities/StrUtil.h | 64 ++++------------ .../common/include/cob_utilities/TimeStamp.h | 64 ++++------------ .../common/include/cob_utilities/windows.h | 68 ++++------------- cob_utilities/common/src/IniFile.cpp | 64 ++++------------ cob_utilities/common/src/MathSup.cpp | 63 ++++------------ cob_utilities/common/src/StrUtil.cpp | 64 ++++------------ cob_utilities/common/src/TimeStamp.cpp | 64 ++++------------ cob_utilities/package.xml | 2 +- .../common/src/cob_voltage_control_common.cpp | 17 +++++ cob_voltage_control/package.xml | 2 +- .../ros/src/cob_voltage_control_ros.cpp | 17 +++++ .../ros/src/record_current_and_voltage.py | 15 ++++ cob_voltage_control/ros/src/savitzky.py | 17 +++++ cob_voltage_control/ros/src/savitzky_golay.py | 64 +++------------- cob_voltage_control/ros/src/time_volt.py | 64 +++------------- 179 files changed, 2321 insertions(+), 5922 deletions(-) diff --git a/cob_base_drive_chain/common/include/cob_base_drive_chain/CanCtrlPltfCOb3.h b/cob_base_drive_chain/common/include/cob_base_drive_chain/CanCtrlPltfCOb3.h index 060950ad5..839c4530d 100644 --- a/cob_base_drive_chain/common/include/cob_base_drive_chain/CanCtrlPltfCOb3.h +++ b/cob_base_drive_chain/common/include/cob_base_drive_chain/CanCtrlPltfCOb3.h @@ -1,58 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_drivers - * ROS package name: cob_base_drive_chain - * Description: This is a sample implementation of a can-bus with several nodes. In this case it implements the drive-chain of the Care-O-bot3 mobile base. yet, this can be used as template for using the generic_can and canopen_motor packages to implement arbitrary can-setups. - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Christian Connette, email:christian.connette@ipa.fhg.de - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: Feb 2010 - * ToDo: - Check whether motor status request in "setVelGearRadS" "setMotorTorque" make sense (maybe remove in "CanDriveHarmonica"). - * - move implementational details (can cmds) of configureElmoRecorder to CanDriveHarmonica (check whether CanDriveItf has to be adapted then) - * - Check: what is the iRecordingGap, what is its unit - * - Remove Mutex.h search for a Boost lib - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 CANCTRLPLTFCOB3_INCLUDEDEF_H #define CANCTRLPLTFCOB3_INCLUDEDEF_H diff --git a/cob_base_drive_chain/common/src/CanCtrlPltfCOb3.cpp b/cob_base_drive_chain/common/src/CanCtrlPltfCOb3.cpp index af04a2a38..111e572ed 100644 --- a/cob_base_drive_chain/common/src/CanCtrlPltfCOb3.cpp +++ b/cob_base_drive_chain/common/src/CanCtrlPltfCOb3.cpp @@ -1,58 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_drivers - * ROS package name: cob_base_drive_chain - * Description: This is a sample implementation of a can-bus with several nodes. In this case it implements the drive-chain of the Care-O-bot3 mobile base. yet, this can be used as template for using the generic_can and canopen_motor packages to implement arbitrary can-setups. - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Christian Connette, email:christian.connette@ipa.fhg.de - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: Feb 2010 - * ToDo: - Check whether motor status request in "setVelGearRadS" "setMotorTorque" make sense (maybe remove in "CanDriveHarmonica"). - * - move implementational details (can cmds) of configureElmoRecorder to CanDriveHarmonica (check whether CanDriveItf has to be adapted then) - * - Check: what is the iRecordingGap, what is its unit - * - Remove Mutex.h search for a Boost lib - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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. + */ + // general includes #include diff --git a/cob_base_drive_chain/package.xml b/cob_base_drive_chain/package.xml index 5f85896e2..a534c6714 100644 --- a/cob_base_drive_chain/package.xml +++ b/cob_base_drive_chain/package.xml @@ -3,7 +3,7 @@ 0.6.8 This package contains classes that are able to control the platform of the Care-O-Bot. This means to establish a CAN communication to drive and steering motors of the platform and later send motion commands and receive motor information. - LGPL + Apache 2.0 http://ros.org/wiki/cob_base_drive_chain diff --git a/cob_base_drive_chain/ros/src/cob_base_drive_chain.cpp b/cob_base_drive_chain/ros/src/cob_base_drive_chain.cpp index 52ff043be..ec19fcdfc 100644 --- a/cob_base_drive_chain/ros/src/cob_base_drive_chain.cpp +++ b/cob_base_drive_chain/ros/src/cob_base_drive_chain.cpp @@ -1,55 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_base_drive_chain - * Description: This node provides control of the care-o-bot platform drives to the ROS-"network". For this purpose it offers several services and publishes data on different topics. - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Christian Connette, email:christian.connette@ipa.fhg.de - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: Feb 2010: - * ToDo: Doesn't this node has to take care about the Watchdogs? - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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. + */ + //################## //#### includes #### diff --git a/cob_bms_driver/include/cob_bms_driver/cob_bms_driver_node.h b/cob_bms_driver/include/cob_bms_driver/cob_bms_driver_node.h index ee504bf4f..404c14a8a 100644 --- a/cob_bms_driver/include/cob_bms_driver/cob_bms_driver_node.h +++ b/cob_bms_driver/include/cob_bms_driver/cob_bms_driver_node.h @@ -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_BMS_DRIVER_NODE_H #define COB_BMS_DRIVER_NODE_H diff --git a/cob_bms_driver/package.xml b/cob_bms_driver/package.xml index 1bb52a640..f04f857ac 100644 --- a/cob_bms_driver/package.xml +++ b/cob_bms_driver/package.xml @@ -11,7 +11,7 @@ mig-mc Mathias Lüdtke - LGPL + Apache 2.0 catkin diff --git a/cob_bms_driver/src/cob_bms_driver_node.cpp b/cob_bms_driver/src/cob_bms_driver_node.cpp index 44da4a81a..571263817 100644 --- a/cob_bms_driver/src/cob_bms_driver_node.cpp +++ b/cob_bms_driver/src/cob_bms_driver_node.cpp @@ -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 #include #include diff --git a/cob_bms_driver/src/fake_bms.py b/cob_bms_driver/src/fake_bms.py index bd657c9c2..f25cdcb80 100755 --- a/cob_bms_driver/src/fake_bms.py +++ b/cob_bms_driver/src/fake_bms.py @@ -1,4 +1,19 @@ #!/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 from std_msgs.msg import Bool diff --git a/cob_bms_driver/src/power_state_aggregator.py b/cob_bms_driver/src/power_state_aggregator.py index ec75477a0..422ba05a1 100755 --- a/cob_bms_driver/src/power_state_aggregator.py +++ b/cob_bms_driver/src/power_state_aggregator.py @@ -1,4 +1,19 @@ #!/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 numpy diff --git a/cob_camera_sensors/common/include/cob_camera_sensors/AVTPikeCam.h b/cob_camera_sensors/common/include/cob_camera_sensors/AVTPikeCam.h index d53faff29..f40779713 100644 --- a/cob_camera_sensors/common/include/cob_camera_sensors/AVTPikeCam.h +++ b/cob_camera_sensors/common/include/cob_camera_sensors/AVTPikeCam.h @@ -1,55 +1,19 @@ -/**************************************************************** -* -* Copyright (c) 2010 -* -* Fraunhofer Institute for Manufacturing Engineering -* and Automation (IPA) -* -* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -* -* Project name: care-o-bot -* ROS stack name: cob_driver -* ROS package name: cob_camera_sensors -* Description: Interface to AVTPikeCam Firewire Camera. -* -* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -* -* Author: Jan Fischer, email:jan.fischer@ipa.fhg.de -* Supervised by: Jan Fischer, email:jan.fischer@ipa.fhg.de -* -* Date of creation: Nov 2008 -* ToDo: -* -* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -* -* 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. -* * 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. -* * 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. -* -* 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 . -* -****************************************************************/ +/* + * 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. + */ + /// @file AVTPikeCam.h /// Interface to AVTPikeCam Firewire Camera. diff --git a/cob_camera_sensors/common/include/cob_camera_sensors/AbstractColorCamera.h b/cob_camera_sensors/common/include/cob_camera_sensors/AbstractColorCamera.h index 83f0e433c..3ae231592 100644 --- a/cob_camera_sensors/common/include/cob_camera_sensors/AbstractColorCamera.h +++ b/cob_camera_sensors/common/include/cob_camera_sensors/AbstractColorCamera.h @@ -1,55 +1,19 @@ -/**************************************************************** -* -* Copyright (c) 2010 -* -* Fraunhofer Institute for Manufacturing Engineering -* and Automation (IPA) -* -* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -* -* Project name: care-o-bot -* ROS stack name: cob_driver -* ROS package name: cob_camera_sensors -* Description: Abstract interface for color cameras. -* -* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -* -* Author: Jan Fischer, email:jan.fischer@ipa.fhg.de -* Supervised by: Jan Fischer, email:jan.fischer@ipa.fhg.de -* -* Date of creation: May 2008 -* ToDo: -* -* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -* -* 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. -* * 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. -* * 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. -* -* 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 . -* -****************************************************************/ +/* + * 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. + */ + /// @file AbstractColorCamera.h /// Abstract interface for color cameras. diff --git a/cob_camera_sensors/common/include/cob_camera_sensors/AbstractRangeImagingSensor.h b/cob_camera_sensors/common/include/cob_camera_sensors/AbstractRangeImagingSensor.h index 47ab34824..ff56d9ebe 100644 --- a/cob_camera_sensors/common/include/cob_camera_sensors/AbstractRangeImagingSensor.h +++ b/cob_camera_sensors/common/include/cob_camera_sensors/AbstractRangeImagingSensor.h @@ -1,55 +1,19 @@ -/**************************************************************** -* -* Copyright (c) 2010 -* -* Fraunhofer Institute for Manufacturing Engineering -* and Automation (IPA) -* -* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -* -* Project name: care-o-bot -* ROS stack name: cob_driver -* ROS package name: cob_camera_sensors -* Description: Abstract interface for time-of-flight cameras. -* -* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -* -* Author: Jan Fischer, email:jan.fischer@ipa.fhg.de -* Supervised by: Jan Fischer, email:jan.fischer@ipa.fhg.de -* -* Date of creation: May 2008 -* ToDo: -* -* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -* -* 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. -* * 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. -* * 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. -* -* 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 . -* -****************************************************************/ +/* + * 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. + */ + /// @file AbstractRangeImagingSensor.h /// Abstract interface for range imaging sensors. diff --git a/cob_camera_sensors/common/include/cob_camera_sensors/StdAfx.h b/cob_camera_sensors/common/include/cob_camera_sensors/StdAfx.h index 4ad026249..0aa41e65c 100644 --- a/cob_camera_sensors/common/include/cob_camera_sensors/StdAfx.h +++ b/cob_camera_sensors/common/include/cob_camera_sensors/StdAfx.h @@ -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. + */ + + #ifdef __LINUX__ // Void #else @@ -26,4 +43,4 @@ #include "cob_vision/windows/src/extern/TinyXml/tinyxml.h" #include "cob_vision/windows/src/extern/TinyXml/tinystr.h" -#endif \ No newline at end of file +#endif diff --git a/cob_camera_sensors/common/include/cob_camera_sensors/Swissranger.h b/cob_camera_sensors/common/include/cob_camera_sensors/Swissranger.h index 5dc8da198..47666b652 100644 --- a/cob_camera_sensors/common/include/cob_camera_sensors/Swissranger.h +++ b/cob_camera_sensors/common/include/cob_camera_sensors/Swissranger.h @@ -1,56 +1,19 @@ -/**************************************************************** -* -* Copyright (c) 2010 -* -* Fraunhofer Institute for Manufacturing Engineering -* and Automation (IPA) -* -* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -* -* Project name: care-o-bot -* ROS stack name: cob_driver -* ROS package name: cob_camera_sensors -* Description: Platform independent interface to MESA Swissranger camera. -* Implementation depends on libusbSR library. -* -* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -* -* Author: Jan Fischer, email:jan.fischer@ipa.fhg.de -* Supervised by: Jan Fischer, email:jan.fischer@ipa.fhg.de -* -* Date of creation: July 2008 -* ToDo: -* -* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -* -* 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. -* * 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. -* * 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. -* -* 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 . -* -****************************************************************/ +/* + * 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. + */ + /// @file Swissranger.h /// Platform independent interface to MESA Swissranger camera. Implementation depends on diff --git a/cob_camera_sensors/common/include/cob_camera_sensors/VirtualColorCam.h b/cob_camera_sensors/common/include/cob_camera_sensors/VirtualColorCam.h index 307667094..d679a8417 100644 --- a/cob_camera_sensors/common/include/cob_camera_sensors/VirtualColorCam.h +++ b/cob_camera_sensors/common/include/cob_camera_sensors/VirtualColorCam.h @@ -1,55 +1,18 @@ -/**************************************************************** -* -* Copyright (c) 2010 -* -* Fraunhofer Institute for Manufacturing Engineering -* and Automation (IPA) -* -* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -* -* Project name: care-o-bot -* ROS stack name: cob_driver -* ROS package name: cob_camera_sensors -* Description: Virtual color camera representation. -* -* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -* -* Author: Jan Fischer, email:jan.fischer@ipa.fhg.de -* Supervised by: Jan Fischer, email:jan.fischer@ipa.fhg.de -* -* Date of creation: Jan 2009 -* ToDo: -* -* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -* -* 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. -* * 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. -* * 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. -* -* 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 . -* -****************************************************************/ +/* + * 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. + */ /// @file VirtualColorCam.h diff --git a/cob_camera_sensors/common/include/cob_camera_sensors/VirtualRangeCam.h b/cob_camera_sensors/common/include/cob_camera_sensors/VirtualRangeCam.h index 961a7e707..8601443bf 100644 --- a/cob_camera_sensors/common/include/cob_camera_sensors/VirtualRangeCam.h +++ b/cob_camera_sensors/common/include/cob_camera_sensors/VirtualRangeCam.h @@ -1,55 +1,19 @@ -/**************************************************************** -* -* Copyright (c) 2010 -* -* Fraunhofer Institute for Manufacturing Engineering -* and Automation (IPA) -* -* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -* -* Project name: care-o-bot -* ROS stack name: cob_driver -* ROS package name: cob_camera_sensors -* Description: Virtual range camera representation. -* -* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -* -* Author: Jan Fischer, email:jan.fischer@ipa.fhg.de -* Supervised by: Jan Fischer, email:jan.fischer@ipa.fhg.de -* -* Date of creation: Jan 2009 -* ToDo: -* -* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -* -* 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. -* * 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. -* * 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. -* -* 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 . -* -****************************************************************/ +/* + * 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. + */ + /// @file VirtualRangeCam.h /// Virtual range camera representation. diff --git a/cob_camera_sensors/common/src/AVTPikeCam.cpp b/cob_camera_sensors/common/src/AVTPikeCam.cpp index 3e283571a..777d7cf1a 100644 --- a/cob_camera_sensors/common/src/AVTPikeCam.cpp +++ b/cob_camera_sensors/common/src/AVTPikeCam.cpp @@ -1,55 +1,20 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_camera_sensors - * Description: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Jan Fischer, email:jan.fischer@ipa.fhg.de - * Supervised by: Jan Fischer, email:jan.fischer@ipa.fhg.de - * - * Date of creation: Mai 2008 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 "../include/cob_camera_sensors/StdAfx.h" #ifdef __LINUX__ diff --git a/cob_camera_sensors/common/src/AbstractColorCamera.cpp b/cob_camera_sensors/common/src/AbstractColorCamera.cpp index 2e4cab8b4..101adec9a 100644 --- a/cob_camera_sensors/common/src/AbstractColorCamera.cpp +++ b/cob_camera_sensors/common/src/AbstractColorCamera.cpp @@ -1,55 +1,19 @@ -/**************************************************************** -* -* Copyright (c) 2010 -* -* Fraunhofer Institute for Manufacturing Engineering -* and Automation (IPA) -* -* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -* -* Project name: care-o-bot -* ROS stack name: cob_driver -* ROS package name: cob_camera_sensors -* Description: -* -* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -* -* Author: Jan Fischer, email:jan.fischer@ipa.fhg.de -* Supervised by: Jan Fischer, email:jan.fischer@ipa.fhg.de -* -* Date of creation: Mai 2008 -* ToDo: -* -* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -* -* 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. -* * 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. -* * 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. -* -* 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 . -* -****************************************************************/ +/* + * 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 "../include/cob_camera_sensors/StdAfx.h" diff --git a/cob_camera_sensors/common/src/AbstractRangeImagingSensor.cpp b/cob_camera_sensors/common/src/AbstractRangeImagingSensor.cpp index 559ec3de6..6ca47e6c9 100644 --- a/cob_camera_sensors/common/src/AbstractRangeImagingSensor.cpp +++ b/cob_camera_sensors/common/src/AbstractRangeImagingSensor.cpp @@ -1,55 +1,19 @@ -/**************************************************************** -* -* Copyright (c) 2010 -* -* Fraunhofer Institute for Manufacturing Engineering -* and Automation (IPA) -* -* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -* -* Project name: care-o-bot -* ROS stack name: cob_driver -* ROS package name: cob_camera_sensors -* Description: -* -* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -* -* Author: Jan Fischer, email:jan.fischer@ipa.fhg.de -* Supervised by: Jan Fischer, email:jan.fischer@ipa.fhg.de -* -* Date of creation: Mai 2008 -* ToDo: -* -* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -* -* 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. -* * 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. -* * 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. -* -* 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 . -* -****************************************************************/ +/* + * 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 "../include/cob_camera_sensors/StdAfx.h" diff --git a/cob_camera_sensors/common/src/StdAfx.cpp b/cob_camera_sensors/common/src/StdAfx.cpp index f05a2d7b0..848cfb480 100644 --- a/cob_camera_sensors/common/src/StdAfx.cpp +++ b/cob_camera_sensors/common/src/StdAfx.cpp @@ -1 +1,18 @@ -#include "../include/cob_camera_sensors/StdAfx.h" \ No newline at end of file +/* + * 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 "../include/cob_camera_sensors/StdAfx.h" diff --git a/cob_camera_sensors/common/src/Swissranger.cpp b/cob_camera_sensors/common/src/Swissranger.cpp index ee515ce38..cbc1c1b46 100644 --- a/cob_camera_sensors/common/src/Swissranger.cpp +++ b/cob_camera_sensors/common/src/Swissranger.cpp @@ -1,55 +1,20 @@ -/**************************************************************** -* -* Copyright (c) 2010 -* -* Fraunhofer Institute for Manufacturing Engineering -* and Automation (IPA) -* -* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -* -* Project name: care-o-bot -* ROS stack name: cob_driver -* ROS package name: cob_camera_sensors -* Description: -* -* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -* -* Author: Jan Fischer, email:jan.fischer@ipa.fhg.de -* Supervised by: Jan Fischer, email:jan.fischer@ipa.fhg.de -* -* Date of creation: Mai 2008 -* ToDo: -* -* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -* -* 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. -* * 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. -* * 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. -* -* 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 . -* -****************************************************************/ +/* + * 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 "../include/cob_camera_sensors/StdAfx.h" #ifdef __LINUX__ #include "cob_camera_sensors/Swissranger.h" diff --git a/cob_camera_sensors/common/src/VirtualColorCam.cpp b/cob_camera_sensors/common/src/VirtualColorCam.cpp index edc51d550..0bea0f756 100644 --- a/cob_camera_sensors/common/src/VirtualColorCam.cpp +++ b/cob_camera_sensors/common/src/VirtualColorCam.cpp @@ -1,55 +1,20 @@ -/**************************************************************** -* -* Copyright (c) 2010 -* -* Fraunhofer Institute for Manufacturing Engineering -* and Automation (IPA) -* -* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -* -* Project name: care-o-bot -* ROS stack name: cob_driver -* ROS package name: cob_camera_sensors -* Description: -* -* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -* -* Author: Jan Fischer, email:jan.fischer@ipa.fhg.de -* Supervised by: Jan Fischer, email:jan.fischer@ipa.fhg.de -* -* Date of creation: Mai 2008 -* ToDo: -* -* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -* -* 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. -* * 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. -* * 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. -* -* 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 . -* -****************************************************************/ +/* + * 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 "../include/cob_camera_sensors/StdAfx.h" #ifdef __LINUX__ diff --git a/cob_camera_sensors/common/src/VirtualRangeCam.cpp b/cob_camera_sensors/common/src/VirtualRangeCam.cpp index 7e0fbfef9..8e57f8bb7 100644 --- a/cob_camera_sensors/common/src/VirtualRangeCam.cpp +++ b/cob_camera_sensors/common/src/VirtualRangeCam.cpp @@ -1,55 +1,19 @@ -/**************************************************************** -* -* Copyright (c) 2010 -* -* Fraunhofer Institute for Manufacturing Engineering -* and Automation (IPA) -* -* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -* -* Project name: care-o-bot -* ROS stack name: cob_driver -* ROS package name: cob_camera_sensors -* Description: -* -* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -* -* Author: Jan Fischer, email:jan.fischer@ipa.fhg.de -* Supervised by: Jan Fischer, email:jan.fischer@ipa.fhg.de -* -* Date of creation: Mai 2008 -* ToDo: -* -* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -* -* 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. -* * 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. -* * 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. -* -* 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 . -* -****************************************************************/ +/* + * 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 "../include/cob_camera_sensors/StdAfx.h" diff --git a/cob_camera_sensors/package.xml b/cob_camera_sensors/package.xml index cfecfb644..a6b11d063 100644 --- a/cob_camera_sensors/package.xml +++ b/cob_camera_sensors/package.xml @@ -3,7 +3,7 @@ 0.6.8 For more information read the readme.htm file located in - LGPL + Apache 2.0 http://ros.org/wiki/cob_camera_sensors diff --git a/cob_camera_sensors/ros/scripts/set_camera_info.py b/cob_camera_sensors/ros/scripts/set_camera_info.py index ecaecd9da..53e7f4605 100755 --- a/cob_camera_sensors/ros/scripts/set_camera_info.py +++ b/cob_camera_sensors/ros/scripts/set_camera_info.py @@ -1,4 +1,19 @@ -#!/usr/bin/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 from sensor_msgs.msg import * diff --git a/cob_camera_sensors/ros/src/all_camera_viewer.cpp b/cob_camera_sensors/ros/src/all_camera_viewer.cpp index 5ac62e8d0..81076b84c 100644 --- a/cob_camera_sensors/ros/src/all_camera_viewer.cpp +++ b/cob_camera_sensors/ros/src/all_camera_viewer.cpp @@ -1,54 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_drivers - * ROS package name: cob_camera_sensors - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Jan Fischer, email:jan.fischer@ipa.fhg.de - * Supervised by: Jan Fischer, email:jan.fischer@ipa.fhg.de - * - * Date of creation: Jan 2010 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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. + */ + //################## //#### includes #### diff --git a/cob_camera_sensors/ros/src/all_cameras.cpp b/cob_camera_sensors/ros/src/all_cameras.cpp index ca64bbad8..88d78b21d 100644 --- a/cob_camera_sensors/ros/src/all_cameras.cpp +++ b/cob_camera_sensors/ros/src/all_cameras.cpp @@ -1,54 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_camera_sensors - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Jan Fischer, email:jan.fischer@ipa.fhg.de - * Supervised by: Jan Fischer, email:jan.fischer@ipa.fhg.de - * - * Date of creation: Jan 2010 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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. + */ + //################## //#### includes #### diff --git a/cob_camera_sensors/ros/src/color_camera.cpp b/cob_camera_sensors/ros/src/color_camera.cpp index f1879635e..01ed2728a 100644 --- a/cob_camera_sensors/ros/src/color_camera.cpp +++ b/cob_camera_sensors/ros/src/color_camera.cpp @@ -1,54 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_camera_sensors - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Jan Fischer, email:jan.fischer@ipa.fhg.de - * Supervised by: Jan Fischer, email:jan.fischer@ipa.fhg.de - * - * Date of creation: Jan 2010 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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. + */ + //################## //#### includes #### diff --git a/cob_camera_sensors/ros/src/tof_camera.cpp b/cob_camera_sensors/ros/src/tof_camera.cpp index 3afd56de9..d47dbdb9c 100644 --- a/cob_camera_sensors/ros/src/tof_camera.cpp +++ b/cob_camera_sensors/ros/src/tof_camera.cpp @@ -1,54 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_camera_sensors - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Jan Fischer, email:jan.fischer@ipa.fhg.de - * Supervised by: Jan Fischer, email:jan.fischer@ipa.fhg.de - * - * Date of creation: Jan 2010 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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. + */ + //################## //#### includes #### diff --git a/cob_camera_sensors/ros/src/tof_camera_viewer.cpp b/cob_camera_sensors/ros/src/tof_camera_viewer.cpp index 529cb3b18..992723e42 100644 --- a/cob_camera_sensors/ros/src/tof_camera_viewer.cpp +++ b/cob_camera_sensors/ros/src/tof_camera_viewer.cpp @@ -1,54 +1,19 @@ -/**************************************************************** - * - * Copyright (c) 2010 - * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_camera_sensors - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Jan Fischer, email:jan.fischer@ipa.fhg.de - * Supervised by: Jan Fischer, email:jan.fischer@ipa.fhg.de - * - * Date of creation: Jan 2010 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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. +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * You should have received a copy of the GNU Lesser General Public - * License LGPL along with this program. - * If not, see . + * 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. + */ + //################## //#### includes #### diff --git a/cob_camera_sensors/ros/src/undistort_tof.cpp b/cob_camera_sensors/ros/src/undistort_tof.cpp index 1e09c33c9..5f2f3e18a 100644 --- a/cob_camera_sensors/ros/src/undistort_tof.cpp +++ b/cob_camera_sensors/ros/src/undistort_tof.cpp @@ -1,54 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_camera_sensors - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Georg Arbeiter, email:georg.arbeiter@ipa.fhg.de - * Supervised by: Georg Arbeiter, email:georg.arbeiter@ipa.fhg.de - * - * Date of creation: Dec 2010 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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. + */ + //################## //#### includes #### diff --git a/cob_canopen_motor/common/include/cob_canopen_motor/CanDriveHarmonica.h b/cob_canopen_motor/common/include/cob_canopen_motor/CanDriveHarmonica.h index 9f7006075..6c62db935 100644 --- a/cob_canopen_motor/common/include/cob_canopen_motor/CanDriveHarmonica.h +++ b/cob_canopen_motor/common/include/cob_canopen_motor/CanDriveHarmonica.h @@ -1,57 +1,18 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_canopen_motor - * Description: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Christian Connette, email:christian.connette@ipa.fhg.de - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: Feb 2009 - * ToDo: - Assign Adsress of digital input for homing switch "iHomeDigIn" via parameters (in evalReceived Message, Line 116). - * - Homing Event should be defined by a parameterfile and handed to CanDrive... e.g. via the DriveParam.h (in inithoming, Line 531). - * - Check whether "requestStatus" can/should be done in the class implementing the component - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 CANDRIVEHARMONICA_INCLUDEDEF_H diff --git a/cob_canopen_motor/common/include/cob_canopen_motor/CanDriveItf.h b/cob_canopen_motor/common/include/cob_canopen_motor/CanDriveItf.h index 6221f49fc..813989f98 100644 --- a/cob_canopen_motor/common/include/cob_canopen_motor/CanDriveItf.h +++ b/cob_canopen_motor/common/include/cob_canopen_motor/CanDriveItf.h @@ -1,55 +1,18 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_canopen_motor - * Description: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Christian Connette, email:christian.connette@ipa.fhg.de - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: Feb 2009 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 CANDRIVEITF_INCLUDEDEF_H diff --git a/cob_canopen_motor/common/include/cob_canopen_motor/DriveParam.h b/cob_canopen_motor/common/include/cob_canopen_motor/DriveParam.h index 562a16d4e..88957e74a 100644 --- a/cob_canopen_motor/common/include/cob_canopen_motor/DriveParam.h +++ b/cob_canopen_motor/common/include/cob_canopen_motor/DriveParam.h @@ -1,55 +1,18 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_canopen_motor - * Description: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Christian Connette, email:christian.connette@ipa.fhg.de - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: Feb 2010 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 DRIVEPARAM_INCLUDEDEF_H diff --git a/cob_canopen_motor/common/include/cob_canopen_motor/ElmoRecorder.h b/cob_canopen_motor/common/include/cob_canopen_motor/ElmoRecorder.h index cb354af28..f61a3962f 100644 --- a/cob_canopen_motor/common/include/cob_canopen_motor/ElmoRecorder.h +++ b/cob_canopen_motor/common/include/cob_canopen_motor/ElmoRecorder.h @@ -1,58 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob3_common - * ROS package name: canopen_motor - * Description: The in Elmo drives integrated Recorder allows the user to record drive information at a high frequency. - * The Recorder firstly has to be configured properly. It can be started immidiately after configuring or later, triggered by a signal (e.g. a begin-motion-command). - * When the recording is finished, you can read out the data via CANopen using a segmented SDO transfer. Appropriate functions for this CANopen specific process are provided by the CanDriveHarmonica class. - * This class brings all the functions to use the Elmo Recorder in a comfortable way. - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Philipp Köhler - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: Mar 2010 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 _ElmoRecorder_H #define _ElmoRecorder_H diff --git a/cob_canopen_motor/common/include/cob_canopen_motor/SDOSegmented.h b/cob_canopen_motor/common/include/cob_canopen_motor/SDOSegmented.h index c6733c9fd..ce278dafa 100644 --- a/cob_canopen_motor/common/include/cob_canopen_motor/SDOSegmented.h +++ b/cob_canopen_motor/common/include/cob_canopen_motor/SDOSegmented.h @@ -1,55 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_canopen_motor - * Description: This class is used to collect data that is uploaded to the master in an segmented SDO transfer. Additionally, it includes some administrative functions for this proccess. - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Philipp Köhler - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: Mar 2010 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 _SDOSegmented_H #define _SDOSegmented_H diff --git a/cob_canopen_motor/common/src/CanDriveHarmonica.cpp b/cob_canopen_motor/common/src/CanDriveHarmonica.cpp index c50bf7529..9f41e32fe 100644 --- a/cob_canopen_motor/common/src/CanDriveHarmonica.cpp +++ b/cob_canopen_motor/common/src/CanDriveHarmonica.cpp @@ -1,57 +1,18 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_canopen_motor - * Description: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Christian Connette, email:christian.connette@ipa.fhg.de - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: Feb 2009 - * ToDo: - Assign Adsress of digital input for homing switch "iHomeDigIn" via parameters (in evalReceived Message, Line 116). - * - Homing Event should be defined by a parameterfile and handed to CanDrive... e.g. via the DriveParam.h (in inithoming, Line 531). - * - Check whether "requestStatus" can/should be done in the class implementing the component - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 diff --git a/cob_canopen_motor/common/src/ElmoRecorder.cpp b/cob_canopen_motor/common/src/ElmoRecorder.cpp index 2f66fb41d..17646a208 100644 --- a/cob_canopen_motor/common/src/ElmoRecorder.cpp +++ b/cob_canopen_motor/common/src/ElmoRecorder.cpp @@ -1,55 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob3_common - * ROS package name: canopen_motor - * Description: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Philipp Köhler - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: Mar 2010 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 #include diff --git a/cob_canopen_motor/package.xml b/cob_canopen_motor/package.xml index ced5c332d..454974b1f 100644 --- a/cob_canopen_motor/package.xml +++ b/cob_canopen_motor/package.xml @@ -3,7 +3,7 @@ 0.6.8 The package cob_canopen_motor implements a controller-drive component which is connected to a can-bus and works with a canopen-interface. "CanDriveItf" provides a - more or less - generic interface to the controller-drive components. "CanDrvie..." then implements a specific setup, e.g. an ELMO Harmonica Controller in case of the "CanDriveHarmonica". - LGPL + Apache 2.0 http://ros.org/wiki/cob_canopen_motor diff --git a/cob_driver/package.xml b/cob_driver/package.xml index 21c3d4b6c..00f2ab6b4 100644 --- a/cob_driver/package.xml +++ b/cob_driver/package.xml @@ -3,7 +3,7 @@ 0.6.8 The cob_driver stack includes packages that provide access to the Care-O-bot hardware through ROS messages, services and actions. E.g. for mobile base, arm, camera sensors, laser scanners, etc... - LGPL + Apache 2.0 http://ros.org/wiki/cob_driver diff --git a/cob_elmo_homing/package.xml b/cob_elmo_homing/package.xml index ed1b47fab..24dbb822c 100644 --- a/cob_elmo_homing/package.xml +++ b/cob_elmo_homing/package.xml @@ -7,7 +7,7 @@ Mathias Lüdtke Mathias Lüdtke - LGPLv3 + Apache 2.0 catkin canopen_402 diff --git a/cob_elmo_homing/src/plugin.cpp b/cob_elmo_homing/src/plugin.cpp index ff60b5c43..80f6d5a85 100644 --- a/cob_elmo_homing/src/plugin.cpp +++ b/cob_elmo_homing/src/plugin.cpp @@ -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 #include diff --git a/cob_generic_can/common/include/cob_generic_can/CanESD.h b/cob_generic_can/common/include/cob_generic_can/CanESD.h index 44b7be751..dd639e7ee 100644 --- a/cob_generic_can/common/include/cob_generic_can/CanESD.h +++ b/cob_generic_can/common/include/cob_generic_can/CanESD.h @@ -1,55 +1,18 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_drivers - * ROS package name: cob_generic_can - * Description: This class implements the interface to an ESD can node - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Christian Connette, email:christian.connette@ipa.fhg.de - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: April 2010 - * ToDo: - Remove Mutex.h search for a Boost lib - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 CANESD_INCLUDEDEF_H diff --git a/cob_generic_can/common/include/cob_generic_can/CanItf.h b/cob_generic_can/common/include/cob_generic_can/CanItf.h index 22d5b1934..3281c39c0 100644 --- a/cob_generic_can/common/include/cob_generic_can/CanItf.h +++ b/cob_generic_can/common/include/cob_generic_can/CanItf.h @@ -1,55 +1,18 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_generic_can - * Description: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Christian Connette, email:christian.connette@ipa.fhg.de - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: Feb 2009 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 CANITF_INCLUDEDEF_H diff --git a/cob_generic_can/common/include/cob_generic_can/CanMsg.h b/cob_generic_can/common/include/cob_generic_can/CanMsg.h index 770cf1fd1..e83cc50df 100644 --- a/cob_generic_can/common/include/cob_generic_can/CanMsg.h +++ b/cob_generic_can/common/include/cob_generic_can/CanMsg.h @@ -1,55 +1,18 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob3_common - * ROS package name: generic_can - * Description: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Christian Connette, email:christian.connette@ipa.fhg.de - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: Feb 2009 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 CANMSG_INCLUDEDEF_H diff --git a/cob_generic_can/common/include/cob_generic_can/CanPeakSys.h b/cob_generic_can/common/include/cob_generic_can/CanPeakSys.h index bbe0bc16f..0ed7a0d0b 100644 --- a/cob_generic_can/common/include/cob_generic_can/CanPeakSys.h +++ b/cob_generic_can/common/include/cob_generic_can/CanPeakSys.h @@ -1,55 +1,18 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_drivers - * ROS package name: cob_generic_can - * Description: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Christian Connette, email:christian.connette@ipa.fhg.de - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: Feb 2009 - * ToDo: Remove dependency to inifiles_old -> Inifile.h - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 CANPEAKSYS_INCLUDEDEF_H diff --git a/cob_generic_can/common/include/cob_generic_can/CanPeakSysUSB.h b/cob_generic_can/common/include/cob_generic_can/CanPeakSysUSB.h index d4ac95bb2..b75bd23f6 100644 --- a/cob_generic_can/common/include/cob_generic_can/CanPeakSysUSB.h +++ b/cob_generic_can/common/include/cob_generic_can/CanPeakSysUSB.h @@ -1,55 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_drivers - * ROS package name: cob_generic_can - * Description: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Christian Connette, email:christian.connette@ipa.fhg.de - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: Feb 2009 - * ToDo: Remove dependency to inifiles_old -> Inifile.h - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 CANPEAKSYSUSB_INCLUDEDEF_H #define CANPEAKSYSUSB_INCLUDEDEF_H diff --git a/cob_generic_can/common/include/cob_generic_can/SocketCan.h b/cob_generic_can/common/include/cob_generic_can/SocketCan.h index 5085c2587..cce85d806 100644 --- a/cob_generic_can/common/include/cob_generic_can/SocketCan.h +++ b/cob_generic_can/common/include/cob_generic_can/SocketCan.h @@ -1,43 +1,19 @@ -/***************************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright 2016 Intelligent Industrial Robotics (IIROB) Group, - * Institute for Anthropomatics and Robotics (IAR) - - * Intelligent Process Control and Robotics (IPR), - * Karlsruhe Institute of Technology (KIT) + * 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 * - * Author: Denis Štogl, email: denis.stogl@kit.edu - * Andreea Tulbure, email: andreea_tulbure@yahoo.de - * - * Date of creation: February 2016 - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * Neither the name of the copyright holder nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * This package is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This package 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 for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this package. If not, see . -*****************************************************************************/ + * 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 SOCKETCAN_INCLUDEDEF_H #define SOCKETCAN_INCLUDEDEF_H diff --git a/cob_generic_can/common/src/CanESD.cpp b/cob_generic_can/common/src/CanESD.cpp index 3c45f2d9d..69abc0533 100644 --- a/cob_generic_can/common/src/CanESD.cpp +++ b/cob_generic_can/common/src/CanESD.cpp @@ -1,55 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_drivers - * ROS package name: cob_generic_can - * Description: This class implements the interface to an ESD can node - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Christian Connette, email:christian.connette@ipa.fhg.de - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: April 2010 - * ToDo: - Remove Mutex.h search for a Boost lib - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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. + */ + // general includes diff --git a/cob_generic_can/common/src/CanPeakSys.cpp b/cob_generic_can/common/src/CanPeakSys.cpp index bac9f446f..185c65dc7 100644 --- a/cob_generic_can/common/src/CanPeakSys.cpp +++ b/cob_generic_can/common/src/CanPeakSys.cpp @@ -1,55 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_drivers - * ROS package name: cob_generic_can - * Description: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Christian Connette, email:christian.connette@ipa.fhg.de - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: Feb 2009 - * ToDo: Remove dependency to inifiles_old -> Inifile.h - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 #include diff --git a/cob_generic_can/common/src/CanPeakSysUSB.cpp b/cob_generic_can/common/src/CanPeakSysUSB.cpp index a174ed21a..6230663e9 100644 --- a/cob_generic_can/common/src/CanPeakSysUSB.cpp +++ b/cob_generic_can/common/src/CanPeakSysUSB.cpp @@ -1,55 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_generic_can - * Description: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Christian Connette, email:christian.connette@ipa.fhg.de - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: Feb 2009 - * ToDo: Remove dependency to inifiles_old -> Inifile.h - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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. + */ + //#define __DEBUG__ diff --git a/cob_generic_can/common/src/SocketCan.cpp b/cob_generic_can/common/src/SocketCan.cpp index f8a4c1a69..8abeddbe9 100644 --- a/cob_generic_can/common/src/SocketCan.cpp +++ b/cob_generic_can/common/src/SocketCan.cpp @@ -1,43 +1,19 @@ -/***************************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright 2016 Intelligent Industrial Robotics (IIROB) Group, - * Institute for Anthropomatics and Robotics (IAR) - - * Intelligent Process Control and Robotics (IPR), - * Karlsruhe Institute of Technology (KIT) + * 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 * - * Author: Denis Štogl, email: denis.stogl@kit.edu - * Andreea Tulbure, email: andreea_tulbure@yahoo.de - * - * Date of creation: February 2016 - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * Neither the name of the copyright holder nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * This package is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This package 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 for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this package. If not, see . -*****************************************************************************/ + * 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 #include diff --git a/cob_generic_can/package.xml b/cob_generic_can/package.xml index 6d325d3bf..a0f68a25b 100644 --- a/cob_generic_can/package.xml +++ b/cob_generic_can/package.xml @@ -3,7 +3,7 @@ 0.6.8 The package cob_generic_can provides an interface for nodes on a can-bus and examplary wrappers for two PeakSys-can-libs. When a can-bus-device is generated (for an example see base_dirve_chain) you can use generic_can to create as many itfs as there will be components communicating via this can-bus. Assign type of the can communication device (e.g. usb-to-can or can-card of a specific vendor) and can-address of the target device. This package comes with wrappers for PeakSys and PeakSysUSB adapters. - LGPL + Apache 2.0 http://ros.org/wiki/cob_generic_can diff --git a/cob_head_axis/common/include/cob_head_axis/ElmoCtrl.h b/cob_head_axis/common/include/cob_head_axis/ElmoCtrl.h index c7b83452b..ad2fb8ca0 100644 --- a/cob_head_axis/common/include/cob_head_axis/ElmoCtrl.h +++ b/cob_head_axis/common/include/cob_head_axis/ElmoCtrl.h @@ -1,54 +1,18 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob3_driver - * ROS package name: cob_head_axis - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Ulrich Reiser, email:ulrich.reiser@ipa.fhg.de - * - * Date of creation: Jul 2010 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 __ELMO_CTRL_H__ diff --git a/cob_head_axis/common/src/ElmoCtrl.cpp b/cob_head_axis/common/src/ElmoCtrl.cpp index 241b777b0..29d094d1c 100644 --- a/cob_head_axis/common/src/ElmoCtrl.cpp +++ b/cob_head_axis/common/src/ElmoCtrl.cpp @@ -1,53 +1,18 @@ -/**************************************************************** - * - * Copyright (c) 2010 - * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob3_driver - * ROS package name: cob_head_axis - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Ulrich Reiser, email:ulrich.reiser@ipa.fhg.de - * - * Date of creation: Jul 2010 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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. +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * You should have received a copy of the GNU Lesser General Public - * License LGPL along with this program. - * If not, see . + * 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 diff --git a/cob_head_axis/package.xml b/cob_head_axis/package.xml index f677619c9..1b3691ca0 100644 --- a/cob_head_axis/package.xml +++ b/cob_head_axis/package.xml @@ -3,7 +3,7 @@ 0.6.8 cob_head_axis - LGPL + Apache 2.0 http://ros.org/wiki/cob_head_axis diff --git a/cob_head_axis/ros/src/cob_head_axis.cpp b/cob_head_axis/ros/src/cob_head_axis.cpp index 9f517ae8f..293c62d4f 100644 --- a/cob_head_axis/ros/src/cob_head_axis.cpp +++ b/cob_head_axis/ros/src/cob_head_axis.cpp @@ -1,53 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob3_driver - * ROS package name: cob_head_axis - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Ulrich Reiser, email:ulrich.reiser@ipa.fhg.de - * - * Date of creation: Jan 2010 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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. + */ + //################## //#### includes #### diff --git a/cob_head_axis/ros/src/dummy_head.py b/cob_head_axis/ros/src/dummy_head.py index 5289331a6..aba56dfa0 100755 --- a/cob_head_axis/ros/src/dummy_head.py +++ b/cob_head_axis/ros/src/dummy_head.py @@ -1,4 +1,19 @@ #!/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 from sensor_msgs.msg import JointState diff --git a/cob_light/common/include/breathColorMode.h b/cob_light/common/include/breathColorMode.h index 819ec3415..132c8b4a3 100644 --- a/cob_light/common/include/breathColorMode.h +++ b/cob_light/common/include/breathColorMode.h @@ -1,56 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_light - * Description: Switch robots led color by sending data to - * the led-µC over serial connection. - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * Supervised by: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * - * Date of creation: August 2012 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 BREATHCOLORMODE_H #define BREATHCOLORMODE_H diff --git a/cob_light/common/include/breathMode.h b/cob_light/common/include/breathMode.h index d9021e773..3a6e5fa92 100644 --- a/cob_light/common/include/breathMode.h +++ b/cob_light/common/include/breathMode.h @@ -1,56 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_light - * Description: Switch robots led color by sending data to - * the led-µC over serial connection. - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * Supervised by: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * - * Date of creation: August 2012 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 BREATHMODE_H #define BREATHMODE_H diff --git a/cob_light/common/include/circleColorMode.h b/cob_light/common/include/circleColorMode.h index 4c2885c36..08d1ca999 100644 --- a/cob_light/common/include/circleColorMode.h +++ b/cob_light/common/include/circleColorMode.h @@ -1,3 +1,19 @@ +/* + * 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 CIRCLECOLORMODE_H #define CIRCLECOLORMODE_H diff --git a/cob_light/common/include/colorUtils.h b/cob_light/common/include/colorUtils.h index c30e18692..47a452dda 100644 --- a/cob_light/common/include/colorUtils.h +++ b/cob_light/common/include/colorUtils.h @@ -1,56 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_light - * Description: Switch robots led color by sending data to - * the led-µC over serial connection. - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * Supervised by: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * - * Date of creation: August 2012 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 COLOR_UTILS_H #define COLOR_UTILS_H diff --git a/cob_light/common/include/concurrentQueue.h b/cob_light/common/include/concurrentQueue.h index 8b381aa8e..78c77cce3 100644 --- a/cob_light/common/include/concurrentQueue.h +++ b/cob_light/common/include/concurrentQueue.h @@ -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 #include #include diff --git a/cob_light/common/include/distApproxMode.h b/cob_light/common/include/distApproxMode.h index 3502de094..1d8db8ed6 100644 --- a/cob_light/common/include/distApproxMode.h +++ b/cob_light/common/include/distApproxMode.h @@ -1,3 +1,19 @@ +/* + * 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 DISTAPPROXMODE_H #define DISTAPPROXMODE_H diff --git a/cob_light/common/include/fadeColorMode.h b/cob_light/common/include/fadeColorMode.h index 3b0c8e8f7..3ca6d73c8 100644 --- a/cob_light/common/include/fadeColorMode.h +++ b/cob_light/common/include/fadeColorMode.h @@ -1,56 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_light - * Description: Switch robots led color by sending data to - * the led-µC over serial connection. - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * Supervised by: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * - * Date of creation: August 2012 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 FADECOLORMODE_H #define FADECOLORMODE_H diff --git a/cob_light/common/include/flashMode.h b/cob_light/common/include/flashMode.h index 688c67a44..451c1ef51 100644 --- a/cob_light/common/include/flashMode.h +++ b/cob_light/common/include/flashMode.h @@ -1,56 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_light - * Description: Switch robots led color by sending data to - * the led-µC over serial connection. - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * Supervised by: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * - * Date of creation: August 2012 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 FLASHMODE_H #define FLASHMODE_H diff --git a/cob_light/common/include/glowColorMode.h b/cob_light/common/include/glowColorMode.h index d1080b881..668e33eb1 100644 --- a/cob_light/common/include/glowColorMode.h +++ b/cob_light/common/include/glowColorMode.h @@ -1,56 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2016 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_light - * Description: Switch robots led color by sending data to - * the led-µC over serial connection. - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * Supervised by: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * - * Date of creation: Feb 2016 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 GLOWCOLORMODE_H #define GLOWCOLORMODE_H diff --git a/cob_light/common/include/mode.h b/cob_light/common/include/mode.h index 2900a2246..86c87d71c 100644 --- a/cob_light/common/include/mode.h +++ b/cob_light/common/include/mode.h @@ -1,56 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_light - * Description: Switch robots led color by sending data to - * the led-µC over serial connection. - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * Supervised by: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * - * Date of creation: August 2012 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 MODE_H #define MODE_H diff --git a/cob_light/common/include/modeExecutor.h b/cob_light/common/include/modeExecutor.h index d59d5f8bd..ff19baf4a 100644 --- a/cob_light/common/include/modeExecutor.h +++ b/cob_light/common/include/modeExecutor.h @@ -1,56 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_light - * Description: Switch robots led color by sending data to - * the led-µC over serial connection. - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * Supervised by: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * - * Date of creation: August 2012 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 MODEEXECUTOR_H #define MODEEXECUTOR_H diff --git a/cob_light/common/include/modeFactory.h b/cob_light/common/include/modeFactory.h index 130be1f11..62393e4e9 100644 --- a/cob_light/common/include/modeFactory.h +++ b/cob_light/common/include/modeFactory.h @@ -1,56 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_light - * Description: Switch robots led color by sending data to - * the led-µC over serial connection. - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * Supervised by: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * - * Date of creation: August 2012 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 MODEFACTORY_H #define MODEFACTORY_H diff --git a/cob_light/common/include/modeRunner.h b/cob_light/common/include/modeRunner.h index 603703e3c..d8d595a3b 100644 --- a/cob_light/common/include/modeRunner.h +++ b/cob_light/common/include/modeRunner.h @@ -1,56 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_light - * Description: Switch robots led color by sending data to - * the led-µC over serial connection. - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * Supervised by: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * - * Date of creation: August 2012 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 MODERUNNER_H #define MODERUNNER_H @@ -75,4 +38,4 @@ class ModeRunner void run(); }; -#endif \ No newline at end of file +#endif diff --git a/cob_light/common/include/sequenceMode.h b/cob_light/common/include/sequenceMode.h index f83e51fc4..987ff53bf 100644 --- a/cob_light/common/include/sequenceMode.h +++ b/cob_light/common/include/sequenceMode.h @@ -1,56 +1,19 @@ - /**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_light - * Description: Switch robots led color by sending data to - * the led-µC over serial connection. - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * Supervised by: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * - * Date of creation: August 2012 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 SEQUENCEMODE_H #define SEQUENCEMODE_H diff --git a/cob_light/common/include/serialIO.h b/cob_light/common/include/serialIO.h index bde8cc450..83d78167c 100644 --- a/cob_light/common/include/serialIO.h +++ b/cob_light/common/include/serialIO.h @@ -1,56 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_light - * Description: Switch robots led color by sending data to - * the led-µC over serial connection. - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * Supervised by: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * - * Date of creation: August 2012 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 SERIALIO_H #define SERIALIO_H diff --git a/cob_light/common/include/staticMode.h b/cob_light/common/include/staticMode.h index b6a6aee18..8d1336840 100644 --- a/cob_light/common/include/staticMode.h +++ b/cob_light/common/include/staticMode.h @@ -1,56 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_light - * Description: Switch robots led color by sending data to - * the led-µC over serial connection. - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * Supervised by: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * - * Date of creation: August 2012 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 STATICMODE_H #define STATICMODE_H diff --git a/cob_light/common/include/sweepColorMode.h b/cob_light/common/include/sweepColorMode.h index 4214d5a94..be67f58b4 100644 --- a/cob_light/common/include/sweepColorMode.h +++ b/cob_light/common/include/sweepColorMode.h @@ -1,3 +1,19 @@ +/* + * 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 SWEEPCOLORMODE_H #define SWEEPCOLORMODE_H diff --git a/cob_light/common/include/xmasMode.h b/cob_light/common/include/xmasMode.h index 0c30e0604..90b088983 100644 --- a/cob_light/common/include/xmasMode.h +++ b/cob_light/common/include/xmasMode.h @@ -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 XMASMODE_H #define XMASMODE_H diff --git a/cob_light/common/src/modeExecutor.cpp b/cob_light/common/src/modeExecutor.cpp index 1dfb0d721..28effe1c8 100644 --- a/cob_light/common/src/modeExecutor.cpp +++ b/cob_light/common/src/modeExecutor.cpp @@ -1,56 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_light - * Description: Switch robots led color by sending data to - * the led-µC over serial connection. - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * Supervised by: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * - * Date of creation: August 2012 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 #include diff --git a/cob_light/common/src/modeFactory.cpp b/cob_light/common/src/modeFactory.cpp index f87ea3886..f94789f6f 100644 --- a/cob_light/common/src/modeFactory.cpp +++ b/cob_light/common/src/modeFactory.cpp @@ -1,56 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_light - * Description: Switch robots led color by sending data to - * the led-µC over serial connection. - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * Supervised by: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * - * Date of creation: August 2012 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 #include diff --git a/cob_light/common/src/serialIO.cpp b/cob_light/common/src/serialIO.cpp index bbf62df70..4fc0ddd84 100644 --- a/cob_light/common/src/serialIO.cpp +++ b/cob_light/common/src/serialIO.cpp @@ -1,56 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_light - * Description: Switch robots led color by sending data to - * the led-µC over serial connection. - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * Supervised by: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * - * Date of creation: August 2012 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 "serialIO.h" #include "sys/select.h" diff --git a/cob_light/package.xml b/cob_light/package.xml index 68fbd7c8a..a3e1a5e6e 100644 --- a/cob_light/package.xml +++ b/cob_light/package.xml @@ -3,7 +3,7 @@ 0.6.8 This package contains scripts to operate the LED lights on Care-O-bot. - LGPL + Apache 2.0 http://ros.org/wiki/cob_light diff --git a/cob_light/ros/include/colorO.h b/cob_light/ros/include/colorO.h index 6e5e67f5b..015a414b0 100644 --- a/cob_light/ros/include/colorO.h +++ b/cob_light/ros/include/colorO.h @@ -1,56 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_light - * Description: Switch robots led color by sending data to - * the led-µC over serial connection. - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * Supervised by: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * - * Date of creation: August 2012 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 COLORO_H #define COLORO_H diff --git a/cob_light/ros/include/colorOSim.h b/cob_light/ros/include/colorOSim.h index ed0dedb50..b165b7fe8 100644 --- a/cob_light/ros/include/colorOSim.h +++ b/cob_light/ros/include/colorOSim.h @@ -1,56 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_light - * Description: Switch robots led color by sending data to - * the led-µC over serial connection. - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * Supervised by: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * - * Date of creation: August 2012 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 COLOROSIM_H #define COLOROSIM_H diff --git a/cob_light/ros/include/iColorO.h b/cob_light/ros/include/iColorO.h index aa628cfa4..a96fb8adb 100644 --- a/cob_light/ros/include/iColorO.h +++ b/cob_light/ros/include/iColorO.h @@ -1,56 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_light - * Description: Switch robots led color by sending data to - * the led-µC over serial connection. - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * Supervised by: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * - * Date of creation: August 2012 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 ICOLORO_H #define ICOLORO_H diff --git a/cob_light/ros/include/ms35.h b/cob_light/ros/include/ms35.h index bfb7e67b7..06b790087 100644 --- a/cob_light/ros/include/ms35.h +++ b/cob_light/ros/include/ms35.h @@ -1,56 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_light - * Description: Switch robots led color by sending data to - * the led-µC over serial connection. - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * Supervised by: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * - * Date of creation: August 2012 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 ES35_H #define ES35_H diff --git a/cob_light/ros/include/stageprofi.h b/cob_light/ros/include/stageprofi.h index 1fa669c03..26e4a76fe 100644 --- a/cob_light/ros/include/stageprofi.h +++ b/cob_light/ros/include/stageprofi.h @@ -1,55 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2014 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_light - * Description: Switch robots led color by sending data to - * the DMX StageProfi - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Thiago de Freitas, email:tdf@ipa.fhg.de - * Supervised by: Thiago de Freitas, email:tdf@ipa.fhg.de - * - * Date of creation: October 2014 - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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_DRIVER_STAGE_PROFI_H #define COB_DRIVER_STAGE_PROFI_H diff --git a/cob_light/ros/scripts/light_action_test.py b/cob_light/ros/scripts/light_action_test.py index 0b81878d1..df3109023 100755 --- a/cob_light/ros/scripts/light_action_test.py +++ b/cob_light/ros/scripts/light_action_test.py @@ -1,4 +1,19 @@ #!/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 diff --git a/cob_light/ros/scripts/light_service_test.py b/cob_light/ros/scripts/light_service_test.py index b3ee5ffd5..bbfbf6f4d 100755 --- a/cob_light/ros/scripts/light_service_test.py +++ b/cob_light/ros/scripts/light_service_test.py @@ -1,4 +1,19 @@ #!/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 diff --git a/cob_light/ros/scripts/test.py b/cob_light/ros/scripts/test.py index 90f353f30..f24359c64 100755 --- a/cob_light/ros/scripts/test.py +++ b/cob_light/ros/scripts/test.py @@ -1,55 +1,19 @@ -#!/usr/bin/python -#*************************************************************** +#!/usr/bin/env python # -# Copyright (c) 2010 +# Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) # -# 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 # -# Project name: care-o-bot -# ROS stack name: cob_driver -# ROS package name: cob_light -# -# +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -# -# Author: Florian Weisshardt, email:florian.weisshardt@ipa.fhg.de -# Supervised by: Florian Weisshardt, email:florian.weisshardt@ipa.fhg.de -# -# Date of creation: June 2010 -# ToDo: -# -# +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -# -# 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. -# * 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. -# * 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. -# -# 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 . -# -#**************************************************************** +# 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 time diff --git a/cob_light/ros/scripts/test_sprofi_circle.py b/cob_light/ros/scripts/test_sprofi_circle.py index 36a91a9af..55974487e 100755 --- a/cob_light/ros/scripts/test_sprofi_circle.py +++ b/cob_light/ros/scripts/test_sprofi_circle.py @@ -1,54 +1,19 @@ -#!/usr/bin/python -#*************************************************************** +#!/usr/bin/env python # -# Copyright (c) 2014 +# Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) # -# 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 # -# Project name: care-o-bot -# ROS stack name: cob_driver -# ROS package name: cob_light -# -# +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -# -# Author: Thiago de Freitas, email:tdf@ipa.fhg.de -# Supervised by: Thiago de Freitas, email:tdf@ipa.fhg.de -# -# Date of creation: October 2014 -# -# +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -# -# 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. -# * 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. -# * 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. -# -# 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 . -# -#**************************************************************** +# 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 time diff --git a/cob_light/ros/scripts/test_sprofi_modes.py b/cob_light/ros/scripts/test_sprofi_modes.py index 29244dd22..095de0cba 100755 --- a/cob_light/ros/scripts/test_sprofi_modes.py +++ b/cob_light/ros/scripts/test_sprofi_modes.py @@ -1,54 +1,19 @@ -#!/usr/bin/python -#*************************************************************** +#!/usr/bin/env python # -# Copyright (c) 2014 +# Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) # -# 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 # -# Project name: care-o-bot -# ROS stack name: cob_driver -# ROS package name: cob_light -# -# +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -# -# Author: Thiago de Freitas, email:tdf@ipa.fhg.de -# Supervised by: Thiago de Freitas, email:tdf@ipa.fhg.de -# -# Date of creation: October 2014 -# -# +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -# -# 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. -# * 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. -# * 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. -# -# 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 . -# -#**************************************************************** +# 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 time diff --git a/cob_light/ros/scripts/test_sprofi_part.py b/cob_light/ros/scripts/test_sprofi_part.py index 22a85e0c5..91165b609 100755 --- a/cob_light/ros/scripts/test_sprofi_part.py +++ b/cob_light/ros/scripts/test_sprofi_part.py @@ -1,54 +1,19 @@ -#!/usr/bin/python -#*************************************************************** +#!/usr/bin/env python # -# Copyright (c) 2014 +# Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) # -# 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 # -# Project name: care-o-bot -# ROS stack name: cob_driver -# ROS package name: cob_light -# -# +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -# -# Author: Thiago de Freitas, email:tdf@ipa.fhg.de -# Supervised by: Thiago de Freitas, email:tdf@ipa.fhg.de -# -# Date of creation: October 2014 -# -# +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -# -# 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. -# * 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. -# * 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. -# -# 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 . -# -#**************************************************************** +# 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 time diff --git a/cob_light/ros/src/cob_light.cpp b/cob_light/ros/src/cob_light.cpp index b8d0a315e..4e09e2fc6 100644 --- a/cob_light/ros/src/cob_light.cpp +++ b/cob_light/ros/src/cob_light.cpp @@ -1,56 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_light - * Description: Switch robots led color by sending data to - * the led-µC over serial connection. - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * Supervised by: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * - * Date of creation: August 2012 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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. + */ + // standard includes #include diff --git a/cob_light/ros/src/colorO.cpp b/cob_light/ros/src/colorO.cpp index 03f3ede65..cda63879a 100644 --- a/cob_light/ros/src/colorO.cpp +++ b/cob_light/ros/src/colorO.cpp @@ -1,56 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_light - * Description: Switch robots led color by sending data to - * the led-µC over serial connection. - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * Supervised by: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * - * Date of creation: August 2012 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 #include diff --git a/cob_light/ros/src/colorOSim.cpp b/cob_light/ros/src/colorOSim.cpp index 1e0441740..6d1e6f821 100644 --- a/cob_light/ros/src/colorOSim.cpp +++ b/cob_light/ros/src/colorOSim.cpp @@ -1,56 +1,18 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_light - * Description: Switch robots led color by sending data to - * the led-µC over serial connection. - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * Supervised by: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * - * Date of creation: August 2012 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 #include diff --git a/cob_light/ros/src/ms35.cpp b/cob_light/ros/src/ms35.cpp index 599dd2943..c65e61cb7 100644 --- a/cob_light/ros/src/ms35.cpp +++ b/cob_light/ros/src/ms35.cpp @@ -1,56 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_light - * Description: Switch robots led color by sending data to - * the led-µC over serial connection. - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * Supervised by: Benjamin Maidel, email:benjamin.maidel@ipa.fraunhofer.de - * - * Date of creation: August 2012 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 #include diff --git a/cob_light/ros/src/stageprofi.cpp b/cob_light/ros/src/stageprofi.cpp index 4c39108f5..d5806146c 100644 --- a/cob_light/ros/src/stageprofi.cpp +++ b/cob_light/ros/src/stageprofi.cpp @@ -1,55 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2014 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_light - * Description: Switch robots led color by sending data to - * the DMX StageProfi - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Thiago de Freitas, email:tdf@ipa.fhg.de - * Supervised by: Thiago de Freitas, email:tdf@ipa.fhg.de - * - * Date of creation: October 2014 - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 #include diff --git a/cob_mimic/package.xml b/cob_mimic/package.xml index f63032bad..128d51584 100644 --- a/cob_mimic/package.xml +++ b/cob_mimic/package.xml @@ -3,7 +3,7 @@ 0.6.8 This package implements the Care-O-bot mimic - LGPL + Apache 2.0 http://ros.org/wiki/cob_mimic diff --git a/cob_mimic/src/test_mimic.py b/cob_mimic/src/test_mimic.py index 041e8b5c1..e226d60e8 100755 --- a/cob_mimic/src/test_mimic.py +++ b/cob_mimic/src/test_mimic.py @@ -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 roslib import rospy diff --git a/cob_phidget_em_state/package.xml b/cob_phidget_em_state/package.xml index fe9154f55..954d98acc 100644 --- a/cob_phidget_em_state/package.xml +++ b/cob_phidget_em_state/package.xml @@ -7,7 +7,7 @@ Benjamin Maidel Benjamin Maidel - LGPL + Apache 2.0 catkin cob_msgs diff --git a/cob_phidget_em_state/scripts/em_state_phidget.py b/cob_phidget_em_state/scripts/em_state_phidget.py index a9c397460..1028b26d9 100755 --- a/cob_phidget_em_state/scripts/em_state_phidget.py +++ b/cob_phidget_em_state/scripts/em_state_phidget.py @@ -1,4 +1,19 @@ #!/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 from cob_phidgets.msg import AnalogSensor diff --git a/cob_phidget_power_state/package.xml b/cob_phidget_power_state/package.xml index c9f0216d4..51e4e95df 100644 --- a/cob_phidget_power_state/package.xml +++ b/cob_phidget_power_state/package.xml @@ -7,7 +7,7 @@ Benjamin Maidel Benjamin Maidel - LGPL + Apache 2.0 catkin cob_msgs diff --git a/cob_phidget_power_state/scripts/power_state_phidget.py b/cob_phidget_power_state/scripts/power_state_phidget.py index 8dc75207b..bcc6fe67a 100755 --- a/cob_phidget_power_state/scripts/power_state_phidget.py +++ b/cob_phidget_power_state/scripts/power_state_phidget.py @@ -1,4 +1,19 @@ #!/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 numpy as np import rospy diff --git a/cob_phidgets/common/include/cob_phidgets/phidget.h b/cob_phidgets/common/include/cob_phidgets/phidget.h index 80f3231c1..d1b7e5d15 100644 --- a/cob_phidgets/common/include/cob_phidgets/phidget.h +++ b/cob_phidgets/common/include/cob_phidgets/phidget.h @@ -1,61 +1,19 @@ -/*! - ***************************************************************** - * \file - * - * \note - * Copyright (c) 2012 \n - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) \n\n - * - ***************************************************************** - * - * \note - * Project name: care-o-bot - * \note - * ROS stack name: cob_driver - * \note - * ROS package name: cob_phidgets - * - * \author - * Author: Benjamin Maidel, mail: bnm@ipa.fhg.de - * \author - * Supervised by: - * - * \date Date of creation: 29.07.2013 - * - * \brief - * this package integrates phidget boards into the ros system - * - ***************************************************************** - * - * 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 . - * - ****************************************************************/ +/* + * 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 _PHIDGET_H_ #define _PHIDGET_H_ diff --git a/cob_phidgets/common/include/cob_phidgets/phidgetik.h b/cob_phidgets/common/include/cob_phidgets/phidgetik.h index c6b5edab0..1b6516bbc 100644 --- a/cob_phidgets/common/include/cob_phidgets/phidgetik.h +++ b/cob_phidgets/common/include/cob_phidgets/phidgetik.h @@ -1,61 +1,19 @@ -/*! - ***************************************************************** - * \file +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * \note - * Copyright (c) 2012 \n - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) \n\n + * 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 - * Project name: care-o-bot - * \note - * ROS stack name: cob_driver - * \note - * ROS package name: cob_phidgets - * - * \author - * Author: Benjamin Maidel, mail: bnm@ipa.fhg.de - * \author - * Supervised by: - * - * \date Date of creation: 29.07.2013 - * - * \brief - * this package integrates phidget boards into the ros system - * - ***************************************************************** - * - * 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.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 _PHIDGETIK_H_ #define _PHIDGETIK_H_ diff --git a/cob_phidgets/common/src/phidget.cpp b/cob_phidgets/common/src/phidget.cpp index a25319b09..89aae4176 100644 --- a/cob_phidgets/common/src/phidget.cpp +++ b/cob_phidgets/common/src/phidget.cpp @@ -1,61 +1,18 @@ -/*! - ***************************************************************** - * \file +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * \note - * Copyright (c) 2012 \n - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) \n\n + * 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 - * Project name: care-o-bot - * \note - * ROS stack name: cob_driver - * \note - * ROS package name: cob_phidgets - * - * \author - * Author: Benjamin Maidel, mail: bnm@ipa.fhg.de - * \author - * Supervised by: - * - * \date Date of creation: 29.07.2013 - * - * \brief - * this package integrates phidget boards into the ros system - * - ***************************************************************** - * - * 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.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 #include diff --git a/cob_phidgets/common/src/phidgetik.cpp b/cob_phidgets/common/src/phidgetik.cpp index ecbf8eca8..df77c0be8 100644 --- a/cob_phidgets/common/src/phidgetik.cpp +++ b/cob_phidgets/common/src/phidgetik.cpp @@ -1,61 +1,19 @@ -/*! - ***************************************************************** - * \file +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * \note - * Copyright (c) 2012 \n - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) \n\n + * 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 - * Project name: care-o-bot - * \note - * ROS stack name: cob_driver - * \note - * ROS package name: cob_phidgets - * - * \author - * Author: Benjamin Maidel, mail: bnm@ipa.fhg.de - * \author - * Supervised by: - * - * \date Date of creation: 29.07.2013 - * - * \brief - * this package integrates phidget boards into the ros system - * - ***************************************************************** - * - * 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.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 diff --git a/cob_phidgets/package.xml b/cob_phidgets/package.xml index 72e70eef4..ece93ad3f 100644 --- a/cob_phidgets/package.xml +++ b/cob_phidgets/package.xml @@ -3,7 +3,7 @@ 0.6.8 cob_phidgets - LGPL + Apache 2.0 http://ros.org/wiki/cob_phidgets diff --git a/cob_phidgets/ros/include/cob_phidgets/phidget_manager.h b/cob_phidgets/ros/include/cob_phidgets/phidget_manager.h index 269a705f0..7812fb886 100644 --- a/cob_phidgets/ros/include/cob_phidgets/phidget_manager.h +++ b/cob_phidgets/ros/include/cob_phidgets/phidget_manager.h @@ -1,61 +1,19 @@ -/*! - ***************************************************************** - * \file +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * \note - * Copyright (c) 2012 \n - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) \n\n + * 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 - * Project name: care-o-bot - * \note - * ROS stack name: cob_driver - * \note - * ROS package name: cob_phidgets - * - * \author - * Author: Benjamin Maidel, mail: bnm@ipa.fhg.de - * \author - * Supervised by: - * - * \date Date of creation: 29.07.2013 - * - * \brief - * this package integrates phidget boards into the ros system - * - ***************************************************************** - * - * 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.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 _PHIDGETMANAGER_H_ #define _PHIDGETMANAGER_H_ diff --git a/cob_phidgets/ros/include/cob_phidgets/phidgetik_ros.h b/cob_phidgets/ros/include/cob_phidgets/phidgetik_ros.h index 98bdf6c16..6ce575824 100644 --- a/cob_phidgets/ros/include/cob_phidgets/phidgetik_ros.h +++ b/cob_phidgets/ros/include/cob_phidgets/phidgetik_ros.h @@ -1,61 +1,19 @@ -/*! - ***************************************************************** - * \file +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * \note - * Copyright (c) 2012 \n - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) \n\n + * 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 - * Project name: care-o-bot - * \note - * ROS stack name: cob_driver - * \note - * ROS package name: cob_phidgets - * - * \author - * Author: Benjamin Maidel, mail: bnm@ipa.fhg.de - * \author - * Supervised by: - * - * \date Date of creation: 29.07.2013 - * - * \brief - * this package integrates phidget boards into the ros system - * - ***************************************************************** - * - * 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.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 _PHIDGETIKROS_H_ #define _PHIDGETIKROS_H_ diff --git a/cob_phidgets/ros/src/ifkit.c b/cob_phidgets/ros/src/ifkit.c index df92164c7..b64706afa 100644 --- a/cob_phidgets/ros/src/ifkit.c +++ b/cob_phidgets/ros/src/ifkit.c @@ -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. + */ + + // InterfacekitTest.cpp : Defines the entry point for the console application. // diff --git a/cob_phidgets/ros/src/phidget_manager.cpp b/cob_phidgets/ros/src/phidget_manager.cpp index 7db6d4fbd..7a11c72ce 100644 --- a/cob_phidgets/ros/src/phidget_manager.cpp +++ b/cob_phidgets/ros/src/phidget_manager.cpp @@ -1,61 +1,19 @@ -/*! - ***************************************************************** - * \file +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * \note - * Copyright (c) 2012 \n - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) \n\n + * 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 - * Project name: care-o-bot - * \note - * ROS stack name: cob_driver - * \note - * ROS package name: cob_phidgets - * - * \author - * Author: Benjamin Maidel, mail: bnm@ipa.fhg.de - * \author - * Supervised by: - * - * \date Date of creation: 29.07.2013 - * - * \brief - * this package integrates phidget boards into the ros system - * - ***************************************************************** - * - * 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.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 #include diff --git a/cob_phidgets/ros/src/phidget_sensors_node.cpp b/cob_phidgets/ros/src/phidget_sensors_node.cpp index 8a0888814..70799e72d 100644 --- a/cob_phidgets/ros/src/phidget_sensors_node.cpp +++ b/cob_phidgets/ros/src/phidget_sensors_node.cpp @@ -1,61 +1,19 @@ -/*! - ***************************************************************** - * \file +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * \note - * Copyright (c) 2012 \n - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) \n\n + * 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 - * Project name: care-o-bot - * \note - * ROS stack name: cob_driver - * \note - * ROS package name: cob_phidgets - * - * \author - * Author: Benjamin Maidel, mail: bnm@ipa.fhg.de - * \author - * Supervised by: - * - * \date Date of creation: 29.07.2013 - * - * \brief - * this package integrates phidget boards into the ros system - * - ***************************************************************** - * - * 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.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 #include diff --git a/cob_phidgets/ros/src/phidgetik_ros.cpp b/cob_phidgets/ros/src/phidgetik_ros.cpp index 55a4f498b..47300f1a7 100644 --- a/cob_phidgets/ros/src/phidgetik_ros.cpp +++ b/cob_phidgets/ros/src/phidgetik_ros.cpp @@ -1,61 +1,19 @@ -/*! - ***************************************************************** - * \file +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * \note - * Copyright (c) 2012 \n - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) \n\n + * 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 - * Project name: care-o-bot - * \note - * ROS stack name: cob_driver - * \note - * ROS package name: cob_phidgets - * - * \author - * Author: Benjamin Maidel, mail: bnm@ipa.fhg.de - * \author - * Supervised by: - * - * \date Date of creation: 29.07.2013 - * - * \brief - * this package integrates phidget boards into the ros system - * - ***************************************************************** - * - * 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.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 diff --git a/cob_phidgets/ros/src/phidgets_range_sensors.cpp b/cob_phidgets/ros/src/phidgets_range_sensors.cpp index 5bf218ea1..3f18ccde4 100644 --- a/cob_phidgets/ros/src/phidgets_range_sensors.cpp +++ b/cob_phidgets/ros/src/phidgets_range_sensors.cpp @@ -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. + */ + + // see http://www.phidgets.com/products.php?category=2&product_id=3520_0 // distance calculation: Distance (cm) = 2076/(SensorValue - 11) (the formula is only valid for a SensorValue between 80 to 530) // TODO: separate into two packages: cob_phidgets_driver (publishing only raw values as sensor_msgs/Range message) and cob_tray_status (evaluating the Range messages to decide if tray is occupied or not, eventually also at which position it is occupied) diff --git a/cob_phidgets/ros/src/set_device_name.cpp b/cob_phidgets/ros/src/set_device_name.cpp index 4ee5928c2..27058e251 100644 --- a/cob_phidgets/ros/src/set_device_name.cpp +++ b/cob_phidgets/ros/src/set_device_name.cpp @@ -1,10 +1,24 @@ +/* + * 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. + */ + + // - Manager simple - // This is a simple example showing how to setup a phidget manager and display a list of the currently connected // Phidgets devices to the PC. -// -// Copyright 2008 Phidgets Inc. All rights reserved. -// This work is licensed under the Creative Commons Attribution 2.5 Canada License. -// view a copy of this license, visit http://creativecommons.org/licenses/by/2.5/ca/ + #include diff --git a/cob_phidgets/ros/src/simulated_range_sensors.py b/cob_phidgets/ros/src/simulated_range_sensors.py index d13a7b900..07d9bcc3a 100755 --- a/cob_phidgets/ros/src/simulated_range_sensors.py +++ b/cob_phidgets/ros/src/simulated_range_sensors.py @@ -1,4 +1,19 @@ #!/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 from sensor_msgs.msg import * diff --git a/cob_phidgets/ros/src/tablet_leer.c b/cob_phidgets/ros/src/tablet_leer.c index 723a8e8b7..327072866 100644 --- a/cob_phidgets/ros/src/tablet_leer.c +++ b/cob_phidgets/ros/src/tablet_leer.c @@ -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. + */ + + // InterfacekitTest.cpp : Defines the entry point for the console application. // diff --git a/cob_relayboard/common/include/cob_relayboard/CmdRelaisBoard.h b/cob_relayboard/common/include/cob_relayboard/CmdRelaisBoard.h index deea5035e..067174d5d 100644 --- a/cob_relayboard/common/include/cob_relayboard/CmdRelaisBoard.h +++ b/cob_relayboard/common/include/cob_relayboard/CmdRelaisBoard.h @@ -1,36 +1,18 @@ -/********************************************************************* - * Software License Agreement (BSD License) +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2011, Neobotix GmbH - * All rights reserved. + * 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 * - * 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. - * * 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. - * * Neither the name of the Neobotix nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - *********************************************************************/ + * 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 CMDRELAISBOARD_INCLUDEDEF_H diff --git a/cob_relayboard/common/include/cob_relayboard/Mutex.h b/cob_relayboard/common/include/cob_relayboard/Mutex.h index 2529efb02..c2244cc7f 100644 --- a/cob_relayboard/common/include/cob_relayboard/Mutex.h +++ b/cob_relayboard/common/include/cob_relayboard/Mutex.h @@ -1,55 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_relayboard - * Description: custom Mutex implementation - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Christian Connette, email:christian.connette@ipa.fhg.de - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: Feb 2009 - * ToDo: - Remove this class - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 MUTEX_INCLUDEDEF_H #define MUTEX_INCLUDEDEF_H diff --git a/cob_relayboard/common/include/cob_relayboard/SerRelayBoard.h b/cob_relayboard/common/include/cob_relayboard/SerRelayBoard.h index de70c9a49..54092820d 100644 --- a/cob_relayboard/common/include/cob_relayboard/SerRelayBoard.h +++ b/cob_relayboard/common/include/cob_relayboard/SerRelayBoard.h @@ -1,55 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_relayboard - * Description: Class for communication with relayboard. The relayboard is mainly used for reading the Emergencystop and Laserscannerstop states. - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Philipp Koehler - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: March 2010 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 SerRelayBoard_INCLUDEDEF_H #define SerRelayBoard_INCLUDEDEF_H diff --git a/cob_relayboard/common/include/cob_relayboard/SerialIO.h b/cob_relayboard/common/include/cob_relayboard/SerialIO.h index 8f7d72ac7..ab9025d20 100644 --- a/cob_relayboard/common/include/cob_relayboard/SerialIO.h +++ b/cob_relayboard/common/include/cob_relayboard/SerialIO.h @@ -1,55 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_relayboard - * Description: Class for communication with relayboard. The relayboard is mainly used for reading the Emergencystop and Laserscannerstop states. - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Philipp Koehler - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: March 2010 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 _SerialIO_H #define _SerialIO_H diff --git a/cob_relayboard/common/include/cob_relayboard/StrUtil.h b/cob_relayboard/common/include/cob_relayboard/StrUtil.h index e537e58a7..736ff46a4 100644 --- a/cob_relayboard/common/include/cob_relayboard/StrUtil.h +++ b/cob_relayboard/common/include/cob_relayboard/StrUtil.h @@ -1,55 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob3_common - * ROS package name: generic_can - * Description: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Matthias Bengel, email:matthias.bengel@ipa.fhg.de - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: Feb 2009 - * ToDo: Check if this can be removed - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 STRUTIL_H #define STRUTIL_H diff --git a/cob_relayboard/common/src/SerRelayBoard.cpp b/cob_relayboard/common/src/SerRelayBoard.cpp index 1c72068c0..0ec84565c 100644 --- a/cob_relayboard/common/src/SerRelayBoard.cpp +++ b/cob_relayboard/common/src/SerRelayBoard.cpp @@ -1,55 +1,18 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_relayboard - * Description: Class for communication with relayboard. The relayboard is mainly used for reading the Emergencystop and Laserscannerstop states. - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Philipp Koehler - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: March 2010 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 diff --git a/cob_relayboard/common/src/SerialIO.cpp b/cob_relayboard/common/src/SerialIO.cpp index ed00fbf80..20238f7ab 100644 --- a/cob_relayboard/common/src/SerialIO.cpp +++ b/cob_relayboard/common/src/SerialIO.cpp @@ -1,55 +1,19 @@ -/**************************************************************** - * - * Copyright (c) 2010 - * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_relayboard - * Description: Class for general Serial communication under Linux OS. - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Philipp Koehler - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: March 2010 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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. +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * You should have received a copy of the GNU Lesser General Public - * License LGPL along with this program. - * If not, see . + * 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 "stdafx.h" #include diff --git a/cob_relayboard/common/src/StrUtil.cpp b/cob_relayboard/common/src/StrUtil.cpp index e35683a8b..e449f7497 100644 --- a/cob_relayboard/common/src/StrUtil.cpp +++ b/cob_relayboard/common/src/StrUtil.cpp @@ -1,55 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob3_common - * ROS package name: generic_can - * Description: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Matthias Bengel, email:matthias.bengel@ipa.fhg.de - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: Feb 2009 - * ToDo: Check if this can be removed - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 #include diff --git a/cob_relayboard/package.xml b/cob_relayboard/package.xml index d1c8b644d..b4986d8c3 100644 --- a/cob_relayboard/package.xml +++ b/cob_relayboard/package.xml @@ -2,7 +2,7 @@ cob_relayboard 0.6.8 cob_relayboard - LGPL + Apache 2.0 http://ros.org/wiki/cob_relayboard diff --git a/cob_relayboard/ros/src/cob_relayboard_node.cpp b/cob_relayboard/ros/src/cob_relayboard_node.cpp index 53806c015..6683837fd 100644 --- a/cob_relayboard/ros/src/cob_relayboard_node.cpp +++ b/cob_relayboard/ros/src/cob_relayboard_node.cpp @@ -1,55 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_relayboard - * Description: Reads and sends data over Serial Interface to the Serial Relayboard. Main Tasks: Reading of EmergencyStop and LaserScannerStop - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Philipp Koehler - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: March 2010 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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. + */ + //################## //#### includes #### diff --git a/cob_relayboard/ros/src/new_method.py b/cob_relayboard/ros/src/new_method.py index 55de1724c..7d5f5f995 100755 --- a/cob_relayboard/ros/src/new_method.py +++ b/cob_relayboard/ros/src/new_method.py @@ -1,4 +1,19 @@ #!/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 from cob_msgs.msg import EmergencyStopState diff --git a/cob_relayboard/ros/src/relayboard_sim.py b/cob_relayboard/ros/src/relayboard_sim.py index 2e193a15a..ad465a279 100755 --- a/cob_relayboard/ros/src/relayboard_sim.py +++ b/cob_relayboard/ros/src/relayboard_sim.py @@ -1,4 +1,19 @@ #!/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 from std_msgs.msg import Float64 diff --git a/cob_scan_unifier/include/cob_scan_unifier/scan_unifier_node.h b/cob_scan_unifier/include/cob_scan_unifier/scan_unifier_node.h index 6cad211a3..62579266f 100644 --- a/cob_scan_unifier/include/cob_scan_unifier/scan_unifier_node.h +++ b/cob_scan_unifier/include/cob_scan_unifier/scan_unifier_node.h @@ -1,60 +1,19 @@ -/*! -***************************************************************** -* \file -* -* \note -* Copyright (c) 2014 \n -* Fraunhofer Institute for Manufacturing Engineering -* and Automation (IPA) \n\n -* -***************************************************************** -* -* \note -* Repository name: cob_navigation -* \note -* ROS package name: cob_scan_unifier -* -* \author -* Author: Florian Mirus, email:florian.mirus@ipa.fhg.de -* \author -* Supervised by: Alexander Bubeck, email:alexander.bubeck@ipa.fhg.de -* -* \date Date of creation: January 2011 -* \date Last Modification: June 2014 -* -* \brief -* Takes in several laser scans and publishes them as a single one -* -***************************************************************** -* -* 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 . -* -****************************************************************/ +/* + * 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 SCAN_UNIFIER_NODE_H #define SCAN_UNIFIER_NODE_H diff --git a/cob_scan_unifier/package.xml b/cob_scan_unifier/package.xml index 886b05330..5e0c91ce3 100644 --- a/cob_scan_unifier/package.xml +++ b/cob_scan_unifier/package.xml @@ -6,7 +6,7 @@ Benjamin Maidel - LGPL + Apache 2.0 Florian Mirus diff --git a/cob_scan_unifier/src/scan_unifier_node.cpp b/cob_scan_unifier/src/scan_unifier_node.cpp index 9c07a688d..198a5248b 100644 --- a/cob_scan_unifier/src/scan_unifier_node.cpp +++ b/cob_scan_unifier/src/scan_unifier_node.cpp @@ -1,60 +1,19 @@ -/*! -***************************************************************** -* \file -* -* \note -* Copyright (c) 2014 \n -* Fraunhofer Institute for Manufacturing Engineering -* and Automation (IPA) \n\n -* -***************************************************************** -* -* \note -* Repository name: cob_navigation -* \note -* ROS package name: cob_scan_unifier -* -* \author -* Author: Florian Mirus, email:florian.mirus@ipa.fhg.de -* \author -* Supervised by: Alexander Bubeck, email:alexander.bubeck@ipa.fhg.de -* -* \date Date of creation: January 2011 -* \date Last Modification: June 2014 -* -* \brief -* Takes in several laser scans and publishes them as a single one -* -***************************************************************** -* -* 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 . -* -****************************************************************/ +/* + * 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 diff --git a/cob_sick_lms1xx/common/include/lms1xx.h b/cob_sick_lms1xx/common/include/lms1xx.h index e82651c37..d5668e845 100644 --- a/cob_sick_lms1xx/common/include/lms1xx.h +++ b/cob_sick_lms1xx/common/include/lms1xx.h @@ -1,25 +1,19 @@ /* - * LMS1xx.h + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Created on: 09-08-2010 - * Author: Konrad Banachowicz - *************************************************************************** - * This library is free software; you can redistribute it and/or * - * modify it under the terms of the GNU Lesser General Public * - * License as published by the Free Software Foundation; either * - * version 2.1 of the License, or (at your option) any later version. * - * * - * This library 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 for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this library; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, * - * Suite 330, Boston, MA 02111-1307 USA * - * * - ***************************************************************************/ + * 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 LMS1XX_H_ #define LMS1XX_H_ diff --git a/cob_sick_lms1xx/common/src/lms1xx.cpp b/cob_sick_lms1xx/common/src/lms1xx.cpp index c0ada73a3..52d94ee3b 100644 --- a/cob_sick_lms1xx/common/src/lms1xx.cpp +++ b/cob_sick_lms1xx/common/src/lms1xx.cpp @@ -1,25 +1,19 @@ /* - * LMS1xx.cpp + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Created on: 09-08-2010 - * Author: Konrad Banachowicz - *************************************************************************** - * This library is free software; you can redistribute it and/or * - * modify it under the terms of the GNU Lesser General Public * - * License as published by the Free Software Foundation; either * - * version 2.1 of the License, or (at your option) any later version. * - * * - * This library 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 for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this library; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, * - * Suite 330, Boston, MA 02111-1307 USA * - * * - ***************************************************************************/ + * 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 #include diff --git a/cob_sick_lms1xx/common/src/test.cpp b/cob_sick_lms1xx/common/src/test.cpp index adca5b716..2b9fea908 100644 --- a/cob_sick_lms1xx/common/src/test.cpp +++ b/cob_sick_lms1xx/common/src/test.cpp @@ -1,25 +1,19 @@ /* - * test.cpp + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Created on: 09-08-2010 - * Author: Konrad Banachowicz - *************************************************************************** - * This library is free software; you can redistribute it and/or * - * modify it under the terms of the GNU Lesser General Public * - * License as published by the Free Software Foundation; either * - * version 2.1 of the License, or (at your option) any later version. * - * * - * This library 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 for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this library; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, * - * Suite 330, Boston, MA 02111-1307 USA * - * * - ***************************************************************************/ + * 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 "lms1xx.h" diff --git a/cob_sick_lms1xx/doc/Doxyfile b/cob_sick_lms1xx/doc/Doxyfile index be0c29f88..dc80032ee 100644 --- a/cob_sick_lms1xx/doc/Doxyfile +++ b/cob_sick_lms1xx/doc/Doxyfile @@ -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. + + # Doxyfile 1.6.1 # This file describes the settings to be used by the documentation system diff --git a/cob_sick_lms1xx/package.xml b/cob_sick_lms1xx/package.xml index 99d86faaa..c72234323 100644 --- a/cob_sick_lms1xx/package.xml +++ b/cob_sick_lms1xx/package.xml @@ -9,7 +9,7 @@ Denis Stogl Konrad Banachowicz - GPL,LGPL + Apache 2.0 http://ros.org/wiki/cob_sick_lms1xx catkin diff --git a/cob_sick_lms1xx/ros/src/lms1xx_node.cpp b/cob_sick_lms1xx/ros/src/lms1xx_node.cpp index d67b1083a..fd44c21c7 100644 --- a/cob_sick_lms1xx/ros/src/lms1xx_node.cpp +++ b/cob_sick_lms1xx/ros/src/lms1xx_node.cpp @@ -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. + */ + + // standard includes #include #include diff --git a/cob_sick_lms1xx/ros/src/set_config.cpp b/cob_sick_lms1xx/ros/src/set_config.cpp index 905f243b2..62dd210ab 100644 --- a/cob_sick_lms1xx/ros/src/set_config.cpp +++ b/cob_sick_lms1xx/ros/src/set_config.cpp @@ -1,9 +1,19 @@ /* - * setConfig.cpp + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Created on: 09-09-2011 - * Author: konradb3 + * 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 diff --git a/cob_sick_s300/common/include/cob_sick_s300/Errors.hpp b/cob_sick_s300/common/include/cob_sick_s300/Errors.hpp index dfe70da18..97150e54f 100644 --- a/cob_sick_s300/common/include/cob_sick_s300/Errors.hpp +++ b/cob_sick_s300/common/include/cob_sick_s300/Errors.hpp @@ -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 BRICS_OODL_ERRORS_H #define BRICS_OODL_ERRORS_H diff --git a/cob_sick_s300/common/include/cob_sick_s300/LaserScannerConfiguration.hpp b/cob_sick_s300/common/include/cob_sick_s300/LaserScannerConfiguration.hpp index 7d9b421b6..ecfbf45cf 100644 --- a/cob_sick_s300/common/include/cob_sick_s300/LaserScannerConfiguration.hpp +++ b/cob_sick_s300/common/include/cob_sick_s300/LaserScannerConfiguration.hpp @@ -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 BRICS_OODL_LASERSCANNERCONFIGURATION_H #define BRICS_OODL_LASERSCANNERCONFIGURATION_H diff --git a/cob_sick_s300/common/include/cob_sick_s300/Logger.hpp b/cob_sick_s300/common/include/cob_sick_s300/Logger.hpp index 1ada1e3d2..331e7af9d 100644 --- a/cob_sick_s300/common/include/cob_sick_s300/Logger.hpp +++ b/cob_sick_s300/common/include/cob_sick_s300/Logger.hpp @@ -1,53 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2011 - * All rights reserved. + * 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 * - * Hochschule Bonn-Rhein-Sieg - * University of Applied Sciences - * Computer Science Department - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: - * Jan Paulus, Nico Hochgeschwender, Michael Reckhaus, Azamat Shakhimardanov - * Supervised by: - * Gerhard K. Kraetzschmar - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * This sofware is published under a dual-license: GNU Lesser General Public - * License LGPL 2.1 and BSD license. The dual-license implies that users of this - * code may choose which terms they prefer. - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * Neither the name of the Hochschule Bonn-Rhein-Sieg nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * 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 2.1 of the - * License, or (at your option) any later version or the BSD 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 Lesser General Public License LGPL and the BSD license for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License LGPL and BSD license along with this program. - * - ****************************************************************/ + * 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 BRICS_OODL_LOGGER_HPP #define BRICS_OODL_LOGGER_HPP diff --git a/cob_sick_s300/common/include/cob_sick_s300/ScannerSickS300.h b/cob_sick_s300/common/include/cob_sick_s300/ScannerSickS300.h index 48daa3f4f..9a6a523d7 100644 --- a/cob_sick_s300/common/include/cob_sick_s300/ScannerSickS300.h +++ b/cob_sick_s300/common/include/cob_sick_s300/ScannerSickS300.h @@ -1,55 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_sick_s300 - * Description: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Christian Connette, email:christian.connette@ipa.fhg.de - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: Jan 2009 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 SCANNERSICKS300_INCLUDEDEF_H #define SCANNERSICKS300_INCLUDEDEF_H diff --git a/cob_sick_s300/common/include/cob_sick_s300/SerialIO.h b/cob_sick_s300/common/include/cob_sick_s300/SerialIO.h index 9fb48faf7..ba43be457 100644 --- a/cob_sick_s300/common/include/cob_sick_s300/SerialIO.h +++ b/cob_sick_s300/common/include/cob_sick_s300/SerialIO.h @@ -1,55 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_sick_s300 - * Description: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Christian Connette, email:christian.connette@ipa.fhg.de - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: Jan 2009 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 _SerialIO_H #define _SerialIO_H diff --git a/cob_sick_s300/common/include/cob_sick_s300/TelegramS300.h b/cob_sick_s300/common/include/cob_sick_s300/TelegramS300.h index 5a04b2a0b..5238ca85b 100644 --- a/cob_sick_s300/common/include/cob_sick_s300/TelegramS300.h +++ b/cob_sick_s300/common/include/cob_sick_s300/TelegramS300.h @@ -1,55 +1,19 @@ -/**************************************************************** - * - * Copyright (c) 2010 - * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_sick_s300 - * Description: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Christian Connette, email:christian.connette@ipa.fhg.de - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: Jan 2009 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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. +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * You should have received a copy of the GNU Lesser General Public - * License LGPL along with this program. - * If not, see . + * 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. + */ + #pragma once diff --git a/cob_sick_s300/common/include/cob_sick_s300/Units.hpp b/cob_sick_s300/common/include/cob_sick_s300/Units.hpp index 305bbb04b..085e65b19 100644 --- a/cob_sick_s300/common/include/cob_sick_s300/Units.hpp +++ b/cob_sick_s300/common/include/cob_sick_s300/Units.hpp @@ -1,9 +1,19 @@ /* - * File: Units.h - * Author: jan + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Created on September 1, 2010, 5:36 PM + * 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 BRICS_OODL_UNITS_HPP #define BRICS_OODL_UNITS_HPP diff --git a/cob_sick_s300/common/src/Errors.cpp b/cob_sick_s300/common/src/Errors.cpp index 9a1129993..bdeb1d3cf 100644 --- a/cob_sick_s300/common/src/Errors.cpp +++ b/cob_sick_s300/common/src/Errors.cpp @@ -1,3 +1,19 @@ +/* + * 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 "cob_sick_s300/Errors.hpp" namespace brics_oodl { diff --git a/cob_sick_s300/common/src/LaserScannerConfiguration.cpp b/cob_sick_s300/common/src/LaserScannerConfiguration.cpp index 238a990bb..340542efd 100644 --- a/cob_sick_s300/common/src/LaserScannerConfiguration.cpp +++ b/cob_sick_s300/common/src/LaserScannerConfiguration.cpp @@ -1,9 +1,20 @@ -/** - * \file +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * \author - * \date + * 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 "cob_sick_s300/LaserScannerConfiguration.hpp" namespace brics_oodl { diff --git a/cob_sick_s300/common/src/Logger.cpp b/cob_sick_s300/common/src/Logger.cpp index 5d05e6230..1db9de929 100644 --- a/cob_sick_s300/common/src/Logger.cpp +++ b/cob_sick_s300/common/src/Logger.cpp @@ -1,53 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2011 - * All rights reserved. + * 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 * - * Hochschule Bonn-Rhein-Sieg - * University of Applied Sciences - * Computer Science Department - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: - * Jan Paulus, Nico Hochgeschwender, Michael Reckhaus, Azamat Shakhimardanov - * Supervised by: - * Gerhard K. Kraetzschmar - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * This sofware is published under a dual-license: GNU Lesser General Public - * License LGPL 2.1 and BSD license. The dual-license implies that users of this - * code may choose which terms they prefer. - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * Neither the name of the Hochschule Bonn-Rhein-Sieg nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * 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 2.1 of the - * License, or (at your option) any later version or the BSD 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 Lesser General Public License LGPL and the BSD license for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License LGPL and BSD license along with this program. - * - ****************************************************************/ + * 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 "cob_sick_s300/Logger.hpp" diff --git a/cob_sick_s300/common/src/ScannerSickS300.cpp b/cob_sick_s300/common/src/ScannerSickS300.cpp index 2d9bec110..89371c1af 100644 --- a/cob_sick_s300/common/src/ScannerSickS300.cpp +++ b/cob_sick_s300/common/src/ScannerSickS300.cpp @@ -1,55 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_sick_s300 - * Description: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Christian Connette, email:christian.connette@ipa.fhg.de - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: Jan 2009 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 diff --git a/cob_sick_s300/common/src/SerialIO.cpp b/cob_sick_s300/common/src/SerialIO.cpp index 0ee10ba75..fb68506d4 100644 --- a/cob_sick_s300/common/src/SerialIO.cpp +++ b/cob_sick_s300/common/src/SerialIO.cpp @@ -1,55 +1,19 @@ -/**************************************************************** - * - * Copyright (c) 2010 - * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_sick_s300 - * Description: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Christian Connette, email:christian.connette@ipa.fhg.de - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: Jan 2009 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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. +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * You should have received a copy of the GNU Lesser General Public - * License LGPL along with this program. - * If not, see . + * 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 "stdafx.h" #include "cob_sick_s300/SerialIO.h" diff --git a/cob_sick_s300/package.xml b/cob_sick_s300/package.xml index 56dfee6e6..3a8fac294 100644 --- a/cob_sick_s300/package.xml +++ b/cob_sick_s300/package.xml @@ -3,7 +3,7 @@ 0.6.8 This package published a laser scan message out of a Sick S300 laser scanner. - LGPL + Apache 2.0 http://ros.org/wiki/cob_sick_s300 diff --git a/cob_sick_s300/ros/src/cob_scan_filter.cpp b/cob_sick_s300/ros/src/cob_scan_filter.cpp index 67244d61a..9bf446d78 100644 --- a/cob_sick_s300/ros/src/cob_scan_filter.cpp +++ b/cob_sick_s300/ros/src/cob_scan_filter.cpp @@ -1,55 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_sick_s300 - * Description: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Florian Weisshardt, email:florian.weisshardt@ipa.fhg.de - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: Jan 2010 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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. + */ + //################## //#### includes #### diff --git a/cob_sick_s300/ros/src/cob_sick_s300.cpp b/cob_sick_s300/ros/src/cob_sick_s300.cpp index ca15cff81..f15e066fb 100644 --- a/cob_sick_s300/ros/src/cob_sick_s300.cpp +++ b/cob_sick_s300/ros/src/cob_sick_s300.cpp @@ -1,55 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_sick_s300 - * Description: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Florian Weisshardt, email:florian.weisshardt@ipa.fhg.de - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: Jan 2010 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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. + */ + //################## //#### includes #### diff --git a/cob_sound/package.xml b/cob_sound/package.xml index a873c619e..e3b135be2 100644 --- a/cob_sound/package.xml +++ b/cob_sound/package.xml @@ -3,7 +3,7 @@ 0.6.8 This package implements a sound play module using text2wave and aplay through python. - LGPL + Apache 2.0 http://ros.org/wiki/cob_sound diff --git a/cob_sound/ros/src/sound.cpp b/cob_sound/ros/src/sound.cpp index d6af804de..74dd8a28f 100644 --- a/cob_sound/ros/src/sound.cpp +++ b/cob_sound/ros/src/sound.cpp @@ -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 #include #include diff --git a/cob_sound/ros/src/test_client.py b/cob_sound/ros/src/test_client.py index 39783625c..d13c66b80 100755 --- a/cob_sound/ros/src/test_client.py +++ b/cob_sound/ros/src/test_client.py @@ -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 import actionlib diff --git a/cob_undercarriage_ctrl/common/include/cob_undercarriage_ctrl/UndercarriageCtrlGeom.h b/cob_undercarriage_ctrl/common/include/cob_undercarriage_ctrl/UndercarriageCtrlGeom.h index 724c72f34..5110592e6 100644 --- a/cob_undercarriage_ctrl/common/include/cob_undercarriage_ctrl/UndercarriageCtrlGeom.h +++ b/cob_undercarriage_ctrl/common/include/cob_undercarriage_ctrl/UndercarriageCtrlGeom.h @@ -1,55 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_undercarriage_ctrl - * Description: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Christian Connette, email:christian.connette@ipa.fhg.de - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: April 2010: - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 UndercarriageCtrlGeom_INCLUDEDEF_H #define UndercarriageCtrlGeom_INCLUDEDEF_H diff --git a/cob_undercarriage_ctrl/common/src/UndercarriageCtrlGeom.cpp b/cob_undercarriage_ctrl/common/src/UndercarriageCtrlGeom.cpp index fa95e9ef3..444a4feba 100644 --- a/cob_undercarriage_ctrl/common/src/UndercarriageCtrlGeom.cpp +++ b/cob_undercarriage_ctrl/common/src/UndercarriageCtrlGeom.cpp @@ -1,55 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_undercarriage_ctrl - * Description: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Christian Connette, email:christian.connette@ipa.fhg.de - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: April 2010: - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 diff --git a/cob_undercarriage_ctrl/package.xml b/cob_undercarriage_ctrl/package.xml index 0c6e07e70..dac3bf774 100644 --- a/cob_undercarriage_ctrl/package.xml +++ b/cob_undercarriage_ctrl/package.xml @@ -3,7 +3,7 @@ 0.6.8 cob_undercarriage_ctrl implements a controller for the omnidirectional base of Care-O-bot 3 on joint level. For a given Pltf-Twist the according wheel steering angles and linear wheel velocities are calculated based on the principle of rigid body motion. Each joint is than controlled individually to achieve the computed position and velocity - LGPL + Apache 2.0 http://ros.org/wiki/cob_undercarriage_ctrl diff --git a/cob_undercarriage_ctrl/ros/src/cob_undercarriage_ctrl.cpp b/cob_undercarriage_ctrl/ros/src/cob_undercarriage_ctrl.cpp index 5f49b3d97..78032e060 100644 --- a/cob_undercarriage_ctrl/ros/src/cob_undercarriage_ctrl.cpp +++ b/cob_undercarriage_ctrl/ros/src/cob_undercarriage_ctrl.cpp @@ -1,57 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_driver - * ROS package name: cob_undercarriage_ctrl - * Description: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Christian Connette, email:christian.connette@ipa.fhg.de - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: April 2010: - * ToDo: Adapt Interface to controller -> remove last variable (not used anymore) - * Rework Ctrl-class to work with SI-Units -> remove conversion - * For easier association of joints use platform.urdf!! - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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. + */ + //################## //#### includes #### diff --git a/cob_utilities/common/include/cob_utilities/IniFile.h b/cob_utilities/common/include/cob_utilities/IniFile.h index 196a8f56a..e7e8b8880 100644 --- a/cob_utilities/common/include/cob_utilities/IniFile.h +++ b/cob_utilities/common/include/cob_utilities/IniFile.h @@ -1,55 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob3_common - * ROS package name: inifiles_old - * Description: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Christian Connette, email:christian.connette@ipa.fhg.de - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: Feb 2009 - * ToDo: Remove it! - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 _Inifile_H #define _Inifile_H diff --git a/cob_utilities/common/include/cob_utilities/MathSup.h b/cob_utilities/common/include/cob_utilities/MathSup.h index 04e197326..1983b810d 100644 --- a/cob_utilities/common/include/cob_utilities/MathSup.h +++ b/cob_utilities/common/include/cob_utilities/MathSup.h @@ -1,55 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob3_common - * ROS package name: cob3_utilities - * Description: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Christian Connette, email:christian.connette@ipa.fhg.de - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: Feb 2010 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 MATHSUP_INCLUDEDEFX_H #define MATHSUP_INCLUDEDEFX_H diff --git a/cob_utilities/common/include/cob_utilities/Mutex.h b/cob_utilities/common/include/cob_utilities/Mutex.h index 6ff900046..c2244cc7f 100644 --- a/cob_utilities/common/include/cob_utilities/Mutex.h +++ b/cob_utilities/common/include/cob_utilities/Mutex.h @@ -1,55 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob3_common - * ROS package name: base_drive_chain - * Description: custom Mutex implementation - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Christian Connette, email:christian.connette@ipa.fhg.de - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: Feb 2009 - * ToDo: - Remove this class - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 MUTEX_INCLUDEDEF_H #define MUTEX_INCLUDEDEF_H diff --git a/cob_utilities/common/include/cob_utilities/StrUtil.h b/cob_utilities/common/include/cob_utilities/StrUtil.h index e537e58a7..736ff46a4 100644 --- a/cob_utilities/common/include/cob_utilities/StrUtil.h +++ b/cob_utilities/common/include/cob_utilities/StrUtil.h @@ -1,55 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob3_common - * ROS package name: generic_can - * Description: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Matthias Bengel, email:matthias.bengel@ipa.fhg.de - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: Feb 2009 - * ToDo: Check if this can be removed - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 STRUTIL_H #define STRUTIL_H diff --git a/cob_utilities/common/include/cob_utilities/TimeStamp.h b/cob_utilities/common/include/cob_utilities/TimeStamp.h index d1d2c2483..642f7bc13 100644 --- a/cob_utilities/common/include/cob_utilities/TimeStamp.h +++ b/cob_utilities/common/include/cob_utilities/TimeStamp.h @@ -1,55 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob3_common - * ROS package name: generic_can - * Description: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Christian Connette, email:christian.connette@ipa.fhg.de - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: Feb 2009 - * ToDo: Check if this is still neccessary. Can we use the ROS-Infrastructure within the implementation? - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 _TimeStamp_H #define _TimeStamp_H diff --git a/cob_utilities/common/include/cob_utilities/windows.h b/cob_utilities/common/include/cob_utilities/windows.h index f705bf65a..10e0b002a 100644 --- a/cob_utilities/common/include/cob_utilities/windows.h +++ b/cob_utilities/common/include/cob_utilities/windows.h @@ -1,55 +1,19 @@ -/**************************************************************** - * - * Copyright (c) 2010 - * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob_common - * ROS package name: cob_utilities - * Description: some defs and mappings that are missing in Linux - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Christian Connette, email:christian.connette@ipa.fhg.de - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: April 2010 - * ToDo: - Get rid of it - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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 . - * - ****************************************************************/ +/* + * 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 WINDOWS_H #define WINDOWS_H diff --git a/cob_utilities/common/src/IniFile.cpp b/cob_utilities/common/src/IniFile.cpp index ad267b858..efe24cc1f 100644 --- a/cob_utilities/common/src/IniFile.cpp +++ b/cob_utilities/common/src/IniFile.cpp @@ -1,55 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob3_driver - * ROS package name: sickS300 - * Description: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Christian Connette, email:christian.connette@ipa.fhg.de - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: Jan 2009 - * ToDo: Remove it! - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 diff --git a/cob_utilities/common/src/MathSup.cpp b/cob_utilities/common/src/MathSup.cpp index 764ad1572..71fc5091a 100644 --- a/cob_utilities/common/src/MathSup.cpp +++ b/cob_utilities/common/src/MathSup.cpp @@ -1,55 +1,18 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob3_common - * ROS package name: cob3_utilities - * Description: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Christian Connette, email:christian.connette@ipa.fhg.de - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: Feb 2010 - * ToDo: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 diff --git a/cob_utilities/common/src/StrUtil.cpp b/cob_utilities/common/src/StrUtil.cpp index 07d0c4b88..43bdc8991 100644 --- a/cob_utilities/common/src/StrUtil.cpp +++ b/cob_utilities/common/src/StrUtil.cpp @@ -1,55 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob3_common - * ROS package name: generic_can - * Description: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Matthias Bengel, email:matthias.bengel@ipa.fhg.de - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: Feb 2009 - * ToDo: Check if this can be removed - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 #include diff --git a/cob_utilities/common/src/TimeStamp.cpp b/cob_utilities/common/src/TimeStamp.cpp index 17e5b93f3..e9a0cbf99 100644 --- a/cob_utilities/common/src/TimeStamp.cpp +++ b/cob_utilities/common/src/TimeStamp.cpp @@ -1,55 +1,19 @@ -/**************************************************************** +/* + * Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA) * - * Copyright (c) 2010 + * 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 * - * Fraunhofer Institute for Manufacturing Engineering - * and Automation (IPA) - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Project name: care-o-bot - * ROS stack name: cob3_common - * ROS package name: generic_can - * Description: - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * Author: Christian Connette, email:christian.connette@ipa.fhg.de - * Supervised by: Christian Connette, email:christian.connette@ipa.fhg.de - * - * Date of creation: Feb 2009 - * ToDo: Check if this is still neccessary. Can we use the ROS-Infrastructure within the implementation? - * - * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - * - * 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. - * * 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. - * * 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. - * - * 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.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 diff --git a/cob_utilities/package.xml b/cob_utilities/package.xml index d76a21f80..454ce67e0 100644 --- a/cob_utilities/package.xml +++ b/cob_utilities/package.xml @@ -4,7 +4,7 @@ Deprecated "cob_utilities" subsumes a number of classes, which are used in the original COb3 software. E.g. "IniFile.h" supports the original inifile structure of Care-O-bot 3. "MathSup.h" provides some basic functions like conversion from degree to radion or norming of angles within +/- PI. The package is currently used while the drivers are ported to ROS and Orocos respectively. Midterm it shall be removed and the ROS structures shall be used for reading parameters during initialization. So, don't use this package in new code! - LGPL + Apache 2.0 http://ros.org/wiki/cob_utilities diff --git a/cob_voltage_control/common/src/cob_voltage_control_common.cpp b/cob_voltage_control/common/src/cob_voltage_control_common.cpp index eee5f0547..2d1a8163a 100644 --- a/cob_voltage_control/common/src/cob_voltage_control_common.cpp +++ b/cob_voltage_control/common/src/cob_voltage_control_common.cpp @@ -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. + */ + + //ROS typedefs #include "ros/ros.h" #include diff --git a/cob_voltage_control/package.xml b/cob_voltage_control/package.xml index c1a932c18..b9d83cca8 100644 --- a/cob_voltage_control/package.xml +++ b/cob_voltage_control/package.xml @@ -3,7 +3,7 @@ 0.6.8 Interface to IO board that manages emergency stop and battery voltage on rob@work 3 - LGPL + Apache 2.0 None diff --git a/cob_voltage_control/ros/src/cob_voltage_control_ros.cpp b/cob_voltage_control/ros/src/cob_voltage_control_ros.cpp index 12102c341..ffff84353 100644 --- a/cob_voltage_control/ros/src/cob_voltage_control_ros.cpp +++ b/cob_voltage_control/ros/src/cob_voltage_control_ros.cpp @@ -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. + */ + + // ROS includes #include diff --git a/cob_voltage_control/ros/src/record_current_and_voltage.py b/cob_voltage_control/ros/src/record_current_and_voltage.py index 9af41dc00..d9f74e54a 100755 --- a/cob_voltage_control/ros/src/record_current_and_voltage.py +++ b/cob_voltage_control/ros/src/record_current_and_voltage.py @@ -1,4 +1,19 @@ #!/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 from cob_phidgets.msg import * diff --git a/cob_voltage_control/ros/src/savitzky.py b/cob_voltage_control/ros/src/savitzky.py index 9e0dce369..f37b6f6e1 100755 --- a/cob_voltage_control/ros/src/savitzky.py +++ b/cob_voltage_control/ros/src/savitzky.py @@ -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 numpy as np from math import factorial import pylab diff --git a/cob_voltage_control/ros/src/savitzky_golay.py b/cob_voltage_control/ros/src/savitzky_golay.py index 6a208435e..46f06306b 100755 --- a/cob_voltage_control/ros/src/savitzky_golay.py +++ b/cob_voltage_control/ros/src/savitzky_golay.py @@ -1,61 +1,19 @@ #!/usr/bin/env python - -################################################################# -##\file -# -# \note -# Copyright (c) 2013 \n -# Fraunhofer Institute for Manufacturing Engineering -# and Automation (IPA) \n\n -# -################################################################# -# -# \note -# Project name: Care-O-bot Research -# \note -# ROS package name: -# -# \author -# Author: Thiago de Freitas Oliveira Araujo, -# email:thiago.de.freitas.oliveira.araujo@ipa.fhg.de -# \author -# Supervised by: Florian Weisshardt, email:florian.weisshardt@ipa.fhg.de -# -# \date Date of creation: April 2013 # -# \brief -# Battery Characterization for the IPA robots +# 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 # -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: +# http://www.apache.org/licenses/LICENSE-2.0 # -# - 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/>. -# -################################################################# +# 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. + from math import * import numpy as np diff --git a/cob_voltage_control/ros/src/time_volt.py b/cob_voltage_control/ros/src/time_volt.py index 360451725..072160b27 100755 --- a/cob_voltage_control/ros/src/time_volt.py +++ b/cob_voltage_control/ros/src/time_volt.py @@ -1,61 +1,19 @@ #!/usr/bin/env python - -################################################################# -##\file -# -# \note -# Copyright (c) 2013 \n -# Fraunhofer Institute for Manufacturing Engineering -# and Automation (IPA) \n\n -# -################################################################# -# -# \note -# Project name: Care-O-bot Research -# \note -# ROS package name: -# -# \author -# Author: Thiago de Freitas Oliveira Araujo, -# email:thiago.de.freitas.oliveira.araujo@ipa.fhg.de -# \author -# Supervised by: Florian Weisshardt, email:florian.weisshardt@ipa.fhg.de -# -# \date Date of creation: March 2013 # -# \brief -# This module is for characterizing the Care-o-bot 3 battery +# 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 # -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: +# http://www.apache.org/licenses/LICENSE-2.0 # -# - 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/>. -# -################################################################# +# 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 pickle import csv