Index: firmware/App/Modes/ModeFault.c
===================================================================
diff -u -rfd00681acd671946bfb1504d17b6414d6af9e0af -rdcd360fb4dc37db2dcbeb7fb14fb327fe68235f4
--- firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision fd00681acd671946bfb1504d17b6414d6af9e0af)
+++ firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision dcd360fb4dc37db2dcbeb7fb14fb327fe68235f4)
@@ -1,17 +1,17 @@
 /**************************************************************************
 *
-* 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 ModeFault.c
+* @file    ModeFault.c
 *
-* @author (last) Quang Nguyen
-* @date (last) 24-Aug-2020
+* @author  (last)      Dara Navaei
+* @date    (last)      24-Oct-2021
 *
-* @author (original) Dara Navaei
-* @date (original) 05-Nov-2019
+* @author  (original)  Dara Navaei
+* @date    (original)  05-Nov-2019
 *
 ***************************************************************************/
 
@@ -57,18 +57,22 @@
  * The transitionToFaultMode function prepares for transition to fault mode.
  * @details Inputs: none
  * @details Outputs: none
- * @return none
+ * @return initial state
  *************************************************************************/
-void transitionToFaultMode( void )
+U32 transitionToFaultMode( void )
 {
     deenergizeActuators();
 
+    initFaultMode();
+
     // Publish POST failure status to UI if fault triggered in Init/POST mode
     if ( DG_MODE_INIT == getPreviousOperationMode() )
     {
         // Broadcast final POST failed
         sendPOSTFinalResult( FALSE );
     }
+
+    return faultState;
 }
 
 /*********************************************************************//**
@@ -141,8 +145,8 @@
     requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB );
     signalROPumpHardStop();
     signalDrainPumpHardStop();
-    stopPrimaryHeater();
-    stopTrimmerHeater();
+    stopHeater( DG_PRIMARY_HEATER );
+    stopHeater( DG_TRIMMER_HEATER );
 }
 
 /**@}*/