Skip to content

Commit 1513c36

Browse files
committed
remove unused imports and definitions
1 parent 4a7f00a commit 1513c36

File tree

4 files changed

+3
-48
lines changed

4 files changed

+3
-48
lines changed

challenge_serve_breakfast/src/challenge_serve_breakfast/navigate_to_and_pick_item.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,10 @@
88
import rospkg
99
import rospy
1010

11-
from challenge_serve_breakfast.tuning import REQUIRED_ITEMS, JOINTS_HANDOVER, PICK_ROTATION
11+
from challenge_serve_breakfast.tuning import REQUIRED_ITEMS, JOINTS_HANDOVER
1212
from robot_skills import get_robot
13-
from robot_skills.arm.arms import GripperTypes
1413
# ROS
1514
from pykdl_ros import VectorStamped
16-
from robot_smach_states.human_interaction import Say
1715
from robot_smach_states.navigation import NavigateToSymbolic
1816
from robot_smach_states.util.designators import EdEntityDesignator
1917
from smach import StateMachine, cb_interface, CBState

challenge_serve_breakfast/src/challenge_serve_breakfast/navigate_to_and_place_item_on_table.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,11 @@
1515

1616
from challenge_serve_breakfast.tuning import (
1717
get_item_place_pose,
18-
JOINTS_PRE_PRE_PLACE,
19-
JOINTS_PRE_PLACE_HORIZONTAL,
20-
JOINTS_PRE_PLACE_VERTICAL,
2118
ITEM_VECTOR_DICT,
2219
item_vector_to_item_frame,
2320
item_frame_to_pose,
24-
JOINTS_PLACE_HORIZONTAL,
25-
JOINTS_PLACE_HORIZONTAL_MILK,
26-
JOINTS_PLACE_VERTICAL,
27-
JOINTS_RETRACT,
28-
COLOR_DICT, REQUIRED_ITEMS,
21+
COLOR_DICT,
22+
REQUIRED_ITEMS,
2923
)
3024
from robot_skills import get_robot
3125
from robot_smach_states.human_interaction import Say

challenge_serve_breakfast/src/challenge_serve_breakfast/pick_pour_place_cereal.py

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,14 @@
44
#
55
# \author Rein Appeldoorn
66

7-
import copy
87
import os
98

10-
import PyKDL
119
import rospy
1210
from pykdl_ros import FrameStamped
1311

1412
from challenge_serve_breakfast.tuning import (
15-
get_item_place_pose,
1613
get_item_pour_poses,
1714
JOINTS_POST_PICK,
18-
JOINTS_PRE_PRE_PLACE,
19-
JOINTS_PRE_PLACE_HORIZONTAL,
20-
JOINTS_PRE_PLACE_VERTICAL,
21-
ITEM_VECTOR_DICT,
22-
item_vector_to_item_frame,
23-
item_frame_to_pose,
24-
JOINTS_PLACE_HORIZONTAL,
25-
JOINTS_PLACE_HORIZONTAL_MILK,
26-
JOINTS_PLACE_VERTICAL,
27-
JOINTS_RETRACT,
28-
COLOR_DICT, REQUIRED_ITEMS,
29-
POUR_OFFSET_Y, JOINTS_PRE_POUR, JOINTS_POUR, JOINTS_PLACE_HORIZONTAL, JOINTS_RETRACT, \
30-
POUR_OFFSET_X
3115
)
3216
from challenge_serve_breakfast.navigate_to_and_place_item_on_table import PlaceItemOnTable
3317
from robot_skills import get_robot

challenge_serve_breakfast/src/challenge_serve_breakfast/tuning.py

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -47,31 +47,10 @@
4747
"cereal_box": ColorRGBA(1, 1, 0, 1),
4848
}
4949

50-
PICK_ROTATION = 0
51-
5250
JOINTS_HANDOVER = [0.4, -0.2, 0.0, -1.37, 0]
5351

54-
JOINTS_PRE_PRE_PLACE = [0.69, 0, 0, -0.7, 0]
55-
56-
JOINTS_PRE_PLACE_HORIZONTAL = [0.8, -1.2, 0, 0, 0]
57-
JOINTS_PLACE_HORIZONTAL = [0.65, -1.75, 0, 0, 0]
58-
JOINTS_PLACE_HORIZONTAL_MILK = [0.55, -1.75, 0, 0, 0]
59-
60-
JOINTS_PRE_PLACE_VERTICAL = [0.8, -1.2, 0, -1.57, 0]
61-
JOINTS_PLACE_VERTICAL = [0.65, -1.57, 0, -1.57, 0]
62-
63-
JOINTS_RETRACT = [0.7, 0, 0, -1.57, 0]
64-
6552
JOINTS_POST_PICK = [0.7, -1.2, 0, 0, 0]
6653

67-
JOINTS_PRE_POUR = [0.35, -1.2, 0, 0, 0]
68-
69-
JOINTS_POUR = [0.4, -1.2, -2.5, 0, 0]
70-
71-
POUR_OFFSET_X = -0.15
72-
POUR_OFFSET_Y = 0.15
73-
74-
7554
def item_vector_to_item_frame(item_vector):
7655
frame = copy.deepcopy(BREAKFAST_POSE)
7756

0 commit comments

Comments
 (0)