Merge branch 'release/0.9.0'

ihmcrobotics · Feb 9, 2017 · 2d995eb · 2d995eb
2 parents 3efb1fe + 9d2b4b9
commit 2d995eb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Valkyrie/src/us/ihmc/valkyrie/parameters/ValkyrieWalkingControllerParameters.java b/Valkyrie/src/us/ihmc/valkyrie/parameters/ValkyrieWalkingControllerParameters.java
@@ -922,9 +922,9 @@ public String[] getJointsToIgnoreInController()
 //            jointToIgnoreList.add(forcedSideJointNames[ValkyrieOrderedJointMap.UpperNeckPitch]);
 //            jointToIgnoreList.add(forcedSideJointNames[ValkyrieOrderedJointMap.LowerNeckPitch]);
 //            jointToIgnoreList.add(forcedSideJointNames[ValkyrieOrderedJointMap.NeckYaw]);
-            jointToIgnoreList.add(forcedSideJointNames[ValkyrieOrderedJointMap.LeftForearmYaw]);
-            jointToIgnoreList.add(forcedSideJointNames[ValkyrieOrderedJointMap.LeftWristRoll]);
-            jointToIgnoreList.add(forcedSideJointNames[ValkyrieOrderedJointMap.LeftWristPitch]);
+//            jointToIgnoreList.add(forcedSideJointNames[ValkyrieOrderedJointMap.LeftForearmYaw]);
+//            jointToIgnoreList.add(forcedSideJointNames[ValkyrieOrderedJointMap.LeftWristRoll]);
+//            jointToIgnoreList.add(forcedSideJointNames[ValkyrieOrderedJointMap.LeftWristPitch]);
          }
       }
 

diff --git a/build.gradle b/build.gradle
@@ -60,7 +60,7 @@ task performRelease(type: GradleBuild) {
    }
    buildFile "build.gradle"
    startParameter gradle.startParameter
-   tasks = ["bintrayUpload", ":IHCMRobotDataLogger:publishLoggerDistributionToBintray"]
+   tasks = ["bintrayUpload", ":IHMCRobotDataLogger:publishLoggerDistributionToBintray"]
 }
 
 task publishAllToMavenLocal(type: GradleBuild) {