Index: firmware/App/Drivers/Battery.c
===================================================================
diff -u -r315969d00060073e112c4619946c13a61f68bcbd -r84bb8663dae71170e1743a2bed37b0aa47465b47
--- firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision 315969d00060073e112c4619946c13a61f68bcbd)
+++ firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision 84bb8663dae71170e1743a2bed37b0aa47465b47)
@@ -83,7 +83,6 @@
     {
         lastBatteryMonitorTime = getMSTimerCount();
 
-#ifndef DISABLE_BATT_COMM
         if ( FALSE == hasBatteryChargerStatus )
         {
             hasBatteryChargerStatus = TRUE;
@@ -96,7 +95,10 @@
                     {
                         if ( ++lostACPowerPersistentCount > AC_POWER_LOST_PERSISTENT_COUNT )
                         {
+
+#ifndef DISABLE_BATT_COMM
                             SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_AC_POWER_LOST, batteryStatus );
+#endif
                         }
                     }
                     else
@@ -115,7 +117,6 @@
                 getBatteryData( BATTERY_PACK_REL_STATE_OF_CHARGE_CMD, &batteryRelStateOfCharge_pct );
             }
         }
-#endif
     }
 }
 
@@ -176,7 +177,9 @@
             else
             {
                 generateStopCondition();
+#ifndef DISABLE_BATT_COMM
                 SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_BATTERY_COMM_FAULT, slaveAddr );
+#endif
             }
         }