Skip to content

Commit 433ef58

Browse files
rjgriffin42rjgriffin42
committed
⬆️ euclid 0.22.0 ⬆️ ihmc-commons 0.33.0 :arrow-up: ihmc-yovaraibles 0.13.1. Revised the packages of robot tools
1 parent 7231025 commit 433ef58

File tree

72 files changed

+207
-208
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+207
-208
lines changed

‎build.gradle.kts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ mainDependencies {
3030
api("us.ihmc:jinput:2.0.6-ihmc2")
3131
api("us.ihmc:ihmc-lord-microstrain-drivers:17-0.0.7")
3232

33-
api("us.ihmc:euclid:0.21.0")
34-
api("us.ihmc:euclid-geometry:0.21.0")
35-
api("us.ihmc:euclid-frame:0.21.0")
36-
api("us.ihmc:euclid-shape:0.21.0")
37-
api("us.ihmc:euclid-frame-shape:0.21.0")
33+
api("us.ihmc:euclid:0.22.0")
34+
api("us.ihmc:euclid-geometry:0.22.0")
35+
api("us.ihmc:euclid-frame:0.22.0")
36+
api("us.ihmc:euclid-shape:0.22.0")
37+
api("us.ihmc:euclid-frame-shape:0.22.0")
3838
api("us.ihmc:ihmc-realtime:1.6.0")
3939
api("us.ihmc:ihmc-ros-control:0.7.1")
4040

@@ -53,11 +53,11 @@ mainDependencies {
5353
}
5454

5555
testDependencies {
56-
api("us.ihmc:euclid:0.21.0")
57-
api("us.ihmc:euclid-geometry:0.21.0")
58-
api("us.ihmc:euclid-frame:0.21.0")
59-
api("us.ihmc:euclid-shape:0.21.0")
60-
api("us.ihmc:euclid-frame-shape:0.21.0")
56+
api("us.ihmc:euclid:0.22.0")
57+
api("us.ihmc:euclid-geometry:0.22.0")
58+
api("us.ihmc:euclid-frame:0.22.0")
59+
api("us.ihmc:euclid-shape:0.22.0")
60+
api("us.ihmc:euclid-frame-shape:0.22.0")
6161

6262
api("us.ihmc:ihmc-avatar-interfaces-test:$ihmcOpenRoboticsSoftwareVersion") {
6363
exclude(group = "us.ihmc", module = "javacpp")

‎src/main/java/us/ihmc/valkyrie/ValkyrieArmMassSimCollisionModel.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
import us.ihmc.mecano.multiBodySystem.interfaces.MultiBodySystemBasics;
1515
import us.ihmc.mecano.multiBodySystem.interfaces.RigidBodyBasics;
1616
import us.ihmc.robotics.geometry.shapes.FrameSTPBox3D;
17-
import us.ihmc.commons.robotics.partNames.ArmJointName;
17+
import us.ihmc.robotics.partNames.ArmJointName;
1818
import us.ihmc.robotics.partNames.HumanoidJointNameMap;
19-
import us.ihmc.commons.robotics.partNames.LegJointName;
19+
import us.ihmc.robotics.partNames.LegJointName;
2020
import us.ihmc.robotics.physics.Collidable;
2121
import us.ihmc.robotics.physics.CollidableHelper;
2222
import us.ihmc.robotics.physics.RobotCollisionModel;
23-
import us.ihmc.commons.robotics.robotSide.RobotSide;
23+
import us.ihmc.robotics.robotSide.RobotSide;
2424
import us.ihmc.wholeBodyController.RobotContactPointParameters;
2525

2626
import java.util.ArrayList;

‎src/main/java/us/ihmc/valkyrie/ValkyrieCalibrationParameters.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
import java.util.HashMap;
44

55
import us.ihmc.commonWalkingControlModules.highLevelHumanoidControl.highLevelStates.WholeBodySetpointParameters;
6-
import us.ihmc.commons.robotics.partNames.ArmJointName;
7-
import us.ihmc.commons.robotics.partNames.LegJointName;
8-
import us.ihmc.commons.robotics.partNames.NeckJointName;
9-
import us.ihmc.commons.robotics.partNames.SpineJointName;
10-
import us.ihmc.commons.robotics.robotSide.RobotSide;
6+
import us.ihmc.robotics.partNames.ArmJointName;
7+
import us.ihmc.robotics.partNames.LegJointName;
8+
import us.ihmc.robotics.partNames.NeckJointName;
9+
import us.ihmc.robotics.partNames.SpineJointName;
10+
import us.ihmc.robotics.robotSide.RobotSide;
1111
import us.ihmc.valkyrie.parameters.ValkyrieJointMap;
1212

1313
public class ValkyrieCalibrationParameters implements WholeBodySetpointParameters

‎src/main/java/us/ihmc/valkyrie/ValkyrieCollisionMeshDefinitionDataHolder.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package us.ihmc.valkyrie;
22

33
import us.ihmc.euclid.transform.RigidBodyTransform;
4-
import us.ihmc.commons.robotics.partNames.LegJointName;
4+
import us.ihmc.robotics.partNames.LegJointName;
55
import us.ihmc.robotics.robotDescription.collisionMeshDefinitionData.BoxCollisionMeshDefinitionData;
66
import us.ihmc.robotics.robotDescription.collisionMeshDefinitionData.CollisionMeshDefinitionData;
77
import us.ihmc.robotics.robotDescription.collisionMeshDefinitionData.CollisionMeshDefinitionDataHolder;
8-
import us.ihmc.commons.robotics.robotSide.RobotSide;
8+
import us.ihmc.robotics.robotSide.RobotSide;
99
import us.ihmc.valkyrie.parameters.ValkyrieJointMap;
1010
import us.ihmc.valkyrie.parameters.ValkyriePhysicalProperties;
1111

‎src/main/java/us/ihmc/valkyrie/ValkyrieFootstepPlannerCollisionModel.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
import us.ihmc.mecano.multiBodySystem.interfaces.JointBasics;
1111
import us.ihmc.mecano.multiBodySystem.interfaces.MultiBodySystemBasics;
1212
import us.ihmc.mecano.multiBodySystem.interfaces.RigidBodyBasics;
13-
import us.ihmc.commons.robotics.partNames.ArmJointName;
13+
import us.ihmc.robotics.partNames.ArmJointName;
1414
import us.ihmc.robotics.partNames.HumanoidJointNameMap;
15-
import us.ihmc.commons.robotics.partNames.LegJointName;
15+
import us.ihmc.robotics.partNames.LegJointName;
1616
import us.ihmc.robotics.physics.Collidable;
1717
import us.ihmc.robotics.physics.CollidableHelper;
1818
import us.ihmc.robotics.physics.RobotCollisionModel;
19-
import us.ihmc.commons.robotics.robotSide.RobotSide;
20-
import us.ihmc.commons.robotics.robotSide.SideDependentList;
19+
import us.ihmc.robotics.robotSide.RobotSide;
20+
import us.ihmc.robotics.robotSide.SideDependentList;
2121
import us.ihmc.simulationToolkit.physicsEngine.ExperimentalSimulation;
2222

2323
import java.util.ArrayList;

‎src/main/java/us/ihmc/valkyrie/ValkyrieHighLevelControllerParameters.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
import us.ihmc.commonWalkingControlModules.controllerCore.parameters.JointAccelerationIntegrationParametersReadOnly;
1212
import us.ihmc.commonWalkingControlModules.highLevelHumanoidControl.highLevelStates.WholeBodySetpointParameters;
1313
import us.ihmc.humanoidRobotics.communication.packets.dataobjects.HighLevelControllerName;
14-
import us.ihmc.commons.robotics.partNames.ArmJointName;
15-
import us.ihmc.commons.robotics.partNames.LegJointName;
16-
import us.ihmc.commons.robotics.partNames.NeckJointName;
17-
import us.ihmc.commons.robotics.partNames.SpineJointName;
18-
import us.ihmc.commons.robotics.robotSide.RobotSide;
14+
import us.ihmc.robotics.partNames.ArmJointName;
15+
import us.ihmc.robotics.partNames.LegJointName;
16+
import us.ihmc.robotics.partNames.NeckJointName;
17+
import us.ihmc.robotics.partNames.SpineJointName;
18+
import us.ihmc.robotics.robotSide.RobotSide;
1919
import us.ihmc.sensorProcessing.outputData.JointDesiredBehavior;
2020
import us.ihmc.sensorProcessing.outputData.JointDesiredBehaviorReadOnly;
21-
import us.ihmc.commons.robotics.outputData.JointDesiredControlMode;
21+
import us.ihmc.robotics.outputData.JointDesiredControlMode;
2222
import us.ihmc.valkyrie.parameters.ValkyrieJointMap;
2323
import us.ihmc.robotics.partNames.HumanoidJointNameMap;
2424
import us.ihmc.yoVariables.filters.AlphaFilterTools;

‎src/main/java/us/ihmc/valkyrie/ValkyrieInitialSetup.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package us.ihmc.valkyrie;
22

33
import us.ihmc.avatar.initialSetup.HumanoidRobotInitialSetup;
4-
import us.ihmc.commons.robotics.partNames.ArmJointName;
4+
import us.ihmc.robotics.partNames.ArmJointName;
55
import us.ihmc.robotics.partNames.HumanoidJointNameMap;
6-
import us.ihmc.commons.robotics.partNames.LegJointName;
7-
import us.ihmc.commons.robotics.robotSide.RobotSide;
6+
import us.ihmc.robotics.partNames.LegJointName;
7+
import us.ihmc.robotics.robotSide.RobotSide;
88
import us.ihmc.scs2.definition.robot.RobotDefinition;
99

1010
public class ValkyrieInitialSetup extends HumanoidRobotInitialSetup

‎src/main/java/us/ihmc/valkyrie/ValkyrieInitialSetupFactories.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package us.ihmc.valkyrie;
22

3-
import us.ihmc.commons.robotics.partNames.ArmJointName;
4-
import us.ihmc.commons.robotics.partNames.LegJointName;
5-
import us.ihmc.commons.robotics.robotSide.RobotSide;
3+
import us.ihmc.robotics.partNames.ArmJointName;
4+
import us.ihmc.robotics.partNames.LegJointName;
5+
import us.ihmc.robotics.robotSide.RobotSide;
66
import us.ihmc.robotics.partNames.HumanoidJointNameMap;
77

88
public class ValkyrieInitialSetupFactories

‎src/main/java/us/ihmc/valkyrie/ValkyrieKinematicsCollisionModel.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
import us.ihmc.mecano.multiBodySystem.interfaces.JointBasics;
1212
import us.ihmc.mecano.multiBodySystem.interfaces.MultiBodySystemBasics;
1313
import us.ihmc.mecano.multiBodySystem.interfaces.RigidBodyBasics;
14-
import us.ihmc.commons.robotics.partNames.ArmJointName;
14+
import us.ihmc.robotics.partNames.ArmJointName;
1515
import us.ihmc.robotics.partNames.HumanoidJointNameMap;
16-
import us.ihmc.commons.robotics.partNames.LegJointName;
16+
import us.ihmc.robotics.partNames.LegJointName;
1717
import us.ihmc.robotics.physics.Collidable;
1818
import us.ihmc.robotics.physics.CollidableHelper;
1919
import us.ihmc.robotics.physics.RobotCollisionModel;
20-
import us.ihmc.commons.robotics.robotSide.RobotSide;
21-
import us.ihmc.commons.robotics.robotSide.SideDependentList;
20+
import us.ihmc.robotics.robotSide.RobotSide;
21+
import us.ihmc.robotics.robotSide.SideDependentList;
2222

2323
public class ValkyrieKinematicsCollisionModel implements RobotCollisionModel
2424
{

‎src/main/java/us/ihmc/valkyrie/ValkyrieKinematicsStreamingToolboxModule.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
import us.ihmc.pubsub.DomainFactory.PubSubImplementation;
1414
import us.ihmc.robotDataLogger.logger.DataServerSettings;
1515
import us.ihmc.robotModels.FullHumanoidRobotModel;
16-
import us.ihmc.commons.robotics.partNames.ArmJointName;
17-
import us.ihmc.commons.robotics.partNames.LegJointName;
18-
import us.ihmc.commons.robotics.partNames.SpineJointName;
19-
import us.ihmc.commons.robotics.robotSide.RobotSide;
16+
import us.ihmc.robotics.partNames.ArmJointName;
17+
import us.ihmc.robotics.partNames.LegJointName;
18+
import us.ihmc.robotics.partNames.SpineJointName;
19+
import us.ihmc.robotics.robotSide.RobotSide;
2020
import us.ihmc.scs2.definition.robot.OneDoFJointDefinition;
2121
import us.ihmc.simulationConstructionSetTools.util.HumanoidFloatingRootJointRobot;
2222
import us.ihmc.valkyrie.ValkyrieNetworkProcessor.NetworkProcessorVersion;

0 commit comments

Comments
 (0)