Index: firmware/App/Modes/ModeFault.c
===================================================================
diff -u -rd91a24c730aeb5cd7e3eba9ef4eca78e442911f8 -r61153247029a9a246ca1beadc66d772e3e583e4e
--- firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision d91a24c730aeb5cd7e3eba9ef4eca78e442911f8)
+++ firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision 61153247029a9a246ca1beadc66d772e3e583e4e)
@@ -21,7 +21,7 @@
 #include "Buttons.h"
 #include "DialInFlow.h"
 #include "DialOutFlow.h"
-#include "FPGA.h"
+#include "Valves.h"
 #endif
 #include "OperationModes.h"
 #include "ModeFault.h"
@@ -57,9 +57,6 @@
  *************************************************************************/
 void transitionToFaultMode( void )
 {
-#ifdef EMC_TEST_BUILD     // TODO - test code
-    enableValvesPIDControl(0); // enable valves
-#endif
 }
 
 /*********************************************************************//**
@@ -85,10 +82,10 @@
             switch ( toggle )
             {
                 case 0: // pumps and valves off
-                    setDialyzerInletValvePosition( 0 );
-                    setDialyzerOutletValvePosition( 0 );
-                    setVenousBloodValvePosition( 0 );
-                    setArterialBloodValvePosition( 0 );
+                    setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
+                    setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
+                    setValvePosition( VBA, VALVE_POSITION_C_CLOSE );
+                    setValvePosition( VBV, VALVE_POSITION_C_CLOSE );
                     break;
 
                 case 1: // pumps on, valves off
@@ -98,10 +95,10 @@
                     break;
 
                 case 2: // pumps on, valves on
-                    setDialyzerInletValvePosition( 12000 );
-                    setDialyzerOutletValvePosition( 12000 );
-                    setVenousBloodValvePosition( 12000 );
-                    setArterialBloodValvePosition( 12000 );
+                    setValvePosition( VDI, VALVE_POSITION_B_OPEN );
+                    setValvePosition( VDO, VALVE_POSITION_B_OPEN );
+                    setValvePosition( VBA, VALVE_POSITION_B_OPEN );
+                    setValvePosition( VBV, VALVE_POSITION_B_OPEN );
                     break;
 
                 case 3: // pumps off, valves on
@@ -115,10 +112,10 @@
                     setBloodPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
                     setDialInPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
                     setDialOutPumpTargetRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-                    setDialyzerInletValvePosition( 0 );
-                    setDialyzerOutletValvePosition( 0 );
-                    setVenousBloodValvePosition( 0 );
-                    setArterialBloodValvePosition( 0 );
+                    setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
+                    setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
+                    setValvePosition( VBA, VALVE_POSITION_C_CLOSE );
+                    setValvePosition( VBV, VALVE_POSITION_C_CLOSE );
                     break;
             }
         }