Index: firmware/App/Drivers/Battery.c
===================================================================
diff -u -r2f7a113997b027a896f60ab6097760e1696b6fd7 -rf89aad3a752a491792bbb1c091b3465665576189
--- firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision 2f7a113997b027a896f60ab6097760e1696b6fd7)
+++ firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision f89aad3a752a491792bbb1c091b3465665576189)
@@ -152,7 +152,7 @@
 static F32 getBatteryRemainingCapacity_mWh( void );
 static U32 getBatteryStatus( void );
 static U32 getBatteryChargerStatus( void );
-static U32 getI2CStatusRegister( void )
+static U32 getI2CStatusRegister( void );
 static void setupI2CDriver( void );
 static BOOL waitForTxReady( void );
 static BOOL waitForRxReady( void );
@@ -254,6 +254,8 @@
     {
         result = batteryI2CStatusRegister.ovData;
     }
+
+    return result;
 }
 
 /*********************************************************************//**
@@ -706,7 +708,7 @@
             if ( TRUE == getBatteryData( BATTERY_CHARGER_SLAVE_ADDRESS, BATTERY_CHARGER_STATUS_CMD, &BatteryStatusData.BatteryChargerStatus ) )
             {   // If A/C not present, trigger A/C lost alarm
                 batteryChargerStatus.data = BatteryStatusData.BatteryChargerStatus;
-                if ( 0 == ( BatteryStatusData.BatteryChargerStatus & BATTERY_CHARGER_STATUS_AC_PRESENT_MASK ) )
+                if ( 0 == ( getBatteryChargerStatus() & BATTERY_CHARGER_STATUS_AC_PRESENT_MASK ) )
                 {
                     // Pre-Treatment, Treatment, or Post-Treatment mode
                     if ( opMode == MODE_PRET || opMode == MODE_TREA || opMode == MODE_POST )
@@ -768,7 +770,7 @@
     batteryStatusData.BatteryChargerStatus = getBatteryChargerStatus();
     batteryStatusData.BatteryI2CStatus = getI2CStatusRegister();
 
-    broadcastData( MSG_ID_HD_BATTERY_STATUS_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&payload, sizeof( BATTERY_STATUS_PAYLOAD_T ) );
+    broadcastData( MSG_ID_HD_BATTERY_STATUS_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&batteryStatusData, sizeof( BATTERY_STATUS_PAYLOAD_T ) );
 }