Skip to content
Merged
Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions src/roboticstoolbox/models/DH/AL5D.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class AL5D(DHRobot):

:References:

- 'Reference of the robot <http://www.lynxmotion.com/c-130-al5d.aspx>'_
- `Reference of the robot <http://www.lynxmotion.com/c-130-al5d.aspx>`_

.. codeauthor:: Tassos Natsakis
""" # noqa
Expand Down Expand Up @@ -85,7 +85,7 @@ def __init__(self, symbolic=False):

links = []

for j in range(3):
for j in range(4):
link = RevoluteMDH(
d=d[j],
a=a[j],
Expand Down
2 changes: 0 additions & 2 deletions src/roboticstoolbox/models/DH/Hyper.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,8 @@ def __init__(self, N=10, a=None, symbolic=False):
links, name="Hyper" + str(N), keywords=("symbolic",), symbolic=symbolic
)

self.qr = np.array(N)
self.qz = np.zeros(N)

self.addconfiguration("qr", self.qr)
self.addconfiguration("qz", self.qz)


Expand Down
2 changes: 0 additions & 2 deletions src/roboticstoolbox/models/DH/Hyper3d.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,8 @@ def __init__(self, N=10, a=None, symbolic=False):
links, name="Hyper3d" + str(N), keywords=("symbolic",), symbolic=symbolic
)

self.qr = np.array(N)
self.qz = np.zeros(N)

self.addconfiguration("qr", self.qr)
self.addconfiguration("qz", self.qz)


Expand Down
7 changes: 1 addition & 6 deletions src/roboticstoolbox/models/DH/LWR4.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,7 @@ class LWR4(DHRobot):

Defined joint configurations are:

- qz, zero joint angle configuration, 'L' shaped configuration
- qr, vertical 'READY' configuration
- qs, arm is stretched out in the X direction
- qn, arm is at a nominal non-singular configuration
- qz, zero joint angle configuration

.. note:: SI units are used.

Expand Down Expand Up @@ -73,10 +70,8 @@ def __init__(self):

# tool = xyzrpy_to_trans(0, 0, d7, 0, 0, -np.pi/4)

self.qr = np.array(7)
self.qz = np.zeros(7)

self.addconfiguration("qr", self.qr)
self.addconfiguration("qz", self.qz)


Expand Down
6 changes: 4 additions & 2 deletions src/roboticstoolbox/models/URDF/Jaco.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,10 @@ def __init__(self):
gripper_link_index=9,
)

self.qr = np.array([0, 45, 60, 0, 0, 0]) * np.pi / 180
self.qz = np.zeros(6)
# 6 arm joints + 4 gripper joints (2 fingers x [finger, finger_tip]),
# gripper joints left at 0 (fully open) for both named configurations
self.qr = np.array([0, 45, 60, 0, 0, 0, 0, 0, 0, 0]) * np.pi / 180
self.qz = np.zeros(10)

self.addconfiguration("qr", self.qr)
self.addconfiguration("qz", self.qz)
Expand Down
2 changes: 1 addition & 1 deletion src/roboticstoolbox/models/URDF/px150.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def __init__(self):
)

self.qr = np.array([0, -0.3, 0, -2.2, 0, 2.0, np.pi / 4, 0])
self.qz = np.zeros(7)
self.qz = np.zeros(8)

self.addconfiguration("qr", self.qr)
self.addconfiguration("qz", self.qz)
Expand Down
2 changes: 1 addition & 1 deletion src/roboticstoolbox/models/URDF/rx150.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def __init__(self):
)

self.qr = np.array([0, -0.3, 0, -2.2, 0, 2.0, np.pi / 4, 0])
self.qz = np.zeros(7)
self.qz = np.zeros(8)

self.addconfiguration("qr", self.qr)
self.addconfiguration("qz", self.qz)
Expand Down
2 changes: 1 addition & 1 deletion src/roboticstoolbox/models/URDF/rx200.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def __init__(self):
)

self.qr = np.array([0, -0.3, 0, -2.2, 0, 2.0, np.pi / 4, 0])
self.qz = np.zeros(7)
self.qz = np.zeros(8)

self.addconfiguration("qr", self.qr)
self.addconfiguration("qz", self.qz)
Expand Down
4 changes: 2 additions & 2 deletions src/roboticstoolbox/robot/BaseRobot.py
Original file line number Diff line number Diff line change
Expand Up @@ -1725,7 +1725,7 @@ def addconfiguration_attr(self, name: str, q: ArrayLike, unit: str = "rad"):
self._configs[name] = v
setattr(self, name, v)

def addconfiguration(self, name: str, q: NDArray):
def addconfiguration(self, name: str, q: ArrayLike):
"""
Add a named joint configuration

Expand All @@ -1751,7 +1751,7 @@ def addconfiguration(self, name: str, q: NDArray):

"""

self._configs[name] = q
self._configs[name] = np.array(getvector(q, self.n))

def configurations_str(self, border="thin"):
deg = 180 / np.pi
Expand Down