From 68cc6ba31f5da2187c0ea290c80f60827854618a Mon Sep 17 00:00:00 2001 From: jenniferdavid <jenniferdavid87@gmail.com> Date: Mon, 19 Nov 2018 14:57:03 +0100 Subject: [PATCH] Update action_controller.py --- .../src/scripts/action_controller.py | 35 ++----------------- 1 file changed, 3 insertions(+), 32 deletions(-) diff --git a/simulation_control/src/scripts/action_controller.py b/simulation_control/src/scripts/action_controller.py index 52200fe..8d893fd 100644 --- a/simulation_control/src/scripts/action_controller.py +++ b/simulation_control/src/scripts/action_controller.py @@ -1,35 +1,3 @@ -'''Action controller for F651 - - Copyright (C) 2018, CPS2018 Challenge by Team Halmstad. All rights reserved. - - BSD license: - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. 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. - 3. Neither the name of the copyright holder nor the names of - contributors to this software may be used to endorse or promote - products derived from this software without specific prior written - permission. - - THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 - HOLDER OR THE CONTRIBUTORS TO THIS SOFTWARE 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. - ''' - #!/usr/bin/env python import roslib @@ -38,6 +6,9 @@ import rospy import actionlib import mavros_state import time +'''Action controller for F651 + Copyright (C) 2018, CPS2018 Challenge by Team Halmstad. All rights reserved. + ''' from simulation_control.msg import center_on_objectAction, center_on_objectGoal, descend_on_objectAction, descend_on_objectGoal, detect_objectAction, detect_objectGoal, goto_positionAction, goto_positionGoal, short_grippersAction, short_grippersGoal, long_grippersAction, long_grippersGoal -- GitLab