Merge branch 'release/0.9.0'

Doug Stephen · Doug Stephen · commit 2d995eb8ccb6 · 2017-02-09T12:30:02.000-06:00
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) {

Original file line number	Diff line number	Diff line change
`@@ -922,9 +922,9 @@ public String[] getJointsToIgnoreInController()`
`922`	`922`	`// jointToIgnoreList.add(forcedSideJointNames[ValkyrieOrderedJointMap.UpperNeckPitch]);`
`923`	`923`	`// jointToIgnoreList.add(forcedSideJointNames[ValkyrieOrderedJointMap.LowerNeckPitch]);`
`924`	`924`	`// jointToIgnoreList.add(forcedSideJointNames[ValkyrieOrderedJointMap.NeckYaw]);`
`925`		`- jointToIgnoreList.add(forcedSideJointNames[ValkyrieOrderedJointMap.LeftForearmYaw]);`
`926`		`- jointToIgnoreList.add(forcedSideJointNames[ValkyrieOrderedJointMap.LeftWristRoll]);`
`927`		`- jointToIgnoreList.add(forcedSideJointNames[ValkyrieOrderedJointMap.LeftWristPitch]);`
	`925`	`+// jointToIgnoreList.add(forcedSideJointNames[ValkyrieOrderedJointMap.LeftForearmYaw]);`
	`926`	`+// jointToIgnoreList.add(forcedSideJointNames[ValkyrieOrderedJointMap.LeftWristRoll]);`
	`927`	`+// jointToIgnoreList.add(forcedSideJointNames[ValkyrieOrderedJointMap.LeftWristPitch]);`
`928`	`928`	`}`
`929`	`929`	`}`
`930`	`930`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ task performRelease(type: GradleBuild) {`
`60`	`60`	`}`
`61`	`61`	`buildFile "build.gradle"`
`62`	`62`	`startParameter gradle.startParameter`
`63`		`- tasks = ["bintrayUpload", ":IHCMRobotDataLogger:publishLoggerDistributionToBintray"]`
	`63`	`+ tasks = ["bintrayUpload", ":IHMCRobotDataLogger:publishLoggerDistributionToBintray"]`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`task publishAllToMavenLocal(type: GradleBuild) {`