Skip to content

Commit e2833ae

Browse files
author
Operator Computer
committed
Release 0.11.0. Improves planning behavior. This release is only supported on Atlas.
2 parents 7ce92dd + 33ba174 commit e2833ae

File tree

5,121 files changed

+165034
-68242
lines changed

Some content is hidden

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

5,121 files changed

+165034
-68242
lines changed

.gitignore

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,19 @@
99
/src/*/bin
1010

1111
# Top level directories in sub-projects
12-
*/classes
13-
*/bin
14-
*/out
1512
*/target
16-
*/build
1713
*/pit-reports
1814
*/install
1915
*/src/*/bin
2016
*/src/*/build
2117
*/src/*/out
18+
*/Configurations
2219

2320
# directories to always ignore
21+
**/classes
22+
**/bin
23+
**/out
24+
**/build
2425
**/.gradle
2526
**/.project
2627
**/.classpath
@@ -41,6 +42,8 @@
4142
**/.LSOverride
4243
**/.AppleDouble
4344
**/pitest
45+
**/pit-test
46+
**/pit-reports
4447
**/generated-src2
4548

4649

@@ -87,5 +90,3 @@
8790
**/.apdisk
8891
**/rebel.xml
8992
**/generatedTestSuites/*TestSuite.java
90-
91-
!gradle/wrapper/gradle-wrapper.jar

README.md

Lines changed: 38 additions & 78 deletions

acsell/build.gradle

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
mavenLocal()
55
}
66
dependencies {
7-
classpath "gradle.plugin.us.ihmc:ihmc-build:0.9.5"
7+
classpath "us.ihmc:ihmc-build:0.12.1"
88
classpath "org.hidetake:gradle-ssh-plugin:2.9.0"
99
}
1010
}
@@ -25,19 +25,17 @@ testSuites {
2525
}
2626

2727
mainDependencies {
28-
compile group: 'us.ihmc', name: 'euclid-core', version: '0.4.6'
28+
compile group: 'us.ihmc', name: 'euclid-core', version: '0.4.13'
2929
compile group: 'us.ihmc', name: 'IHMCRealtime', version: '1.1.8'
30-
compile group: 'us.ihmc', name: 'ihmc-yovariables', version: '0.2.4'
31-
compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.4'
30+
compile group: 'us.ihmc', name: 'ihmc-yovariables', version: '0.2.6'
31+
compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.7'
3232
compile group: 'us.ihmc.thirdparty.jinput', name: 'jinput', version: '160414'
3333
compile group: 'org.ejml', name: 'dense64', version: '0.30'
3434
compile group: 'org.ejml', name: 'core', version: '0.30'
35-
compile group: 'us.ihmc.thirdparty.jme', name: 'jme3-core', version: '3.1.0-internal4'
3635
compile group: 'com.martiansoftware', name: 'jsap', version: '2.1'
3736
compile group: 'org.bidib.jbidib.org.qbang.rxtx', name: 'rxtxcomm', version: '2.2'
38-
compile group: 'us.ihmc', name: 'ihmc-commons', version: '0.11.2'
37+
compile group: "us.ihmc", name: "ihmc-commons", version: "0.17.0"
3938
compile group: "us.ihmc", name: "ihmc-communication", version: groupDependencyVersion
40-
compile group: "us.ihmc", name: "ihmc-java-extensions", version: groupDependencyVersion
4139
compile group: "us.ihmc", name: "ihmc-humanoid-robotics", version: groupDependencyVersion
4240
compile group: "us.ihmc", name: "ihmc-state-estimation", version: groupDependencyVersion
4341
compile group: "us.ihmc", name: "ihmc-common-walking-control-modules", version: groupDependencyVersion
@@ -58,12 +56,11 @@ mainDependencies {
5856
}
5957

6058
testDependencies {
61-
compile group: 'junit', name: 'junit', version: '4.11'
62-
compile group: "us.ihmc", name: "ihmc-ci-core-api", version: "0.16.8"
63-
compile group: 'us.ihmc', name: 'ihmc-commons-testing', version: '0.11.2'
59+
compile group: "junit", name: "junit", version: "4.12"
60+
compile group: "us.ihmc", name: "ihmc-ci-core-api", version: "0.17.0"
61+
compile group: "us.ihmc", name: "ihmc-commons-testing", version: "0.17.0"
6462
compile group: "us.ihmc", name: "ihmc-avatar-interfaces-test", version: groupDependencyVersion
6563
compile group: "us.ihmc", name: "ihmc-robotics-toolkit-test", version: groupDependencyVersion
66-
compile group: "us.ihmc", name: "ihmc-java-extensions-test", version: groupDependencyVersion
6764
}
6865

6966
if (ihmc.isBuildRoot())

acsell/gradle.properties

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
1-
hyphenatedName = acsell
1+
kebabCasedName = acsell
22
pascalCasedName = Acsell
33
extraSourceSets = ["test"]
44
publishMode = SNAPSHOT
5-
groupDependencyVersion = SNAPSHOT-LATEST
5+
groupDependencyVersion = source
66
depthFromWorkspaceDirectory = 2
77
excludeFromCompositeBuild = false
8-
includeBuildsFromWorkspace = true
9-
artifactoryUsername = unset_username
10-
artifactoryPassword = unset_password
11-
bintray_user = unset_user
12-
bintray_key = unset_key
138
steppr_username = unset_username
149
steppr_password = unset_password
1510
wanderer_username = unset_password

acsell/Configurations/StepperWalkingDebug.guiConf renamed to acsell/saved-configurations/StepperWalkingDebug.guiConf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,13 +192,13 @@ diag
192192
<Title>
193193
General
194194
</Title>
195-
<Entry Boxes>enableOutput,startStandprep,selectedJointPair,requestedHighLevelState,manualModeICPOffset,jointVelocityAlphaFilter</Entry Boxes>
195+
<Entry Boxes>enableOutput,startStandprep,selectedJointPair,requestedHighLevelControllerName,manualModeICPOffset,jointVelocityAlphaFilter</Entry Boxes>
196196
</EntryBoxTab>
197197
<EntryBoxTab>
198198
<Title>
199199
UserStep
200200
</Title>
201-
<Entry Boxes>userStepsToTake,userStepFirstSide,userStepLength,userStepWidth,userStepsTakeEm,kpPelvisOrientation,kpXYLinearSwingFoot,kpZLinearSwingFoot,kpXYAngularSwingFoot,kpZAngularSwingFoot,swingTime,kpChestOrientation,captureKpParallel,captureKpOrthogonal,zetaPelvisOrientation,transferTime,r_leg_knymotorDamping,enableOutput,startStandprep,selectedJointPair,requestedHighLevelState,manualModeICPOffset,jointVelocityAlphaFilter,userStepSideways,kpCoMHeight,zetaCoMHeight,userStepYaw</Entry Boxes>
201+
<Entry Boxes>userStepsToTake,userStepFirstSide,userStepLength,userStepWidth,userStepsTakeEm,kpPelvisOrientation,kpXYLinearSwingFoot,kpZLinearSwingFoot,kpXYAngularSwingFoot,kpZAngularSwingFoot,swingTime,kpChestOrientation,captureKpParallel,captureKpOrthogonal,zetaPelvisOrientation,transferTime,r_leg_knymotorDamping,enableOutput,startStandprep,selectedJointPair,requestedHighLevelControllerName,manualModeICPOffset,jointVelocityAlphaFilter,userStepSideways,kpCoMHeight,zetaCoMHeight,userStepYaw</Entry Boxes>
202202
</EntryBoxTab>
203203
<EntryBoxTab>
204204
<Title>

acsell/Configurations/bono_RemoteStepprVisualizer_GuiConfiguration.dat renamed to acsell/saved-configurations/bono_RemoteStepprVisualizer_GuiConfiguration.dat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<Title>
3131
Tab
3232
</Title>
33-
<Entry Boxes>enableOutput,startStandprep,requestedHighLevelState,controlRatio</Entry Boxes>
33+
<Entry Boxes>enableOutput,startStandprep,requestedHighLevelControllerName,controlRatio</Entry Boxes>
3434
</EntryBoxTab>
3535
</Entry Boxes Tab Pane>
3636

acsell/Configurations/bono_StepprStandPrepSliderboard_GuiConfiguration.dat renamed to acsell/saved-configurations/bono_StepprStandPrepSliderboard_GuiConfiguration.dat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ ToeOff
246246
<Title>
247247
Tab6
248248
</Title>
249-
<Entry Boxes>torsoXActuatorMotorAngleOffset,torsoYActuatorMotorAngleOffset,walkingState,sow_walkingState,requestedHighLevelState,highLevelState,enableOutput,torsoZActuatorMotorAngleOffset</Entry Boxes>
249+
<Entry Boxes>torsoXActuatorMotorAngleOffset,torsoYActuatorMotorAngleOffset,walkingState,sow_walkingState,requestedHighLevelControllerName,highLevelControllerName,enableOutput,torsoZActuatorMotorAngleOffset</Entry Boxes>
250250
</EntryBoxTab>
251251
<EntryBoxTab>
252252
<Title>
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#
2+
#Tue Oct 10 11:32:49 CDT 2017
3+
REA/Module/Lidar/Range/Max=5.0
4+
REA/Module/Lidar/Range/Min=0.2
5+
REA/Module/NormalEstimation/Enable=true
6+
REA/Module/NormalEstimation/Parameters=search radius\: 0.08, max distance from plane\: 0.02, min consensus ratio\: 0.5, max average deviation ratio\: 0.75, number of iterations\: 1, least squares estimation\: true
7+
REA/Module/OcTree/BoundingBox/Enable=true
8+
REA/Module/OcTree/BoundingBox/Parameters=min\: (-1.0, -2.0, -3.0), max\: (5.0, 2.0, 0.5)
9+
REA/Module/OcTree/Enable=true
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#
2+
#Tue Oct 10 11:32:49 CDT 2017
3+
REA/UserInterface/OcTree/BoundingBox/Show=false

acsell/Configurations/wanderer_WandererStandPrepSliderboard_GuiConfiguration.dat renamed to acsell/saved-configurations/wanderer_WandererStandPrepSliderboard_GuiConfiguration.dat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ Tab1
162162
<Title>
163163
Tab2
164164
</Title>
165-
<Entry Boxes>requestedHighLevelState,kpXYLinearSwingFoot,kdXYLinearSwingFoot,zetaLinearSwingFoot,kpZLinearSwingFoot,zetaXYAngularSwingFoot,zetaZAngularSwingFoot,torsoYActuatorMotorAngleOffset</Entry Boxes>
165+
<Entry Boxes>requestedHighLevelControllerName,kpXYLinearSwingFoot,kdXYLinearSwingFoot,zetaLinearSwingFoot,kpZLinearSwingFoot,zetaXYAngularSwingFoot,zetaZAngularSwingFoot,torsoYActuatorMotorAngleOffset</Entry Boxes>
166166
</EntryBoxTab>
167167
<EntryBoxTab>
168168
<Title>

acsell/settings.gradle

Lines changed: 4 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,10 @@
1-
/**
2-
* This file performs the following 2 operations:
3-
*
4-
* Setup source sets as projects to correct inconsistent classpaths
5-
* across IDEs and Gradle. From "extraSourceSets" property.
6-
*
7-
* Parse this project's build.gradle for dependencies in group "us.ihmc"
8-
* and recursively search for those builds on disk and include them as
9-
* composite builds.
10-
*
11-
* This file is needed until Gradle implements the following features:
12-
* - Allow nested composite builds (https://github.com/gradle/gradle/issues/1909)
13-
*
14-
* THIS FILE IS AUTO-GENERATED BY THE IHMC BUILD GRADLE PLUGIN
15-
* To disable auto-generation, set "disableSettingsGeneration = true"
16-
* in the gradle.properties file.
17-
*
18-
* Required properties:
19-
*
20-
* hyphenatedName = your-project-hyphenated
21-
* pascalCasedName = YourProjectPascalCased
22-
* extraSourceSets = [] (ex. ["test", "visualizers"]
23-
* publishMode = SNAPSHOT (default)
24-
* depthFromWorkspaceDirectory = 1 (default)
25-
* includeBuildsFromWorkspace = true (default)
26-
* excludeFromCompositeBuild = false (default)
27-
*
28-
* Optional properties:
29-
*
30-
* useLegacySourceSets = false (does not work yet)
31-
*/
32-
331
buildscript {
342
repositories {
353
maven { url "https://plugins.gradle.org/m2/" }
364
mavenLocal()
375
}
386
dependencies {
39-
classpath "gradle.plugin.us.ihmc:ihmc-build:0.9.5"
7+
classpath "us.ihmc:ihmc-build:0.12.1"
408
}
419
}
4210

@@ -46,11 +14,6 @@ import us.ihmc.build.IHMCSettingsConfigurator
4614
* Browse source at https://github.com/ihmcrobotics/ihmc-build
4715
*/
4816
def ihmcSettingsConfigurator = new IHMCSettingsConfigurator(settings, logger, ext)
49-
ihmcSettingsConfigurator.checkRequiredPropertiesAreSet() // Give friendly errors for unset properties
50-
ihmcSettingsConfigurator.configureProjectName(hyphenatedName) // rootProject.name = hyphenatedName
51-
ihmcSettingsConfigurator.configureExtraSourceSets(extraSourceSets) // Setup source sets to be multi-project subprojects
52-
53-
if (Boolean.valueOf(includeBuildsFromWorkspace))
54-
{
55-
ihmcSettingsConfigurator.findAndIncludeCompositeBuilds() // Search workspace and `includeBuild` matches
56-
}
17+
ihmcSettingsConfigurator.checkRequiredPropertiesAreSet()
18+
ihmcSettingsConfigurator.configureExtraSourceSets()
19+
ihmcSettingsConfigurator.findAndIncludeCompositeBuilds()

0 commit comments

Comments
 (0)