merges changes in tags/3.1.3(r476:HEAD)

git-svn-id: https://hrpsys-base.googlecode.com/svn/trunk@478 a991ac11-fb38-5095-8c12-a1ddb0715245
snozawa · Aug 27, 2012 · de14b4e · de14b4e
1 parent 467d69d
commit de14b4e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -22,6 +22,7 @@ set(input_files package.h utilities.h
  ../idl/DataLoggerService.idl
  ../idl/ExecutionProfileService.idl
  ../idl/ForwardKinematicsService.idl
+ ../idl/ImpedanceControllerService.idl
  ../idl/RobotHardwareService.idl
  ../idl/SequencePlayerService.idl
  ../idl/StateHolderService.idl

diff --git a/doc/package.h b/doc/package.h
@@ -24,6 +24,7 @@ To use python scripts to create RT components, connect ports and get/set propert
  <li>\ref DataLogger</li>
  <li>\ref ForwardKinematics</li>
  <li>\ref HGcontroller</li>
+ <li>\ref ImpedanceController</li>
  <li>\ref Joystick</li>
  <li>\ref Joystick2Velocity2D</li>
  <li>\ref Joystick2Velocity3D</li>
@@ -47,6 +48,7 @@ To use python scripts to create RT components, connect ports and get/set propert
  <li>\ref OpenHRP::DataLoggerService</li>
  <li>\ref OpenHRP::ExecutionProfileService</li>
  <li>\ref OpenHRP::ForwardKinematicsService</li>
+ <li>\ref OpenHRP::ImpedanceControllerService</li>
  <li>\ref OpenHRP::OGMap3DService</li>
  <li>\ref OpenHRP::RobotHardwareService</li>
  <li>\ref OpenHRP::SequencePlayerService</li>

diff --git a/idl/ImpedanceControllerService.idl b/idl/ImpedanceControllerService.idl
@@ -1,5 +1,5 @@
 /**
- * @file ImpedanceController.idl
+ * @file ImpedanceControllerService.idl
  * @brief Services for the impedance interface
  */
 module OpenHRP
@@ -26,14 +26,15 @@ module OpenHRP
 
 
  /**
- * @brief set impedance mode.
- * @param i_mode_ new impedance mode
+ * @brief set impedance parameters.
+ * @param i_param new impedance parameters
  * @return true if set successfully, false otherwise
  */
  boolean setImpedanceControllerParam(in impedanceParam i_param);
 
  /**
- * @brief remove impedance mode.
+ * @brief remove impedance parameters.
+ * @param name name of the impedance parameter set
  * @return true if set successfully, false otherwise
  */
  boolean deleteImpedanceController(in string name);

diff --git a/lib/io/iob.h b/lib/io/iob.h
@@ -634,7 +634,7 @@ extern "C"{
  * @brief initialize joint angle
  * @param name joint name, part name or "all"
  * @param option string of joint angle initialization
- * @param TRUE if initialized successfully, FALSE otherwise
+ * @return TRUE if initialized successfully, FALSE otherwise
  */
  int initializeJointAngle(const char *name, const char *option);
  //@}