adds the third argument to read_power of iob.h

fkanehiro · Apr 18, 2015 · 47cf360 · k-okada · Apr 19, 2015 · k-okada
1 parent 4bc5fe5
commit 47cf360
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/lib/io/iob.cpp b/lib/io/iob.cpp
@@ -562,10 +562,11 @@ int number_of_substeps()
     return 5;
 }
 
-int read_power(double *voltage, double *current)
+int read_power(double *voltage, double *current, double *battery)
 {
     *voltage = ((double)random()-RAND_MAX/2)/(RAND_MAX/2)*1+48;
     *current = ((double)random()-RAND_MAX/2)/(RAND_MAX/2)*0.5+1;
+    *battery = ((double)random()-RAND_MAX/2)/(RAND_MAX/2)*0.5+50;
     return TRUE;
 }
 

diff --git a/lib/io/iob.h b/lib/io/iob.h
@@ -572,9 +572,10 @@ extern "C"{
      * @brief		read status of power source
      * @param v		voltage[V]
      * @param a		current[A]
+     * @param b		remaining battery level[%]
      * @return		TRUE or FALSE
      */
-    int read_power(double *v, double *a);
+    int read_power(double *v, double *a, double *b);
     //@}
 
     /**

diff --git a/rtc/RobotHardware/RobotHardwareService_impl.cpp b/rtc/RobotHardware/RobotHardwareService_impl.cpp
@@ -68,7 +68,7 @@ void RobotHardwareService_impl::getStatus(OpenHRP::RobotHardwareService::RobotSt
         m_robot->readForceSensor(i, rs->force[i].get_buffer());
     }
 
-    m_robot->readPowerStatus(rs->voltage, rs->current);
+    m_robot->readPowerStatus(rs->voltage, rs->current, rs->battery);
 }
 
 CORBA::Boolean RobotHardwareService_impl::power(const char* jname, OpenHRP::RobotHardwareService::SwitchStatus ss)

diff --git a/rtc/RobotHardware/robot.cpp b/rtc/RobotHardware/robot.cpp
@@ -459,9 +459,9 @@ void robot::writeVelocityCommands(const double *i_commands)
     write_command_velocities(i_commands);
 }
 
-void robot::readPowerStatus(double &o_voltage, double &o_current)
+void robot::readPowerStatus(double &o_voltage, double &o_current, double &o_battery)
 {
-    read_power(&o_voltage, &o_current);
+    read_power(&o_voltage, &o_current, &o_battery);
 }
 
 int robot::readCalibState(int i)

diff --git a/rtc/RobotHardware/robot.h b/rtc/RobotHardware/robot.h
@@ -127,8 +127,9 @@ class robot : public hrp::Body
        \brief read voltage and current of the robot power source
        \param o_voltage voltage
        \param o_current current
+       \param o_battery remaining battery level
      */
-    void readPowerStatus(double &o_voltage, double &o_current);
+    void readPowerStatus(double &o_voltage, double &o_current, double &o_battery);
 
     /**
        \brief read array of all joint angles[rad]