[Personalrobots-commit] SF.net SVN: personalrobots:[22698] pkg/trunk/stacks

[<rob...@us...>]

Revision: 22698
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=22698&view=rev
Author:   rob_wheeler
Date:     2009-08-24 16:44:08 +0000 (Mon, 24 Aug 2009)

Log Message:
-----------
add input voltage to power board state message

Modified Paths:
--------------
    pkg/trunk/stacks/pr2_common/pr2_msgs/msg/PowerBoardState.msg
    pkg/trunk/stacks/pr2_power_drivers/pr2_power_board/src/power_node/power_node.cpp

Modified: pkg/trunk/stacks/pr2_common/pr2_msgs/msg/PowerBoardState.msg
===================================================================
--- pkg/trunk/stacks/pr2_common/pr2_msgs/msg/PowerBoardState.msg	2009-08-24 16:17:18 UTC (rev 22697)
+++ pkg/trunk/stacks/pr2_common/pr2_msgs/msg/PowerBoardState.msg	2009-08-24 16:44:08 UTC (rev 22698)
@@ -2,6 +2,7 @@
 string name
 # Circuit States:
 #  STATE_NOPOWER, STATE_STANDBY, STATE_PUMPING, STATE_ON, STATE_DISABLED
+float64 input_voltage
 int8[3] circuit_state
 float64[3] circuit_voltage
 int8 run_stop

Modified: pkg/trunk/stacks/pr2_power_drivers/pr2_power_board/src/power_node/power_node.cpp
===================================================================
--- pkg/trunk/stacks/pr2_power_drivers/pr2_power_board/src/power_node/power_node.cpp	2009-08-24 16:17:18 UTC (rev 22697)
+++ pkg/trunk/stacks/pr2_power_drivers/pr2_power_board/src/power_node/power_node.cpp	2009-08-24 16:44:08 UTC (rev 22698)
@@ -843,6 +843,7 @@
 
       pr2_msgs::PowerBoardState state_msg;
       state_msg.name = stat.name;
+      state_msg.input_voltage = status->input_voltage;
       state_msg.circuit_voltage[0] = status->CB0_voltage;
       state_msg.circuit_voltage[1] = status->CB1_voltage;
       state_msg.circuit_voltage[2] = status->CB2_voltage;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.