Index: firmware/App/Drivers/Battery.c
===================================================================
diff -u -rb94b9b2eef71c1fae4d9a3320a13ef81d5790aac -re319bb5b8fd8a5320c0bb30986764f9b8f3c0814
--- firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision b94b9b2eef71c1fae4d9a3320a13ef81d5790aac)
+++ firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision e319bb5b8fd8a5320c0bb30986764f9b8f3c0814)
@@ -38,7 +38,7 @@
 #define BATTERY_PACK_ERROR_BITS                     0x0F                    ///< Error codes are in the first byte.
 #define BATTERY_PACK_MIN_CHARGE_PCT                 50                      ///< Minimum battery pack state of charge in percentage.
 
-#define BATTERY_COMM_TIME_OUT_MS                    1                       ///< Battery communication time out in ms.
+#define BATTERY_COMM_TIME_OUT_MS                    2                       ///< Battery communication time out in ms.
 #define BATTERY_MONITOR_INTERVAL_MS                 250                     ///< Battery monitor interval in ms.
 //#define BATTERY_MONITOR_INTERVAL_MS                 10000                     ///< Battery monitor interval in ms. - TODO+ Remove for TEST ONLY DN-30SEPT2022
 #define AC_POWER_LOST_PERSISTENT_COUNT              3                       ///< AC power lost persistent count before alarming.
@@ -653,9 +653,7 @@
  *************************************************************************/
 static void publishBatteryManagementData( void )
 {
-
     broadcastData( MSG_ID_HD_BATTERY_MANAGEMENT_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&BatteryManagerData, sizeof( BATTERY_MANAGER_PAYLOAD_T ) );
-
 }
 
 /*********************************************************************//**
@@ -667,9 +665,8 @@
  *************************************************************************/
 static void publishBatteryStatusData( void )
 {
-
+    BatteryStatusData.RemainingCapacity = (U32)getBatteryRemainingCapacity_mWh();
     broadcastData( MSG_ID_HD_BATTERY_STATUS_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&BatteryStatusData, sizeof( BATTERY_STATUS_PAYLOAD_T ) );
-
 }
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
@@ -685,7 +682,7 @@
  * @param value override battery remaining percent
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-BOOL testSetBatteryRemainingPercentOverride( U32 value )  // TODO - rename to capacity (instead of percent) + messaging + Dialin    // TODO - add override of broadcast interval    // TODO - broadcast battery data
+BOOL testSetBatteryRemainingPercentOverride( F32 value )  // TODO - rename to capacity (instead of percent) + messaging + Dialin    // TODO - add override of broadcast interval    // TODO - broadcast battery data
 {
     BOOL result = FALSE;