Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -r88f28230d288947ba84840b967e95b32e3deffaa -r2fea76e972a450a97c74b2a9f627095032a3b586
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 88f28230d288947ba84840b967e95b32e3deffaa)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 2fea76e972a450a97c74b2a9f627095032a3b586)
@@ -132,10 +132,8 @@
         stopConcentratePump( pumpId );
     }
 
-    initPersistentAlarm( PERSISTENT_ALARM_CP1_SPEED_CONTROL_ERROR, ALARM_ID_CP1_SPEED_CONTROL_ERROR,
-                         TRUE, CONCENTRATE_PUMP_SPEED_CONTROL_PERSISTENCE_PERIOD, CONCENTRATE_PUMP_SPEED_CONTROL_PERSISTENCE_PERIOD );
-    initPersistentAlarm( PERSISTENT_ALARM_CP2_SPEED_CONTROL_ERROR, ALARM_ID_CP2_SPEED_CONTROL_ERROR,
-                         TRUE, CONCENTRATE_PUMP_SPEED_CONTROL_PERSISTENCE_PERIOD, CONCENTRATE_PUMP_SPEED_CONTROL_PERSISTENCE_PERIOD );
+    initPersistentAlarm( ALARM_ID_CP1_SPEED_CONTROL_ERROR, CONCENTRATE_PUMP_SPEED_CONTROL_PERSISTENCE_PERIOD, CONCENTRATE_PUMP_SPEED_CONTROL_PERSISTENCE_PERIOD );
+    initPersistentAlarm( ALARM_ID_CP2_SPEED_CONTROL_ERROR, CONCENTRATE_PUMP_SPEED_CONTROL_PERSISTENCE_PERIOD, CONCENTRATE_PUMP_SPEED_CONTROL_PERSISTENCE_PERIOD );
 }
 
 /*********************************************************************//**
@@ -154,17 +152,18 @@
         calcMeasuredPumpsSpeed( CONCENTRATEPUMPS_CP1, getFPGACP1HallSensePulseWidth() );
         calcMeasuredPumpsSpeed( CONCENTRATEPUMPS_CP2, getFPGACP2HallSensePulseWidth() );
 
-        data.cp1TargetSpeed   = concentratePumps[ CONCENTRATEPUMPS_CP1 ].pumpTargetSpeed;
+        data.cp1CurrentSpeed = concentratePumps[ CONCENTRATEPUMPS_CP1 ].currentPumpSpeed;
         data.cp1MeasuredSpeed = getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP1 );
-        data.cp2TargetSpeed   = concentratePumps[ CONCENTRATEPUMPS_CP2 ].pumpTargetSpeed;
+        data.cp2CurrentSpeed = concentratePumps[ CONCENTRATEPUMPS_CP2 ].currentPumpSpeed;
         data.cp2MeasuredSpeed = getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP2 );
 
         F32 const cp1Error =  fabs( getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP1 ) - concentratePumps[ CONCENTRATEPUMPS_CP1 ].currentPumpSpeed ) / concentratePumps[ CONCENTRATEPUMPS_CP1 ].currentPumpSpeed;
         F32 const cp2Error =  fabs( getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP2 ) - concentratePumps[ CONCENTRATEPUMPS_CP2 ].currentPumpSpeed ) / concentratePumps[ CONCENTRATEPUMPS_CP2 ].currentPumpSpeed;
 
-        // TODO add the right limit values
-        checkPersistentAlarm( PERSISTENT_ALARM_CP1_SPEED_CONTROL_ERROR, cp1Error > CONCENTRATE_PUMP_ERROR_TOLERANCE, cp1Error, 0 );
-        checkPersistentAlarm( PERSISTENT_ALARM_CP2_SPEED_CONTROL_ERROR, cp2Error > CONCENTRATE_PUMP_ERROR_TOLERANCE, cp2Error, 0 );
+#ifndef DISABLE_DIALYSATE_CHECK
+        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 );
+#endif
 
         concentratePumpMonitorTimerCounter = 0U;
         broadcastConcentratePumpData( &data );