Skip to content

Commit

Permalink
Fixing vel naming (WPI-AIM#78)
Browse files Browse the repository at this point in the history
* calculates the joint velcoty and dt

* added smoother to joint vel

* working on accel

* calculates the joint velcoty and dt

* added smoother to joint vel

* working on accel

* removed accel stuff

* fixed merge

* enlarged vel window size

* added joint vel

* fixed the models

* fixed errors with accessing

* added func to set all joint torques

* switched to sim_time

* reverted files

* removed blocking call in the callback and added in window size

* fixed small things

* reset object file

* changed the naming in rigid body

updating the naming of the function to be uniform

* fixes name of the get_linear_vel fnt

Co-authored-by: Nathaniel Goldfarb <[email protected]>
Co-authored-by: nathaniel <[email protected]>
  • Loading branch information
3 people authored Jul 1, 2020
1 parent 7b0be4c commit 8b01873
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions ambf_ros_modules/ambf_comm/scripts/ambf_rigid_body.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,14 @@ def is_joint_idx_valid(self, joint_idx):
'\" outside valid range [0 - ' + str(n_jnts - 1) + ']')
return False

def get_linear_velocity(self):
def get_linear_vel(self):
"""
Get the linear velocity of this body
:return:
"""
return self._state.twist.linear

def get_angular_velocity(self):
def get_angular_vel(self):
"""
Get the angular velocity of this body
:return:
Expand Down Expand Up @@ -159,7 +159,7 @@ def get_all_joint_pos(self):

return positions

def get_all_joint_velocities(self):
def get_all_joint_vel(self):
"""
Get the joint velocities of a specific joint at idx. Check joint names to see indexes
:param idx:
Expand Down
2 changes: 1 addition & 1 deletion ambf_utilities/ambf_addon
Submodule ambf_addon updated 2 files
+1 −12 README.md
+664 −2,291 ambf_addon.py

0 comments on commit 8b01873

Please sign in to comment.