Skip to content
Open
Changes from all commits
Commits
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
11 changes: 6 additions & 5 deletions src/baxter_pykdl/baxter_pykdl.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,6 @@ def joints_to_kdl(self, type, values=None):

for idx, name in enumerate(self._joint_names):
kdl_array[idx] = cur_type_values[name]
if type == 'velocities':
kdl_array = PyKDL.JntArrayVel(kdl_array)
return kdl_array

def kdl_to_mat(self, data):
Expand All @@ -117,10 +115,13 @@ def forward_position_kinematics(self,joint_values=None):
return np.array([pos[0], pos[1], pos[2],
rot[0], rot[1], rot[2], rot[3]])

def forward_velocity_kinematics(self,joint_velocities=None):
def forward_velocity_kinematics(self,joint_values=None,joint_velocities=None):
end_frame = PyKDL.FrameVel()
self._fk_v_kdl.JntToCart(self.joints_to_kdl('velocities',joint_velocities),
end_frame)

kdl_JntArray_pos = self.joints_to_kdl('positions',joint_values)
kdl_JntArray_vel = self.joints_to_kdl('velocities',joint_velocities)
kdl_JntArrayVel = PyKDL.JntArrayVel(kdl_JntArray_pos, kdl_JntArray_vel)
self._fk_v_kdl.JntToCart(kdl_JntArrayVel, end_frame)
return end_frame.GetTwist()

def inverse_kinematics(self, position, orientation=None, seed=None):
Expand Down