Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -r830213bc6dcc1a684610caf78c79d55f2cb41e93 -r25dfec9cbd60f1fc9f22c00342a1d009c95533ff
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 830213bc6dcc1a684610caf78c79d55f2cb41e93)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 25dfec9cbd60f1fc9f22c00342a1d009c95533ff)
@@ -36,12 +36,12 @@
 #define CONCENTRATE_PUMP_REVERSE_DIR                        0x0                                                 ///< Concentrate pump reverse direction configuration.
 
 #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                          3.0F                                                ///< Minimum speed for concentrate pump in mL per min.
+#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_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_ZERO_FLOW_RATE                     0xFFFF                                              ///< Pulse width value when zero flow rate or pump is off.
+#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).
 
@@ -107,7 +107,7 @@
     CONCENTRATE_PUMP_STATE_T execState;                                                                         ///< Concentrate pump execute current state.
     BOOL hasTurnOnPumpsBeenRequested;                                                                           ///< Flag indicates a request to turn concentrate pumps on.
     F32 currentPumpSpeed;                                                                                       ///< Current controlled concentrate pumps' speed (mL/min).
-    U16 togglePeriodCount;                                                                                      ///< Converted pump speed (mL/min) to toggle period counts (0.5 uS increment counts per step).
+    U32 togglePeriodCount;                                                                                      ///< Converted pump speed (mL/min) to toggle period counts (0.5 uS increment counts per step).
     U08 direction;                                                                                              ///< Concentrate pump motor direction.
     U08 controlSet;                                                                                             ///< Concentrate pump control set. (Used in DVT)
     F32 pulseWidthUS;                                                                                           ///< Concentrate pump pulse width in microseconds.
@@ -576,8 +576,8 @@
         }
 
         /*
-         * If 3.0 <= speed <= 60 set it
-         * If speed < 3.0 set to 0
+         * If 0.0 <= speed <= 60 set it
+         * If speed < 0.0 set to 0
          * else speed > 60 set to 60
          */
         if ( ( CONCENTRATE_PUMP_MIN_SPEED <= targetSpeed_ml_min ) && ( targetSpeed_ml_min <= CONCENTRATE_PUMP_MAX_SPEED ) )
@@ -1057,7 +1057,7 @@
 
         timePerStep = CONCENTRATE_PUMP_VOLUME_PER_REV_DIENER / ( concentratePumps[ pumpId ].currentPumpSpeed * CONCENTRATE_PUMP_STEP_PER_REV );
         stepPeriodCounts = timePerStep / ( CONCENTRATE_PUMP_STEP_PERIOD_RESOLUTION * CONCENTRATE_PUMP_MICRO_STEPS_PER_STEP );
-        concentratePumps[ pumpId ].togglePeriodCount = (U16)( stepPeriodCounts + FLOAT_TO_INT_ROUNDUP_OFFSET );
+        concentratePumps[ pumpId ].togglePeriodCount = (U32)( stepPeriodCounts + FLOAT_TO_INT_ROUNDUP_OFFSET );
     }
     else
     {
@@ -1097,7 +1097,7 @@
 static void calcMeasuredPumpsSpeed( void )
 {
     CONCENTRATE_PUMPS_T pumpId;
-    U16  pulseWidthCount                    = 0;
+    U32  pulseWidthCount                    = 0;
     F32  pulseWidthInMicroSeconds           = 0.0F;
     BOOL isPulseWidthOut                    = FALSE;
     CONCENTRATE_PUMPS_T pumpInAlarm         = CONCENTRATEPUMPS_FIRST;