Merge branch 'master' of https://github.com/fkanehiro/openhrp3

fkanehiro · Feb 8, 2015 · 2ed9f0e · 2ed9f0e
2 parents d76926a + cf813a1
commit 2ed9f0e
Show file tree

Hide file tree

Showing 45 changed files with 101,993 additions and 0 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -567,5 +567,9 @@ if(need_catkin OR "${CATKIN_BUILD_BINARY_PACKAGE}")
   install(CODE "execute_process(COMMAND cmake -E create_symlink ../../bin/openhrp-model-loader openhrp-model-loader WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/share/openhrp3)")
   install(CODE "execute_process(COMMAND cmake -E create_symlink ../../bin/export-collada       export-collada       WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/lib/openhrp3)")
   install(CODE "execute_process(COMMAND cmake -E create_symlink ../../bin/export-collada       export-collada       WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/share/openhrp3)")
+  install(CODE "
+execute_process(COMMAND cmake -E make_directory share WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/share/openhrp3)
+execute_process(COMMAND cmake -E create_symlink ../../OpenHRP-3.1 share/OpenHRP-3.1 WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/share/openhrp3)
+")
 endif()
 
diff --git a/GrxUIonEclipse-project-0.9.8/OpenRTM-aist-0.4.1.jar b/GrxUIonEclipse-project-0.9.8/OpenRTM-aist-0.4.1.jar
diff --git a/GrxUIonEclipse-project-0.9.8/OpenRTM-aist-1.0.0.jar b/GrxUIonEclipse-project-0.9.8/OpenRTM-aist-1.0.0.jar
diff --git a/GrxUIonEclipse-project-0.9.8/OpenRTM-aist-1.1.0.jar b/GrxUIonEclipse-project-0.9.8/OpenRTM-aist-1.1.0.jar
diff --git a/GrxUIonEclipse-project-0.9.8/commons-cli-1.1.jar b/GrxUIonEclipse-project-0.9.8/commons-cli-1.1.jar
diff --git a/GrxUIonEclipse-project-0.9.8/jmf-2_1_1e-alljava/JMF-2.1.1e/lib/customizer.jar b/GrxUIonEclipse-project-0.9.8/jmf-2_1_1e-alljava/JMF-2.1.1e/lib/customizer.jar
diff --git a/GrxUIonEclipse-project-0.9.8/jmf-2_1_1e-alljava/JMF-2.1.1e/lib/jmf.jar b/GrxUIonEclipse-project-0.9.8/jmf-2_1_1e-alljava/JMF-2.1.1e/lib/jmf.jar
diff --git a/GrxUIonEclipse-project-0.9.8/jmf-2_1_1e-alljava/JMF-2.1.1e/lib/mediaplayer.jar b/GrxUIonEclipse-project-0.9.8/jmf-2_1_1e-alljava/JMF-2.1.1e/lib/mediaplayer.jar
diff --git a/GrxUIonEclipse-project-0.9.8/jmf-2_1_1e-alljava/JMF-2.1.1e/lib/multiplayer.jar b/GrxUIonEclipse-project-0.9.8/jmf-2_1_1e-alljava/JMF-2.1.1e/lib/multiplayer.jar
diff --git a/GrxUIonEclipse-project-0.9.8/plugins/Eclipse3.4_RTM1.0/com.generalrobotix.ui.grxui_0.9.8.jar b/GrxUIonEclipse-project-0.9.8/plugins/Eclipse3.4_RTM1.0/com.generalrobotix.ui.grxui_0.9.8.jar
diff --git a/...lipse-project-0.9.8/plugins/Eclipse3.4_RTM1.1_LINUX/com.generalrobotix.ui.grxui_0.9.8.jar b/...lipse-project-0.9.8/plugins/Eclipse3.4_RTM1.1_LINUX/com.generalrobotix.ui.grxui_0.9.8.jar
diff --git a/...pse-project-0.9.8/plugins/Eclipse3.4_RTM1.1_WINDOWS/com.generalrobotix.ui.grxui_0.9.8.jar b/...pse-project-0.9.8/plugins/Eclipse3.4_RTM1.1_WINDOWS/com.generalrobotix.ui.grxui_0.9.8.jar
diff --git a/java/plugins/com.generalrobotix.ui.grxui_0.9.8.jar b/java/plugins/com.generalrobotix.ui.grxui_0.9.8.jar
diff --git a/java/plugins/jp.go.aist.hrp.joystick_1.0.0.jar b/java/plugins/jp.go.aist.hrp.joystick_1.0.0.jar
diff --git a/sample/JoystickControl/JoystickComponent-project.zip b/sample/JoystickControl/JoystickComponent-project.zip
diff --git a/sample/JoystickControl/JoystickComponent-project/OpenRTM-aist-1.0.0.jar b/sample/JoystickControl/JoystickComponent-project/OpenRTM-aist-1.0.0.jar
diff --git a/sample/JoystickControl/JoystickComponent-project/OpenRTM-aist-1.1.0.jar b/sample/JoystickControl/JoystickComponent-project/OpenRTM-aist-1.1.0.jar
diff --git a/sample/JoystickControl/JoystickComponent-project/commons-cli-1.1.jar b/sample/JoystickControl/JoystickComponent-project/commons-cli-1.1.jar
diff --git a/sample/JoystickControl/JoystickComponent-project/openhrpstubskel.jar b/sample/JoystickControl/JoystickComponent-project/openhrpstubskel.jar
diff --git a/sample/controller/PA10Controller/etc/PDgain.dat b/sample/controller/PA10Controller/etc/PDgain.dat
@@ -0,0 +1,11 @@
+35000 400
+35000 400
+35000 400
+35000 400
+35000 400
+35000 400
+35000 400
+17000 200
+17000 200
+
+
diff --git a/sample/controller/PA10Controller/etc/angle.dat b/sample/controller/PA10Controller/etc/angle.dat
diff --git a/sample/controller/PA10Controller/etc/vel.dat b/sample/controller/PA10Controller/etc/vel.dat
-Original file line number
+Diff line change
@@ -0,0 +1,11 @@
+400
+400
+400
+400
+400
+400
+400
+200
+200