Index: firmware/App/Controllers/DrainPump.c
===================================================================
diff -u -r9f25f22ef6cd3566f8f7fbbc5c037a69e7f9411b -rbbf1e3736be03a4f041ace57e0f95e23caf472dd
--- firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision 9f25f22ef6cd3566f8f7fbbc5c037a69e7f9411b)
+++ firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision bbf1e3736be03a4f041ace57e0f95e23caf472dd)
@@ -213,6 +213,7 @@
     DRAIN_PUMP_STATE_T result = DRAIN_PUMP_OFF_STATE;
 
 #ifdef DEBUG_ENABLED
+#ifdef ENABLE_DIP_SWITCHES
     // TODO - test code - remove later
     if ( GET_DIP_SW2_TEST() )
     {
@@ -222,6 +223,7 @@
         setDrainPumpTargetSpeed( 1000 );
     }
 #endif
+#endif
 
     // if we've been given a pressure, transition to control to target state
     if ( getTargetDrainPumpSpeed() > 0 )
@@ -271,6 +273,7 @@
     }
 
 #ifdef DEBUG_ENABLED
+#ifdef ENABLE_DIP_SWITCHES
     // TODO - test code - remove later
     if ( !GET_DIP_SW2_TEST() )
     {
@@ -281,6 +284,7 @@
         result = DRAIN_PUMP_OFF_STATE;
     }
 #endif
+#endif
 
     return result;
 }