Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -r8ff2c0f050380b2bab2f00eea71dcae546400bbc -rbbf1e3736be03a4f041ace57e0f95e23caf472dd
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 8ff2c0f050380b2bab2f00eea71dcae546400bbc)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision bbf1e3736be03a4f041ace57e0f95e23caf472dd)
@@ -235,12 +235,14 @@
     RO_PUMP_STATE_T result = RO_PUMP_OFF_STATE;
 
 #ifdef DEBUG_ENABLED
+#ifdef ENABLE_DIP_SWITCHES
     // TODO - test code - remove later
     if ( GET_DIP_SW0_TEST() )
     {
         setROPumpTargetPressure( 120, PUMP_CONTROL_MODE_CLOSED_LOOP );
     }
 #endif
+#endif
 
     // if we've been given a pressure, transition to control to target state
     if ( getTargetROPumpPressure() > 0 )
@@ -289,13 +291,15 @@
     }
 
 #ifdef DEBUG_ENABLED
+#ifdef ENABLE_DIP_SWITCHES
     // TODO - test code - remove later
     if ( !GET_DIP_SW0_TEST() )
     {
         signalROPumpHardStop();
         result = RO_PUMP_OFF_STATE;
     }
 #endif
+#endif
 
     return result;
 }