Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -r25dfec9cbd60f1fc9f22c00342a1d009c95533ff -r771a741a1698770e6997c6657bd520fb557d0f2d
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 25dfec9cbd60f1fc9f22c00342a1d009c95533ff)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 771a741a1698770e6997c6657bd520fb557d0f2d)
@@ -37,10 +37,10 @@
 
 #define CONCENTRATE_PUMP_RAMP_SPEED_INCREMENT               10.0F                                               ///< Speed increase (mL/min) when controlling concentrate pump to target step speed.
 #define CONCENTRATE_PUMP_MIN_SPEED                          0.0F                                                ///< Minimum speed for concentrate pump in mL per min.
-#define CONCENTRATE_PUMP_SPD_OUT_OF_RANGE_TOL_WHEN_ON_PCT   0.01F                                               ///< Concentrate pump speed out of range tolerance when on in percentage.
+#define CONCENTRATE_PUMP_SPD_OUT_OF_RANGE_TOL_WHEN_ON_PCT   0.0075F                                             ///< Concentrate pump speed out of range tolerance when on in percentage.
 #define CONCENTRATE_PUMP_CLEANING_SPD_OUT_OF_RANGE_TOL_PCT  0.05F                                               ///< Concentrate pump cleaning mode speed out of range tolerance when on in percentage.
-#define CONCENTRATE_PUMP_SPD_OUT_OF_RANGE_TOL_WHEN_SLOW_MLPM 1.0F                                               ///< Concentrate pump speed out of range tolerance when slow in mL/min.
-#define CONCENTRATE_PUMP_LOW_SPEED_THRESHOLD_MLPM           10.0F                                               ///< Concentrate pump low speed threshold in mL/min.
+#define CONCENTRATE_PUMP_SPD_OUT_OF_RANGE_TOL_WHEN_SLOW_MLPM 0.5F                                               ///< Concentrate pump speed out of range tolerance when slow in mL/min.
+#define CONCENTRATE_PUMP_LOW_SPEED_THRESHOLD_MLPM           5.0F                                                ///< Concentrate pump low speed threshold in mL/min.
 #define CONCENTRATE_PUMP_ZERO_FLOW_RATE                     0xFFFFFFFF                                          ///< Pulse width value when zero flow rate or pump is off.
 #define CONCENTRATE_PUMP_VOLUME_PER_REV_DIENER              0.4F                                                ///< Volume output every revolution (mL).
 #define CONCENTRATE_PUMP_VOLUME_PER_REV                     0.1F                                                ///< Volume output every revolution (mL).
@@ -62,7 +62,8 @@
 
 #define CONCENTRATE_PUMP_DATA_PUBLISH_INTERVAL              ( 1000 / TASK_GENERAL_INTERVAL )                    ///< Interval (ms/task time) at which the concentrate pump is monitored.
 #define CONCENTRATE_PUMP_CONTROL_INTERVAL                   ( 100 / TASK_GENERAL_INTERVAL )                     ///< Interval (ms/task time) at which the concentrate pump is controlled.
-#define CONCENTRATE_PUMP_SPEED_OUT_OF_RANGE_TIMEOUT_MS      ( 10 * MS_PER_SECOND )                              ///< Concentrate pumps speed out of range timeout in milliseconds.
+#define CONCENTRATE_PUMP_SPEED_OUT_OF_RANGE_TIMEOUT_MS      ( 1 * MS_PER_SECOND )                               ///< Concentrate pumps speed out of range timeout in milliseconds.
+#define UF_PUMP_SPEED_OUT_OF_RANGE_TIMEOUT_MS               ( 2 * MS_PER_SECOND )                               ///< Concentrate pumps speed out of range timeout in milliseconds.
 
 #define NUMBER_OF_ACID_AND_BICARB_NV_DATA_TO_CHECK          1                                                   ///< Number of acid and bicarb non-volatile data to check.
 #define DATA_PUBLISH_COUNTER_START_COUNT                    0                                                   ///< Data publish counter start count.
@@ -222,7 +223,7 @@
 
     initPersistentAlarm( ALARM_ID_DD_D11_PUMP_SPEED_CONTROL_ERROR, 0, CONCENTRATE_PUMP_SPEED_OUT_OF_RANGE_TIMEOUT_MS );
     initPersistentAlarm( ALARM_ID_DD_D10_PUMP_SPEED_CONTROL_ERROR, 0, CONCENTRATE_PUMP_SPEED_OUT_OF_RANGE_TIMEOUT_MS );
-    initPersistentAlarm( ALARM_ID_DD_D76_PUMP_SPEED_CONTROL_ERROR, 0, CONCENTRATE_PUMP_SPEED_OUT_OF_RANGE_TIMEOUT_MS );
+    initPersistentAlarm( ALARM_ID_DD_D76_PUMP_SPEED_CONTROL_ERROR, 0, UF_PUMP_SPEED_OUT_OF_RANGE_TIMEOUT_MS );
     initPersistentAlarm( ALARM_ID_DD_CONC_PUMP_HALL_SENSOR_OUT_OF_RANGE, CONCENTRATE_PUMP_HALL_SENSORS_OUT_OF_RANGE_TIME_MS, CONCENTRATE_PUMP_HALL_SENSORS_OUT_OF_RANGE_TIME_MS );
     initPersistentAlarm( ALARM_ID_DD_CONCENTRATE_PUMP_FAULT, CONCENTRATE_PUMP_FAULT_PERSISTENCE_PERIOD, CONCENTRATE_PUMP_FAULT_PERSISTENCE_PERIOD );
 }