Index: firmware/App/Tasks/TaskBG.c
===================================================================
diff -u -r6419179374edcd65da462de84e8aeaefb7e20320 -r8bd1ae47aa13a843aa8abd6321ddc050deacb4a6
--- firmware/App/Tasks/TaskBG.c	(.../TaskBG.c)	(revision 6419179374edcd65da462de84e8aeaefb7e20320)
+++ firmware/App/Tasks/TaskBG.c	(.../TaskBG.c)	(revision 8bd1ae47aa13a843aa8abd6321ddc050deacb4a6)
@@ -1,27 +1,29 @@
 /**************************************************************************
 *
-* 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 "Battery.h"
+#include "Buttons.h"
 #include "HDCommon.h"
 #include "NVDataMgmt.h"
 #include "SafetyShutdown.h"
 #include "SystemComm.h"
 #include "TaskTimer.h"
-#include "Timers.h"
+#include "Timers.h"
+#include "Voltages.h"
 #include "WatchdogMgmt.h"
 
 /**
@@ -31,7 +33,7 @@
 
 // ********** private definitions **********
 
-#define MAX_TIME_FOR_UI_TO_COMMUNICATE_MS       30000               ///< Maximum time we wait for UI to communicate after power up (30 seconds).
+#define MAX_TIME_FOR_UI_TO_COMMUNICATE_MS       40000               ///< Maximum time we wait for UI to communicate after power up (40 seconds).
 
 // ********** private data **********
 
@@ -59,13 +61,14 @@
         if ( FALSE == uiCommunicated() )
         {
 #ifndef BOARD_WITH_NO_HARDWARE
-#ifndef SIMULATE_UI
+#ifndef SIMULATE_UI
+            // Check timeout waiting for UI to check in (via CAN) after startup.
             if ( TRUE == didTimeout( startUICommTimeout, MAX_TIME_FOR_UI_TO_COMMUNICATE_MS ) )
             {
                 activateAlarmNoData( ALARM_ID_UI_COMM_POST_FAILED );
-            }
+            }
 #endif
-#endif
+#endif
         }
 
         // Manage the watchdog