Index: firmware/App/Drivers/Battery.c
===================================================================
diff -u -r7690b677a3870da643e67bd622d3b342dfac0040 -r9102fd9cf9dae963dcd9e4a55bad5431d3e69b52
--- firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision 7690b677a3870da643e67bd622d3b342dfac0040)
+++ firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision 9102fd9cf9dae963dcd9e4a55bad5431d3e69b52)
@@ -125,11 +125,19 @@
         {
             hasBatteryChargerStatus = FALSE;
 
+            if ( TRUE == getBatteryData( BATTERY_PACK_SLAVE_ADDRESS, BATTERY_PACK_REL_STATE_OF_CHARGE_CMD, &batteryRelStateOfCharge_pct ) )
+            {
+                if ( ( SELF_TEST_STATUS_IN_PROGRESS == batteryTestStatus ) && ( batteryRelStateOfCharge_pct < BATTERY_PACK_MIN_CHARGE_PCT ) )
+                {
+                    SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_BATTERY_PACK_CHARGE_TOO_LOW, batteryRelStateOfCharge_pct );
+                }
+            }
+
             if ( TRUE == getBatteryData( BATTERY_PACK_SLAVE_ADDRESS, BATTERY_PACK_STATUS_CMD, &batteryPackStatus ) )
             {
                 if ( 0 != batteryPackStatus )
                 {
-                    SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_AC_POWER_LOST, batteryPackStatus );
+                    SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_BATTERY_PACK_ERROR_DETECTED, batteryPackStatus );
                 }
             }
         }
@@ -145,18 +153,15 @@
  *************************************************************************/
 SELF_TEST_STATUS_T execBatteryTest( void )
 {
-    if ( TRUE == getBatteryData( BATTERY_PACK_SLAVE_ADDRESS, BATTERY_PACK_REL_STATE_OF_CHARGE_CMD, &batteryRelStateOfCharge_pct ) )
+#ifndef DISABLE_BATT_COMM
+    if ( batteryRelStateOfCharge_pct > BATTERY_PACK_MIN_CHARGE_PCT )
     {
-        if ( batteryRelStateOfCharge_pct < BATTERY_PACK_MIN_CHARGE_PCT )
-        {
-            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_BATTERY_PACK_CHARGE_TOO_LOW, batteryRelStateOfCharge_pct );
-        }
-        else
-        {
-            clearAlarmCondition( ALARM_ID_HD_BATTERY_PACK_CHARGE_TOO_LOW );
-            batteryTestStatus = SELF_TEST_STATUS_PASSED;
-        }
+        clearAlarmCondition( ALARM_ID_HD_BATTERY_PACK_CHARGE_TOO_LOW );
+        batteryTestStatus = SELF_TEST_STATUS_PASSED;
     }
+#else
+    batteryTestStatus = SELF_TEST_STATUS_PASSED;
+#endif
 
     return batteryTestStatus;
 }