Index: firmware/App/Controllers/DialysatePumps.c
===================================================================
diff -u -r60165f6d155831cfce06560fb45abaaaadea9798 -re0fc678329b0cb25dd76fa5e23cc1f487851f0ec
--- firmware/App/Controllers/DialysatePumps.c	(.../DialysatePumps.c)	(revision 60165f6d155831cfce06560fb45abaaaadea9798)
+++ firmware/App/Controllers/DialysatePumps.c	(.../DialysatePumps.c)	(revision e0fc678329b0cb25dd76fa5e23cc1f487851f0ec)
@@ -45,7 +45,7 @@
 #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.
-#if __OPENSPDTEST__
+#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
@@ -144,8 +144,8 @@
 static BOOL dialPumpsReadyToControl;                                                                                ///< Flag use to indicate the minimum control interval is met for pump control
 
 //Testing
-#if __OPENSPDTEST__
-static U32 dialysatePumpExecTimerCounter;                                                                ///< Used to schedule dialysate pump data publication to CAN bus.
+#ifdef __OPENSPDTEST__
+static U32 dialysatePumpExecTimerCounter[ NUM_OF_DIALYSATE_PUMPS ];                                                 ///< Used to schedule dialysate pump data publication to CAN bus.
 #endif
 
 //For testing
@@ -175,8 +175,9 @@
 {
     DIALYSATE_PUMPS_T pumpId;
 //Testing
-#if __OPENSPDTEST__
-    dialysatePumpExecTimerCounter = 9900;
+#ifdef __OPENSPDTEST__
+    dialysatePumpExecTimerCounter[ D12_PUMP ] = 9900;
+    dialysatePumpExecTimerCounter[ D48_PUMP ] = 9900;
 #endif
 
 #ifdef __PITEST__
@@ -559,8 +560,8 @@
 
     for ( pumpId = DIALYSATE_PUMPS_FIRST; pumpId < NUM_OF_DIALYSATE_PUMPS; pumpId++ )
     {
-#if  __OPENSPDTEST__
-        if ( ++dialysatePumpExecTimerCounter >= DIALYSATE_PUMP_EXEC_INTERVAL )
+#ifdef  __OPENSPDTEST__
+        if ( ++dialysatePumpExecTimerCounter[ pumpId ] >= DIALYSATE_PUMP_EXEC_INTERVAL )
         {
 #endif
         switch ( dialysatePumps[ pumpId ].dialysatePumpState )
@@ -582,8 +583,8 @@
                 dialysatePumps[ pumpId ].dialysatePumpState = DIALYSATE_PUMP_OFF_STATE;
                 break;
         }
-#if __OPENSPDTEST__
-        dialysatePumpExecTimerCounter = 0;
+#ifdef __OPENSPDTEST__
+        dialysatePumpExecTimerCounter[ pumpId ] = 0;
         }
 #endif
     }
@@ -988,7 +989,6 @@
         dialPump.d12PumpTargetRPM         = pIControlSignal[ 0 ];
         dialPump.d48PumpTargetRPM         = pIControlSignal[ 1 ];
 #endif
-
         dialPump.d12PumpMeasuredSpeed     = getDialysatePumpMeasuredSpeed( D12_PUMP );
         dialPump.d48PumpMeasuredSpeed     = getDialysatePumpMeasuredSpeed( D48_PUMP );
         dialPump.d12PumpCurrentSpeed      = dialysatePumps[ D12_PUMP ].currentPumpSpeed;