Index: firmware/App/Tasks/TaskBG.c
===================================================================
diff -u -r911f6526ec3ba03ba0131681c7fb371c0abda6bb -rccfd15568f1e3d304320c2babb2fd4bcf0413304
--- firmware/App/Tasks/TaskBG.c	(.../TaskBG.c)	(revision 911f6526ec3ba03ba0131681c7fb371c0abda6bb)
+++ firmware/App/Tasks/TaskBG.c	(.../TaskBG.c)	(revision ccfd15568f1e3d304320c2babb2fd4bcf0413304)
@@ -1,27 +1,28 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2021 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 TaskBG.c
+* @file    TaskBG.c
 *
-* @author (last) Sean Nash
-* @date (last) 24-Sep-2020
+* @author  (last)      Quang Nguyen
+* @date    (last)      06-Apr-2021
 *
-* @author (original) Dara Navaei
-* @date (original) 05-Nov-2019
+* @author  (original)  Dara Navaei
+* @date    (original)  05-Nov-2019
 *
 ***************************************************************************/
-
-#include <HDCommon.h>
+
+#include "Battery.h"
+#include "HDCommon.h"
 #include "NVDataMgmt.h"
 #include "SafetyShutdown.h"
 #include "SystemComm.h"
+#include "TaskTimer.h"
 #include "Timers.h"
 #include "WatchdogMgmt.h"
-#include "TaskTimer.h"
 
 /**
  *  @addtogroup TaskBackground
@@ -56,20 +57,25 @@
     {
         // Wait for UI to come up after power up
         if ( FALSE == uiCommunicated() )
-        {
+        {
+#ifndef BOARD_WITH_NO_HARDWARE
 #ifndef SIMULATE_UI
             if ( TRUE == didTimeout( startUICommTimeout, MAX_TIME_FOR_UI_TO_COMMUNICATE_MS ) )
             {
                 activateAlarmNoData( ALARM_ID_UI_COMM_POST_FAILED );
             }
+#endif
 #endif
         }
-
+
         // Manage the watchdog
         execWatchdogMgmt();
 
         // Manage Non-volatile data manager
-        execNVDataMgmt();
+        execNVDataMgmt();
+
+        // Monitor battery status
+        execBatteryMonitor();
     }
 }