Skip to content

Commit 3efb1fe

Browse files
author
Doug Stephen
committed
Merge branch 'release/0.9.0'
2 parents 2b7baa9 + 3df5a05 commit 3efb1fe

File tree

3,711 files changed

+254830
-89966
lines changed

Some content is hidden

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

3,711 files changed

+254830
-89966
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
| Required Info ||
1+
| Required Info | |
22
|---|---|
33
|Version or commit hash|<!-- Output of git rev-parse HEAD, current tag, or .jar version -->|
44
|Sim or Real Robot|<!-- Name of robot, whether it's sim/hardware, or N/A -->|
@@ -15,4 +15,4 @@
1515
<!-- Action or result observed after performing the steps above -->
1616

1717
#### Contributors with relevant knowledge or expertise (optional)
18-
<!-- @-mention individuals with knowledge in this problem domain -->
18+
<!-- @-mention individuals with knowledge in this problem domain -->

.gitignore

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
/out
66
/target
77
/pit-reports
8+
/install
89

910
# Top level directories in sub-projects
1011
*/classes
@@ -13,6 +14,7 @@
1314
*/target
1415
*/build
1516
*/pit-reports
17+
*/install
1618

1719
# directories to always ignore
1820
**/.gradle
@@ -78,5 +80,5 @@
7880
**/Network Trash Folder
7981
**/Temporary Items
8082
**/.apdisk
81-
82-
!**/gradle-wrapper.jar
83+
**/rebel.xml
84+
**/generatedTestSuites/*TestSuite.java

Acsell/build.gradle

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
}
66
}
77
dependencies {
8-
classpath "gradle.plugin.us.ihmc.gradle:ihmc-build:0.0.18"
8+
classpath "gradle.plugin.us.ihmc.gradle:ihmc-build:0.0.19"
99
classpath "org.hidetake:gradle-ssh-plugin:2.1.1"
1010
}
1111
}
@@ -18,7 +18,7 @@ if (!rootProject.name.equals('IHMCOpenRoboticsSoftware'))
1818
evaluationDependsOn(':IHMCOpenRoboticsSoftware')
1919
}
2020

21-
sourceCompatibility = 1.7
21+
sourceCompatibility = 1.8
2222

2323
version = "${getOpenRoboticsSoftwareProject().version}"
2424
project.ext.fullVersion = "${getOpenRoboticsSoftwareProject().ext.fullVersion}"
@@ -34,7 +34,10 @@ repositories {
3434
jcenter()
3535
mavenCentral()
3636
maven {
37-
url "https://bengal.ihmc.us/nexus/content/repositories/thirdparty/"
37+
url "http://artifactory.ihmc.us/artifactory/thirdparty/"
38+
}
39+
maven {
40+
url "http://artifactory.ihmc.us/artifactory/releases/"
3841
}
3942
}
4043

@@ -43,7 +46,7 @@ ihmc.configureForIHMCOpenSourceBintrayPublish(false, "mavenJava", "maven-release
4346

4447
dependencies {
4548
testCompile group: 'junit', name: 'junit', version: '4.11'
46-
testCompile ihmc.getProjectTestDependency(":DarpaRoboticsChallenge")
49+
testCompile ihmc.getProjectTestDependency(":IHMCAvatarInterfaces")
4750

4851
compile group: 'javax.vecmath', name: 'vecmath', version: '1.5.2'
4952
compile group: 'us.ihmc', name: 'IHMCRealtime', version: '1.1.2'
@@ -59,18 +62,20 @@ dependencies {
5962
compile ihmc.getProjectDependency(":IHMCHumanoidRobotics")
6063
compile ihmc.getProjectDependency(":IHMCStateEstimation")
6164
compile ihmc.getProjectDependency(":CommonWalkingControlModules")
62-
compile ihmc.getProjectDependency(":DarpaRoboticsChallenge")
63-
compile ihmc.getProjectDependency(":Graphics3DAdapter")
64-
compile ihmc.getProjectDependency(":SDFLoader")
65+
compile ihmc.getProjectDependency(":IHMCAvatarInterfaces")
66+
compile ihmc.getProjectDependency(":IHMCJMonkeyEngineToolkit")
67+
compile ihmc.getProjectDependency(":ModelFileLoader")
6568
compile ihmc.getProjectDependency(":SensorProcessing")
6669
compile ihmc.getProjectDependency(":SimulationConstructionSet")
67-
compile ihmc.getProjectDependency(":RobotDataCommunication")
70+
compile ihmc.getProjectDependency(":IHMCRobotDataLogger")
6871
compile ihmc.getProjectDependency(":IHMCPerception")
6972
compile ihmc.getProjectDependency(":IHMCWholeBodyController")
7073
compile ihmc.getProjectDependency(":IHMCJavaToolkit")
7174
compile ihmc.getProjectDependency(":IHMCRoboticsToolkit")
7275
compile ihmc.getProjectDependency(":IHMCRobotDescription")
7376
compile ihmc.getProjectDependency(":IHMCRobotModels")
77+
compile ihmc.getProjectDependency(":IHMCRobotDataVisualizer")
78+
compile ihmc.getProjectDependency(":IHMCGraphicsDescription")
7479
testCompile ihmc.getProjectDependency(":IHMCUnitTesting")
7580
}
7681

-49.8 KB
Binary file not shown.

Acsell/gradle/wrapper/gradle-wrapper.properties

Lines changed: 0 additions & 6 deletions
This file was deleted.

Acsell/gradlew

Lines changed: 0 additions & 164 deletions
This file was deleted.

Acsell/src/us/ihmc/acsell/CostOfTransportCalculator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
import javax.vecmath.Vector3d;
44

5+
import us.ihmc.graphicsDescription.yoGraphics.YoGraphicsListRegistry;
56
import us.ihmc.robotModels.FullRobotModel;
67
import us.ihmc.robotModels.visualizer.RobotVisualizer;
78
import us.ihmc.robotics.dataStructures.registry.YoVariableRegistry;
89
import us.ihmc.robotics.dataStructures.variable.DoubleYoVariable;
910
import us.ihmc.robotics.time.TimeTools;
10-
import us.ihmc.simulationconstructionset.yoUtilities.graphics.YoGraphicsListRegistry;
1111
import us.ihmc.tools.io.printing.PrintTools;
1212

1313
/**

Acsell/src/us/ihmc/acsell/initialSetup/BonoInitialSetup.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
import javax.vecmath.Quat4d;
44
import javax.vecmath.Vector3d;
55

6-
import us.ihmc.humanoidRobotics.HumanoidFloatingRootJointRobot;
7-
import us.ihmc.darpaRoboticsChallenge.initialSetup.DRCRobotInitialSetup;
6+
import us.ihmc.avatar.initialSetup.DRCRobotInitialSetup;
87
import us.ihmc.robotics.geometry.FrameOrientation;
98
import us.ihmc.robotics.geometry.RigidBodyTransform;
109
import us.ihmc.robotics.referenceFrames.ReferenceFrame;
1110
import us.ihmc.robotics.robotSide.RobotSide;
1211
import us.ihmc.simulationconstructionset.GroundContactPoint;
12+
import us.ihmc.simulationconstructionset.HumanoidFloatingRootJointRobot;
1313
import us.ihmc.wholeBodyController.DRCRobotJointMap;
1414

1515
/**

Acsell/src/us/ihmc/acsell/network/AcsellSensorSuiteManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
import java.net.URI;
55

66
import us.ihmc.robotModels.FullRobotModel;
7+
import us.ihmc.avatar.sensors.DRCSensorSuiteManager;
78
import us.ihmc.communication.net.ObjectCommunicator;
89
import us.ihmc.communication.packetCommunicator.PacketCommunicator;
910
import us.ihmc.communication.util.NetworkPorts;
10-
import us.ihmc.darpaRoboticsChallenge.sensors.DRCSensorSuiteManager;
1111
import us.ihmc.humanoidRobotics.kryo.IHMCCommunicationKryoNetClassList;
1212

1313
public class AcsellSensorSuiteManager implements DRCSensorSuiteManager

0 commit comments

Comments
 (0)