Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Purge 'side' parameter #1083

Merged
merged 33 commits into from
Apr 24, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
c660f29
changed docstring
PetervDooren Feb 16, 2021
4c553aa
seperated gripper from arm naming conventions
PetervDooren Feb 16, 2021
06aa3ff
change loading from parameter server
PetervDooren Feb 16, 2021
b6749c9
change hardware status (currently unused)
PetervDooren Feb 16, 2021
1cb1bb3
object_repr + marker topic
PetervDooren Feb 16, 2021
abe09a2
Merge branch 'master' into fix/side_param
PetervDooren Feb 16, 2021
54292da
changed action server
PetervDooren Feb 16, 2021
527faff
represent arm with name, not side
PetervDooren Feb 19, 2021
c6a51b8
made gripper frame configurable
PetervDooren Feb 19, 2021
4798967
rename side to name
PetervDooren Feb 19, 2021
e476b20
fix imports
PetervDooren Feb 19, 2021
1073872
removed side argument from arm
PetervDooren Feb 19, 2021
188911b
changed handover detector interface
PetervDooren Feb 19, 2021
d9c5268
update mockbot
PetervDooren Feb 19, 2021
73d9b22
clean up grasp_sensor
PetervDooren Feb 23, 2021
59a4aef
added test for the construction of hero
PetervDooren Mar 6, 2021
387e064
hacked torso arm_gathering
PetervDooren Mar 6, 2021
64047af
added test_depend
PetervDooren Mar 11, 2021
3d41cc9
renamed atrribute arm_name to name
PetervDooren Mar 20, 2021
25ab978
Merge branch 'master' into fix/side_param
PetervDooren Mar 20, 2021
d018927
moved init node to main
PetervDooren Mar 20, 2021
9990790
changed rviz config
PetervDooren Mar 23, 2021
3864a96
Merge branch 'master' into fix/side_param
MatthijsBurgh Mar 30, 2021
ae671e9
dont prefix sensor_topic
PetervDooren Apr 6, 2021
bab5470
Merge branch 'master' into fix/side_param
PetervDooren Apr 6, 2021
407b74b
remove hero_test from robot_skills
PetervDooren Apr 6, 2021
59332f7
remove test depend
PetervDooren Apr 6, 2021
bf05f7a
make gripper action_client parameterised
PetervDooren Apr 6, 2021
b09df1e
move arm_names out of torso.py
PetervDooren Apr 11, 2021
e78b0a2
Merge remote-tracking branch 'origin/master' into fix/side_param
MatthijsBurgh Apr 14, 2021
9df8d98
empty commit
PetervDooren Apr 21, 2021
6903751
Revert "empty commit"
PetervDooren Apr 21, 2021
c1230ff
dont use a mutable default argument
PetervDooren Apr 22, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion hero_skills/src/hero_skills/hero.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ def __init__(self, wait_services=False):
self._ignored_parts = ["leftArm", "torso", "spindle", "head"]

self.add_body_part('base', base.Base(self.robot_name, self.tf_listener))
self.add_body_part('torso', torso.Torso(self.robot_name, self.tf_listener, self.get_joint_states))

arm_joint_names = rospy.get_param('/' + self.robot_name + '/skills/arm_center/joint_names')
self.add_body_part('torso', torso.Torso(self.robot_name, self.tf_listener, self.get_joint_states, arm_joint_names))

# add hero's arm
hero_arm = arms.Arm(self.robot_name, self.tf_listener, self.get_joint_states, "arm_center")
Expand Down
7 changes: 2 additions & 5 deletions robot_skills/src/robot_skills/torso.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@


class Torso(RobotPart):
def __init__(self, robot_name, tf_listener, get_joint_states):
def __init__(self, robot_name, tf_listener, get_joint_states, arm_joint_names=[]):
PetervDooren marked this conversation as resolved.
Show resolved Hide resolved
"""
constructor

Expand All @@ -29,10 +29,7 @@ def __init__(self, robot_name, tf_listener, get_joint_states):
self.lower_limit = self.default_configurations['lower_limit']
self.upper_limit = self.default_configurations['upper_limit']

try: # TODO make sure this is no longer needed
self._arm_joint_names = self.load_param('skills/arm_center/joint_names')
except KeyError:
self._arm_joint_names = []
self._arm_joint_names = arm_joint_names #TODO make sure this is no longer needed

# Init action client
self.ac_move_torso = self.create_simple_action_client('/' + self.robot_name + '/body/joint_trajectory_action',
Expand Down