Index: firmware/App/Controllers/DrainPump.c
===================================================================
diff -u -rab6ac1bb140201e5737d594b3456038ea9e4725f -r431de35ec5d48cbcd7f6fdf9b1586616d7ac3c05
--- firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision ab6ac1bb140201e5737d594b3456038ea9e4725f)
+++ firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision 431de35ec5d48cbcd7f6fdf9b1586616d7ac3c05)
@@ -29,6 +29,7 @@
 #include "TaskGeneral.h"
 #include "TaskPriority.h"
 #include "Timers.h"
+#include "Valves.h"
 #include "DrainPump.h"
 
 /**
@@ -211,7 +212,9 @@
     // TODO - test code - remove later
     if ( GET_DIP_SW2_TEST() )
     {
-        setFPGAValveStates( 0x014F ); // TODO - test code - remove later
+        setValveState( VPI, VALVE_STATE_OPEN );
+        setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
+        setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
         setDrainPumpTargetSpeed( 1000 );
     }
 #endif
@@ -268,7 +271,9 @@
     if ( !GET_DIP_SW2_TEST() )
     {
         signalDrainPumpHardStop();
-        setFPGAValveStates( 0x015F ); // TODO - test code - remove later
+        setValveState( VPI, VALVE_STATE_OPEN );
+        setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
+        setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );
         result = DRAIN_PUMP_OFF_STATE;
     }
 #endif