Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
U
ur_simple_control
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Marko Guberina
ur_simple_control
Commits
5eb7c8d5
Commit
5eb7c8d5
authored
6 months ago
by
m-guberina
Browse files
Options
Downloads
Patches
Plain Diff
solved a few bugs
parent
4cc58d01
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
python/smc/control/cartesian_space/ik_solvers.py
+10
-3
10 additions, 3 deletions
python/smc/control/cartesian_space/ik_solvers.py
python/smc/robots/implementations/mobile_yumi.py
+1
-1
1 addition, 1 deletion
python/smc/robots/implementations/mobile_yumi.py
with
11 additions
and
4 deletions
python/smc/control/cartesian_space/ik_solvers.py
+
10
−
3
View file @
5eb7c8d5
...
@@ -44,13 +44,20 @@ def getIKSolver(
...
@@ -44,13 +44,20 @@ def getIKSolver(
H
=
np
.
eye
(
robot
.
nv
)
H
=
np
.
eye
(
robot
.
nv
)
g
=
np
.
zeros
(
robot
.
nv
)
g
=
np
.
zeros
(
robot
.
nv
)
G
=
np
.
eye
(
robot
.
nv
)
G
=
np
.
eye
(
robot
.
nv
)
# TODO: you have to check if which control mode it is
# probably easiest if all robots have a control mode
if
issubclass
(
robot
.
__class__
,
DualArmInterface
):
A
=
np
.
eye
(
12
,
robot
.
nv
)
b
=
np
.
ones
(
12
)
*
0.1
qp
=
proxqp
.
dense
.
QP
(
robot
.
model
.
nv
,
12
,
robot
.
model
.
nv
)
else
:
A
=
np
.
eye
(
6
,
robot
.
nv
)
A
=
np
.
eye
(
6
,
robot
.
nv
)
b
=
np
.
ones
(
6
)
*
0.1
b
=
np
.
ones
(
6
)
*
0.1
qp
=
proxqp
.
dense
.
QP
(
robot
.
model
.
nv
,
6
,
robot
.
model
.
nv
)
# proxqp does lb <= Cx <= ub
# proxqp does lb <= Cx <= ub
C
=
np
.
eye
(
robot
.
nv
)
C
=
np
.
eye
(
robot
.
nv
)
lb
=
-
1
*
robot
.
_max_v
.
copy
()
lb
=
-
1
*
robot
.
_max_v
.
copy
()
ub
=
robot
.
_max_v
.
copy
()
ub
=
robot
.
_max_v
.
copy
()
qp
=
proxqp
.
dense
.
QP
(
robot
.
model
.
nv
,
6
,
robot
.
model
.
nv
)
qp
.
init
(
H
,
g
,
A
,
b
,
G
,
lb
,
ub
)
qp
.
init
(
H
,
g
,
A
,
b
,
G
,
lb
,
ub
)
qp
.
solve
()
qp
.
solve
()
return
partial
(
QPproxsuite
,
qp
)
return
partial
(
QPproxsuite
,
qp
)
...
...
This diff is collapsed.
Click to expand it.
python/smc/robots/implementations/mobile_yumi.py
+
1
−
1
View file @
5eb7c8d5
...
@@ -75,7 +75,7 @@ def get_mobile_yumi_model() -> (
...
@@ -75,7 +75,7 @@ def get_mobile_yumi_model() -> (
tuple
[
pin
.
Model
,
pin
.
GeometryModel
,
pin
.
GeometryModel
,
pin
.
Data
]
tuple
[
pin
.
Model
,
pin
.
GeometryModel
,
pin
.
GeometryModel
,
pin
.
Data
]
):
):
model_arms
,
visual
_model_arms
,
collision
_model_arms
,
_
=
get_yumi_model
()
model_arms
,
collision
_model_arms
,
visual
_model_arms
,
_
=
get_yumi_model
()
model_mobile_base
,
geom_model_mobile_base
=
get_mobile_base_model
(
False
)
model_mobile_base
,
geom_model_mobile_base
=
get_mobile_base_model
(
False
)
# frame-index should be 1
# frame-index should be 1
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment