Index: firmware/App/Drivers/Battery.c
===================================================================
diff -u -r885cb03f6618d6556a53e834691f2e050ba90593 -r098272da7396d05816a266142e7a34b40f4d93d3
--- firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision 885cb03f6618d6556a53e834691f2e050ba90593)
+++ firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision 098272da7396d05816a266142e7a34b40f4d93d3)
@@ -1,17 +1,17 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2021-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
-* @file Battery.c
+* @file    Battery.c
 *
-* @author (last) Quang Nguyen
-* @date (last) 24-Feb-2021
+* @author  (last)      Dara Navaei
+* @date    (last)      24-May-2022
 *
-* @author (original) Quang Nguyen
-* @date (original) 24-Feb-2021
+* @author  (original)  Quang Nguyen
+* @date    (original)  24-Feb-2021
 *
 ***************************************************************************/
 
@@ -132,14 +132,6 @@
             if ( TRUE == getBatteryData( BATTERY_PACK_SLAVE_ADDRESS, BATTERY_PACK_REL_STATE_OF_CHARGE_CMD, &relStateOfCharge_pct ) )
             {
                 batteryRelStateOfCharge_pct.data = (U32)relStateOfCharge_pct;
-                if ( getBatteryRemainingPercent() < BATTERY_PACK_MIN_CHARGE_PCT )
-                {
-                    SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_BATTERY_PACK_CHARGE_TOO_LOW, getBatteryRemainingPercent() );
-                }
-                else
-                {
-                    clearAlarmCondition( ALARM_ID_HD_BATTERY_PACK_CHARGE_TOO_LOW );
-                }
             }
 
             if ( TRUE == getBatteryData( BATTERY_PACK_SLAVE_ADDRESS, BATTERY_PACK_STATUS_CMD, &batteryPackStatus ) )
@@ -338,15 +330,14 @@
             else
             {
                 generateStopCondition();
-                if ( commFaultPersistentCount++ > BATTERY_COMM_FAULT_PERSISTENTCE_COUNT )
+                if ( ++commFaultPersistentCount > BATTERY_COMM_FAULT_PERSISTENTCE_COUNT )
                 {
 #ifndef DISABLE_BATT_COMM
                     SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_BATTERY_COMM_FAULT, slaveAddr );
 #endif
                 }
             }
         }
-
     }
 
     if ( FALSE == result )