8000 fix ets import · hzyjerry/robotics-toolbox-python@0a921d3 · GitHub
[go: up one dir, main page]

Skip to content

Commit 0a921d3

Browse files
committed
fix ets import
1 parent 5c09436 commit 0a921d3

File tree

1 file changed

+16
-21
lines changed

1 file changed

+16
-21
lines changed

< 10000 a class="Link--primary prc-Link-Link-85e08" href="#diff-07884d3047e05e53884a7a46df3ac1f6e0d144bc9439a83798b414607031ae06">roboticstoolbox/robot/ETS.py

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
@author: Jesse Haviland
44
@author: Peter Corke
55
"""
6-
from roboticstoolbox import ETS2 as ET
76
from collections import UserList
87
from types import SimpleNamespace
98
import copy
@@ -12,7 +11,7 @@
1211
from spatialmath import SE3, SE2
1312
from spatialmath.base import getvector, getunit, trotx, troty, trotz, \
1413
issymbol, tr2jac, transl2, trot2, removesmall, trinv, \
15-
verifymatrix, iseye # , tr2jac2
14+
verifymatrix, iseye, tr2jac2
1615

1716

1817
class SuperETS(UserList, ABC):
@@ -1687,29 +1686,25 @@ def jacobe(self, q=None, T=None):
16871686
# J = b.jacobe([1,0])
16881687
# print(J)
16891688

1690-
<< << << < HEAD
1691-
J = b.jacob0([0, 0])
1692-
print(J)
1689+
J = b.jacob0([0, 0])
1690+
print(J)
16931691

1694-
J = b.jacobe([0, 0])
1695-
print(J)
1692+
J = b.jacobe([0, 0])
1693+
print(J)
16961694

1697-
J = b.jacob0([1, 0])
1698-
print(J)
1695+
J = b.jacob0([1, 0])
1696+
print(J)
16991697

1700-
J = b.jacobe([1, 0])
1701-
print(J)
1702-
== == == =
1698+
J = b.jacobe([1, 0])
1699+
print(J)
17031700

1701+
a1 = 1
1702+
E = ET.r() * ET.tx(a1)
17041703

1705-
a1 = 1
1706-
E = ET.r() * ET.tx(a1)
1704+
v = E.eval(30, unit='deg')
1705+
print(v)
17071706

1708-
v = E.eval(30, unit='deg')
1709-
print(v)
1710-
>>>>>> > master
1707+
# b = ETS.ry(flip=True) * ETS.tx(1) * ETS.ry() * ETS.tx(1)
17111708

1712-
# b = ETS.ry(flip=True) * ETS.tx(1) * ETS.ry() * ETS.tx(1)
1713-
1714-
# J = b.jacob0([1,0])
1715-
# print(J)
1709+
# J = b.jacob0([1,0])
1710+
# print(J)

0 commit comments

Comments
 (0)
0