Skip to content

Commit

Permalink
moved out more of th e simple code into the sub-sets
Browse files Browse the repository at this point in the history
did a bunch of testing and javadoc, and cleaned up polynomial3D
  • Loading branch information
rjgriffin42 committed Oct 20, 2024
1 parent db9164e commit afb25a7
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 14 deletions.
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
package us.ihmc.valkyrie.kinematics.transmissions;

import us.ihmc.euclid.Axis3D;
import us.ihmc.euclid.referenceFrame.FramePoint3D;
import us.ihmc.euclid.referenceFrame.FrameVector3D;
import us.ihmc.euclid.referenceFrame.ReferenceFrame;
import us.ihmc.euclid.referenceFrame.*;
import us.ihmc.euclid.transform.RigidBodyTransform;
import us.ihmc.euclid.tuple3D.Vector3D;
import us.ihmc.graphicsDescription.appearance.YoAppearance;
Expand All @@ -13,8 +11,6 @@
import us.ihmc.graphicsDescription.yoGraphics.YoGraphicsListRegistry;
import us.ihmc.yoVariables.registry.YoRegistry;
import us.ihmc.yoVariables.variable.YoDouble;
import us.ihmc.robotics.referenceFrames.TransformReferenceFrame;
import us.ihmc.robotics.referenceFrames.TranslationReferenceFrame;

public class InefficientPushrodTransmissionJacobian implements PushrodTransmissionJacobian
{
Expand Down Expand Up @@ -42,11 +38,11 @@ public class InefficientPushrodTransmissionJacobian implements PushrodTransmissi
private final ReferenceFrame worldFrame = ReferenceFrame.getWorldFrame();

private final TranslationReferenceFrame topFrame = new TranslationReferenceFrame("topFrame", worldFrame);
private final TransformReferenceFrame actuator5SlideFrame = new TransformReferenceFrame("actuator5SlideFrame", topFrame);
private final TransformReferenceFrame actuator6SlideFrame = new TransformReferenceFrame("actuator6SlideFrame", topFrame);
private final TransformReferenceFrame afterTopJointFrame = new TransformReferenceFrame("afterTopJointFrame", topFrame);
private final PoseReferenceFrame actuator5SlideFrame = new PoseReferenceFrame("actuator5SlideFrame", topFrame);
private final PoseReferenceFrame actuator6SlideFrame = new PoseReferenceFrame("actuator6SlideFrame", topFrame);
private final PoseReferenceFrame afterTopJointFrame = new PoseReferenceFrame("afterTopJointFrame", topFrame);
private final TranslationReferenceFrame beforeBottomJointFrame = new TranslationReferenceFrame("beforeBottomJointFrame", afterTopJointFrame);
private final TransformReferenceFrame bottomFrame = new TransformReferenceFrame("bottomFrame", beforeBottomJointFrame);
private final PoseReferenceFrame bottomFrame = new PoseReferenceFrame("bottomFrame", beforeBottomJointFrame);

private final RigidBodyTransform topJointTransform3D = new RigidBodyTransform();
private final RigidBodyTransform bottomJointTransform3D = new RigidBodyTransform();
Expand Down Expand Up @@ -110,7 +106,7 @@ public InefficientPushrodTransmissionJacobian(PushRodTransmissionJoint pushRodTr
}
}

topFrame.updateTranslation(new FrameVector3D(worldFrame, 0.0, 0.0, 1.0)); // Arbitrary. Just put it in the air. If we wanted to have things align with the real robot, then this should be at the top joint frame.
topFrame.setTranslationAndUpdate(new FrameVector3D(worldFrame, 0.0, 0.0, 1.0)); // Arbitrary. Just put it in the air. If we wanted to have things align with the real robot, then this should be at the top joint frame.

RigidBodyTransform transformFromActuatorSlide5FrameToBoneFrame = new RigidBodyTransform();
transformFromActuatorSlide5FrameToBoneFrame.setRotationPitchAndZeroTranslation(-actuatorSlider5PitchRotation);
Expand All @@ -123,7 +119,7 @@ public InefficientPushrodTransmissionJacobian(PushRodTransmissionJoint pushRodTr
actuator5SlideFrame.setTransformAndUpdate(transformFromActuatorSlide5FrameToBoneFrame);
actuator6SlideFrame.setTransformAndUpdate(transformFromActuatorSlide6FrameToBoneFrame);

beforeBottomJointFrame.updateTranslation(new FrameVector3D(afterTopJointFrame, 0.0, 0.0, -heightOfTopAxisAboveBottomAxis));
beforeBottomJointFrame.setTranslationAndUpdate(new FrameVector3D(afterTopJointFrame, 0.0, 0.0, -heightOfTopAxisAboveBottomAxis));

if (yoGraphicsListRegistry == null)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import us.ihmc.commons.robotics.outputData.JointDesiredOutputListReadOnly;
import us.ihmc.commons.robotics.outputData.JointDesiredOutputReadOnly;
import us.ihmc.stateEstimation.humanoid.kinematicsBasedStateEstimation.ForceSensorCalibrationModule;
import us.ihmc.tools.lists.PairList;
import us.ihmc.commons.lists.PairList;
import us.ihmc.valkyrie.ValkyrieCalibrationParameters;
import us.ihmc.wholeBodyController.diagnostics.CalibrationState;
import us.ihmc.wholeBodyController.diagnostics.JointTorqueOffsetEstimatorController;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import us.ihmc.robotics.sensors.ForceSensorDataReadOnly;
import us.ihmc.robotics.sensors.ForceSensorDefinition;
import us.ihmc.robotics.sensors.IMUDefinition;
import us.ihmc.robotics.time.ExecutionTimer;
import us.ihmc.commons.time.ExecutionTimer;
import us.ihmc.rosControl.EffortJointHandle;
import us.ihmc.rosControl.wholeRobot.ForceTorqueSensorHandle;
import us.ihmc.rosControl.wholeRobot.IHMCWholeRobotControlJavaBridge;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import us.ihmc.euclid.referenceFrame.FramePose3D;
import us.ihmc.euclid.referenceFrame.FrameVector3D;
import us.ihmc.euclid.referenceFrame.ReferenceFrame;
import us.ihmc.euclid.tools.EuclidCoreMissingTools;
import us.ihmc.euclid.tools.EuclidCoreTestTools;
import us.ihmc.euclid.transform.RigidBodyTransform;
import us.ihmc.euclid.transform.interfaces.RigidBodyTransformReadOnly;
Expand All @@ -39,7 +40,6 @@
import us.ihmc.mecano.frames.MovingReferenceFrame;
import us.ihmc.mecano.tools.MultiBodySystemTools;
import us.ihmc.robotModels.FullHumanoidRobotModel;
import us.ihmc.robotics.EuclidCoreMissingTools;
import us.ihmc.robotics.math.trajectories.generators.MultipleWaypointsPositionTrajectoryGenerator;
import us.ihmc.commons.robotics.robotSide.RobotSide;
import us.ihmc.scs2.definition.controller.interfaces.Controller;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import us.ihmc.avatar.drcRobot.DRCRobotModel;
import us.ihmc.avatar.drcRobot.RobotTarget;
import us.ihmc.avatar.multiContact.HumanoidRobotTransformOptimizerTest;
import us.ihmc.euclid.tools.EuclidCoreMissingRandomTools;
import us.ihmc.euclid.tools.EuclidCoreRandomTools;
import us.ihmc.valkyrie.ValkyrieInitialSetupFactories;
import us.ihmc.valkyrie.ValkyrieMutableInitialSetup;
Expand Down

0 comments on commit afb25a7

Please sign in to comment.