Skip to content
Snippets Groups Projects
Commit 5eb7c8d5 authored by m-guberina's avatar m-guberina
Browse files

solved a few bugs

parent 4cc58d01
No related branches found
No related tags found
No related merge requests found
...@@ -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)
......
...@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment