Index: firmware/App/Modes/ModeFault.c
===================================================================
diff -u -r8bd1ae47aa13a843aa8abd6321ddc050deacb4a6 -rc137d3c7cb17b0364d745e10ff6dbd1901eb1baa
--- firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision 8bd1ae47aa13a843aa8abd6321ddc050deacb4a6)
+++ firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision c137d3c7cb17b0364d745e10ff6dbd1901eb1baa)
@@ -35,6 +35,9 @@
 
 // ********** private data **********
 
+// TODO expand this later
+static HD_FAULT_STATE_T faultState = HD_FAULT_STATE_START;          ///< Currently active fault state.
+
 // ********** private function prototypes **********
 
 /*********************************************************************//**
@@ -54,9 +57,9 @@
  * The transitionToFaultMode function prepares for transition to fault mode.
  * @details Inputs: none
  * @details Outputs:
- * @return none
+ * @return initial state
  *************************************************************************/
-void transitionToFaultMode( void )
+U32 transitionToFaultMode( void )
 {
     HD_OP_MODE_T previousOpMode = getPreviousOperationMode();
 
@@ -77,6 +80,8 @@
         collectTreatmentLogData();
         sendTreatmentLogDataToUI();
     }
+
+    return faultState;
 }
 
 /*********************************************************************//**
@@ -96,8 +101,7 @@
     signalDialInPumpHardStop();
     signalDialOutPumpHardStop();
     stopSyringePump();
-    // Request trimmer heater turned off
-    cmdStopDGTrimmerHeater();
+
     // Ensure all valves are in safe position
     setValveAirTrap( STATE_CLOSED );
     setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
@@ -155,7 +159,7 @@
     button_state = stop;
 #endif
 
-    return 0;  // Fault mode has no sub-modes
+    return faultState;  // TODO expand the states later
 }
 
 /*********************************************************************//**