Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -r23fd3843b6e50ff90b4db987be553c823bfd6597 -r6e3bbb4c27eae91fed11b118cced935a04c6b90a
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 23fd3843b6e50ff90b4db987be553c823bfd6597)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 6e3bbb4c27eae91fed11b118cced935a04c6b90a)
@@ -205,14 +205,19 @@
         data.cp1PulseInSeconds = cp1PulsetemporaryRemove;
         data.cp2PulseInSeconds = cp2PulsetemporaryRemove;
 
-#ifndef DISABLE_DIALYSATE_CHECK
-        F32 cp1Error =  fabs( getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP1_ACID ) - concentratePumps[ CONCENTRATEPUMPS_CP1_ACID ].currentPumpSpeed ) / concentratePumps[ CONCENTRATEPUMPS_CP1_ACID ].currentPumpSpeed;
-        F32 cp2Error =  fabs( getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP2_BICARB ) - concentratePumps[ CONCENTRATEPUMPS_CP2_BICARB ].currentPumpSpeed ) / concentratePumps[ CONCENTRATEPUMPS_CP2_BICARB ].currentPumpSpeed;
-
-        checkPersistentAlarm( ALARM_ID_CP1_SPEED_CONTROL_ERROR, cp1Error > CONCENTRATE_PUMP_ERROR_TOLERANCE, cp1Error, CONCENTRATE_PUMP_ERROR_TOLERANCE );
-        checkPersistentAlarm( ALARM_ID_CP2_SPEED_CONTROL_ERROR, cp2Error > CONCENTRATE_PUMP_ERROR_TOLERANCE, cp2Error, CONCENTRATE_PUMP_ERROR_TOLERANCE );
+#ifndef _RELEASE_
+        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_CONC_PUMPS_SPEED_ALARM ) != SW_CONFIG_ENABLE_VALUE )
 #endif
+        {
+            F32 cp1Error = fabs( getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP1_ACID ) -
+                                 concentratePumps[ CONCENTRATEPUMPS_CP1_ACID ].currentPumpSpeed ) / concentratePumps[ CONCENTRATEPUMPS_CP1_ACID ].currentPumpSpeed;
+            F32 cp2Error = fabs( getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP2_BICARB ) -
+                                 concentratePumps[ CONCENTRATEPUMPS_CP2_BICARB ].currentPumpSpeed ) / concentratePumps[ CONCENTRATEPUMPS_CP2_BICARB ].currentPumpSpeed;
 
+            checkPersistentAlarm( ALARM_ID_CP1_SPEED_CONTROL_ERROR, cp1Error > CONCENTRATE_PUMP_ERROR_TOLERANCE, cp1Error, CONCENTRATE_PUMP_ERROR_TOLERANCE );
+            checkPersistentAlarm( ALARM_ID_CP2_SPEED_CONTROL_ERROR, cp2Error > CONCENTRATE_PUMP_ERROR_TOLERANCE, cp2Error, CONCENTRATE_PUMP_ERROR_TOLERANCE );
+        }
+
         concentratePumpMonitorTimerCounter = 0;
         broadcastData( MSG_ID_DG_CONCENTRATE_PUMP_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( CONCENTRATE_PUMP_DATA_T ) );
     }
@@ -300,9 +305,12 @@
 {
     if ( pumpId < NUM_OF_CONCENTRATE_PUMPS )
     {
-#ifndef DISABLE_CONC_PUMPS
-        concentratePumps[ pumpId ].hasTurnOnPumpsBeenRequested = TRUE;
+#ifndef _RLEASE_
+        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_CONC_PUMPS ) != SW_CONFIG_ENABLE_VALUE )
 #endif
+        {
+            concentratePumps[ pumpId ].hasTurnOnPumpsBeenRequested = TRUE;
+        }
     }
     else
     {