Index: firmware/App/Controllers/DialysatePumps.c
===================================================================
diff -u -r5e92cbb2c29854fb60a91dc4abafeb9b08d3272c -r5126b79e4970ffe2ed9db4cccea18a1216c78570
--- firmware/App/Controllers/DialysatePumps.c	(.../DialysatePumps.c)	(revision 5e92cbb2c29854fb60a91dc4abafeb9b08d3272c)
+++ firmware/App/Controllers/DialysatePumps.c	(.../DialysatePumps.c)	(revision 5126b79e4970ffe2ed9db4cccea18a1216c78570)
@@ -39,17 +39,8 @@
  */
 
 // ********** private definitions **********
-#ifndef __OPENSPDTEST__
 #define DIALYSATE_PUMP_DATA_PUB_INTERVAL                    ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL )              ///< Interval (ms/task time) at which the dialysate pump data is published on the CAN bus.
-#else
-#define DIALYSATE_PUMP_DATA_PUB_INTERVAL                    ( 50 / TASK_PRIORITY_INTERVAL )                         ///< Interval (ms/task time) at which the dialysate pump data is published on the CAN bus.
-#endif
 #define DATA_PUBLISH_COUNTER_START_COUNT                    60                                                      ///< Data publish counter start count.
-#ifdef __OPENSPDTEST__
-#define DIALYSATE_PUMP_EXEC_INTERVAL                        ( 2000 / TASK_GENERAL_INTERVAL )
-#define DIALYSATE_PUMP_SPEED_INCREMENT                      200.0F                                                   ///< Speed increase when controlling dialysate pump to target step speed.
-#endif
-
 #define DP_CONTROL_INTERVAL                                 ( 1000 / TASK_GENERAL_INTERVAL )                        ///< Interval (ms/task time) at which the dialysate pump is controlled.
 #define DIALYSATE_PUMP_CONTROL_RUN                          0x01                                                    ///< Dialysate pump control run pump.
 #define DIALYSATE_PUMP_CONTROL_STOP                         0x00                                                    ///< Dialysate pump control stop pump.
@@ -143,11 +134,6 @@
 static OVERRIDE_F32_T pumpTargetPressure[ NUM_OF_DIALYSATE_PUMPS ];                                                 ///< Target dialysate pumps' pressure (PSI).
 static BOOL dialPumpsReadyToControl;                                                                                ///< Flag use to indicate the minimum control interval is met for pump control
 
-//Testing
-#ifdef __OPENSPDTEST__
-static U32 dialysatePumpExecTimerCounter[ NUM_OF_DIALYSATE_PUMPS ];                                                 ///< Used to schedule dialysate pump data publication to CAN bus.
-#endif
-
 //For testing
 #ifdef __PITEST__
 static F32 pIControlSignal[ NUM_OF_CONTROLLER_SIGNAL ];
@@ -174,11 +160,6 @@
 void initDialysatePump( void )
 {
     DIALYSATE_PUMPS_T pumpId;
-//Testing
-#ifdef __OPENSPDTEST__
-    dialysatePumpExecTimerCounter[ D12_PUMP ] = 9900;
-    dialysatePumpExecTimerCounter[ D48_PUMP ] = 9900;
-#endif
 
 #ifdef __PITEST__
     U32 i;
@@ -560,10 +541,6 @@
 
     for ( pumpId = DIALYSATE_PUMPS_FIRST; pumpId < NUM_OF_DIALYSATE_PUMPS; pumpId++ )
     {
-#ifdef  __OPENSPDTEST__
-        if ( ++dialysatePumpExecTimerCounter[ pumpId ] >= DIALYSATE_PUMP_EXEC_INTERVAL )
-        {
-#endif
         switch ( dialysatePumps[ pumpId ].dialysatePumpState )
         {
             case DIALYSATE_PUMP_OFF_STATE:
@@ -583,10 +560,6 @@
                 dialysatePumps[ pumpId ].dialysatePumpState = DIALYSATE_PUMP_OFF_STATE;
                 break;
         }
-#ifdef __OPENSPDTEST__
-        dialysatePumpExecTimerCounter[ pumpId ] = 0;
-        }
-#endif
     }
 }
 
@@ -724,12 +697,7 @@
     {
         if ( currentToTargetDiff > DIALYSATE_PUMP_RAMP_SPEED_INCREMENT )
         {
-//Testing
-#ifndef __OPENSPDTEST__
             speedIncrease = DIALYSATE_PUMP_RAMP_SPEED_INCREMENT;
-#else
-            speedIncrease = DIALYSATE_PUMP_SPEED_INCREMENT;
-#endif
         }
         else
         {