Skip to content

Commit fbd40a7

Browse files
author
Luigi Penco
committed
Fix VR bugs.
1 parent 63190e2 commit fbd40a7

File tree

2 files changed

+33
-26
lines changed

2 files changed

+33
-26
lines changed

ihmc-high-level-behaviors/src/libgdx/java/us/ihmc/rdx/ui/teleoperation/RDXHandConfigurationManager.java

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -73,30 +73,37 @@ public void renderImGuiWidgets()
7373

7474
public void publishHandCommand(RobotSide side, @Nullable SakeHandPreset handPreset, boolean calibrate, boolean reset)
7575
{
76-
SakeHandDesiredCommandMessage sakeHandDesiredCommandMessage = new SakeHandDesiredCommandMessage();
77-
sakeHandDesiredCommandMessage.setRobotSide(side.toByte());
78-
SakeHandParameters.resetDesiredCommandMessage(sakeHandDesiredCommandMessage);
79-
80-
if (calibrate)
81-
{
82-
sakeHandDesiredCommandMessage.setRequestCalibration(true);
83-
}
84-
else if (reset)
76+
if (sakeHandStatus.size() == 2)
8577
{
86-
sakeHandDesiredCommandMessage.setRequestResetErrors(true);
78+
SakeHandDesiredCommandMessage sakeHandDesiredCommandMessage = new SakeHandDesiredCommandMessage();
79+
sakeHandDesiredCommandMessage.setRobotSide(side.toByte());
80+
SakeHandParameters.resetDesiredCommandMessage(sakeHandDesiredCommandMessage);
81+
82+
if (calibrate)
83+
{
84+
sakeHandDesiredCommandMessage.setRequestCalibration(true);
85+
}
86+
else if (reset)
87+
{
88+
sakeHandDesiredCommandMessage.setRequestResetErrors(true);
89+
}
90+
else if (handPreset != null)
91+
{
92+
double handPositionLowerLimit = sakeHandStatus.get(side).getPositionLowerLimit();
93+
double handPositionUpperLimit = sakeHandStatus.get(side).getPositionUpperLimit();
94+
95+
sakeHandDesiredCommandMessage.setGripperDesiredPosition(SakeHandParameters.handOpenAngleToPosition(handPreset.getHandOpenAngle(),
96+
handPositionLowerLimit,
97+
handPositionUpperLimit));
98+
sakeHandDesiredCommandMessage.setRawGripperTorqueLimit(SakeHandParameters.gripForceToRawTorque(handPreset.getFingertipGripForceLimit()));
99+
}
100+
101+
RDXBaseUI.pushNotification("Commanding hand configuration...");
102+
communicationHelper.publish(SakeHandAPI.getHandSakeCommandTopic(robotName, side), sakeHandDesiredCommandMessage);
87103
}
88-
else if (handPreset != null)
104+
else
89105
{
90-
double handPositionLowerLimit = sakeHandStatus.get(side).getPositionLowerLimit();
91-
double handPositionUpperLimit = sakeHandStatus.get(side).getPositionUpperLimit();
92-
93-
sakeHandDesiredCommandMessage.setGripperDesiredPosition(SakeHandParameters.handOpenAngleToPosition(handPreset.getHandOpenAngle(),
94-
handPositionLowerLimit,
95-
handPositionUpperLimit));
96-
sakeHandDesiredCommandMessage.setRawGripperTorqueLimit(SakeHandParameters.gripForceToRawTorque(handPreset.getFingertipGripForceLimit()));
106+
RDXBaseUI.pushNotification("No hands on this robot.");
97107
}
98-
99-
RDXBaseUI.pushNotification("Commanding hand configuration...");
100-
communicationHelper.publish(SakeHandAPI.getHandSakeCommandTopic(robotName, side), sakeHandDesiredCommandMessage);
101108
}
102109
}

ihmc-high-level-behaviors/src/libgdx/java/us/ihmc/rdx/ui/vr/RDXVRModeManager.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -264,13 +264,13 @@ private void getRenderables(Array<Renderable> renderables, Pool<Renderable> pool
264264
}
265265
case JOYSTICK_WALKING -> joystickBasedStepping.getRenderables(renderables, pool);
266266
}
267-
}
268267

269-
if (stereoVision.isEnabled())
270-
stereoVision.getDualBlackflySphericalProjection().getRenderables(renderables, pool, sceneLevels);
268+
if (stereoVision.isEnabled())
269+
stereoVision.getDualBlackflySphericalProjection().getRenderables(renderables, pool, sceneLevels);
271270

272-
if (vrModeControls.getRenderOnLeftHand().get())
273-
vrModeControls3DPanel.getRenderables(renderables, pool);
271+
if (vrModeControls.getRenderOnLeftHand().get())
272+
vrModeControls3DPanel.getRenderables(renderables, pool);
273+
}
274274
}
275275

276276
public void destroy()

0 commit comments

Comments
 (0)