Index: firmware/App/Drivers/Battery.c
===================================================================
diff -u -r46b163d19c65e8c21db7b0247bbb1af0dba1ece5 -r9a96522e0a94724a13c2c9c8f60cf8d18ebde218
--- firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision 46b163d19c65e8c21db7b0247bbb1af0dba1ece5)
+++ firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision 9a96522e0a94724a13c2c9c8f60cf8d18ebde218)
@@ -56,7 +56,7 @@
 // ********** private data **********
 
 static U16 batteryStatus = 0;                                               ///< Battery current status.
-static U32 batteryRelStateOfCharge_pct;                                     ///< Battery pack relative state of charge.
+static U32 batteryRelStateOfCharge_pct = 0;                                 ///< Battery pack relative state of charge.
 static OVERRIDE_F32_T batteryRemCapacity_mAh = { 0.0, 0.0, 0.0, 0 };        ///< Battery pack remaining capacity (in mAh).
 static U16 batteryPackStatus = 0;                                           ///< Battery pack current status.
 static U32 lastBatteryMonitorTime = 0;                                      ///< Previous battery monitor time.
@@ -143,9 +143,9 @@
         {
             hasBatteryChargerStatus = FALSE;
 
-            if ( TRUE == getBatteryData( BATTERY_PACK_SLAVE_ADDRESS, BATTERY_PACK_REL_STATE_OF_CHARGE_CMD, &relStateOfCharge_pct ) )
+            if ( TRUE == getBatteryData( BATTERY_PACK_SLAVE_ADDRESS, BATTERY_PACK_REM_CAPACITY_CMD, &remCapacity_mAh ) )
             {
-                batteryRelStateOfCharge_pct = (U32)relStateOfCharge_pct;
+                batteryRemCapacity_mAh.data = (F32)remCapacity_mAh * BATTERY_MAH_2_MWH_FACTOR;
             }
 
             if ( TRUE == getBatteryData( BATTERY_PACK_SLAVE_ADDRESS, BATTERY_PACK_REM_CAPACITY_CMD, &remCapacity_mAh ) )