8000 Merge branch 'master' of github.com:petercorke/robotics-toolbox-python · lars-x/robotics-toolbox-python@fd6210e · GitHub
[go: up one dir, main page]

Skip to content

Commit fd6210e

Browse files
committed
Merge branch 'master' of github.com:petercorke/robotics-toolbox-python
2 parents 5a78b88 + 03ef707 commit fd6210e

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

roboticstoolbox/robot/ikine_evaluate.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# * T, the end-effector pose
1010
# * q0, the initial joint angles for solution
1111

12-
example = 'panda' # 'panda'
12+
example = 'puma' # 'panda'
1313

1414
if example == 'puma':
1515
# Puma robot case
@@ -49,7 +49,7 @@
4949
if hasattr(robot, "ikine_a"):
5050
a = (robot.ikine_a, # analytic solution
5151
"ikine_a",
52-
"sol = robot.ikine_a}(T)"
52+
"sol = robot.ikine_a(T)"
5353
)
5454
ikfuncs.insert(0, a)
5555

setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
'scipy',
1010
'matplotlib',
1111
'ansitable',
12-
'swift-sim>=0.6.1'
12+
'swift-sim>=0.6.1',
13+
'qpsolvers'
1314
]
1415

1516
collision_req = [

0 commit comments

Comments
 (0)
0