Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -rd748813399d38ef5b71d760e327e368cc82d7a38 -r87cd65f594e532ac5d78049dc3f18801c063e9ce
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision d748813399d38ef5b71d760e327e368cc82d7a38)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 87cd65f594e532ac5d78049dc3f18801c063e9ce)
@@ -41,7 +41,7 @@
 #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 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_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).
 
@@ -734,13 +734,13 @@
  * @param pumpId concentrate pump id to get target revolution count
  * @return the target revolution count for the given concentrate pump
  *************************************************************************/
-U16 getConcPumpTargetRevolutionCount( CONCENTRATE_PUMPS_T pumpId )
+U32 getConcPumpTargetRevolutionCount( CONCENTRATE_PUMPS_T pumpId )
 {
-    U16 result = 0;
+    U32 result = 0;
 
     if ( pumpId < NUM_OF_CONCENTRATE_PUMPS )
     {
-        result = (U16)getU32OverrideValue( &pumpTargetRevCnt[ pumpId ] );
+        result = getU32OverrideValue( &pumpTargetRevCnt[ pumpId ] );
     }
     else
     {
@@ -760,13 +760,13 @@
  * @param pumpId concentrate pump id to get current measured revolution count
  * @return the current revolution count for the given concentrate pump
  *************************************************************************/
-U16 getConcPumpCurrentMeasuredRevolutionCount( CONCENTRATE_PUMPS_T pumpId )
+U32 getConcPumpCurrentMeasuredRevolutionCount( CONCENTRATE_PUMPS_T pumpId )
 {
-    BOOL result = FALSE;
+    U32 result = 0;
 
     if ( pumpId < NUM_OF_CONCENTRATE_PUMPS )
     {
-        result = (U16)getU32OverrideValue( &pumpMesauredRevCnt[ pumpId ] );
+        result = getU32OverrideValue( &pumpMesauredRevCnt[ pumpId ] );
     }
     else
     {
@@ -1255,10 +1255,10 @@
         data.d10_PumpCurrentSetSpeed = ( CONCENTRATE_PUMP_REVERSE_DIR == d10_PumpDirection ? d10_PumpSetSpeed * -1.0F : d10_PumpSetSpeed );
         data.d10_PumpMeasuredSpeed   = getMeasuredPumpSpeedMLPM( D10_PUMP );
         data.d10_PumpTargetSpeed     = ( CONCENTRATE_PUMP_REVERSE_DIR == d10_PumpDirection ? d10_PumpTgtSpeed * -1.0F : d10_PumpTgtSpeed );
-        data.d11_PumpTargetRevCount  = (U32)getConcPumpTargetRevolutionCount( D11_PUMP );
-        data.d11_PumpMeasuredRevCount= (U32)getConcPumpCurrentMeasuredRevolutionCount( D11_PUMP );
-        data.d10_PumpTargetRevCount  = (U32)getConcPumpTargetRevolutionCount( D10_PUMP );
-        data.d10_PumpMeasuredRevCount= (U32)getConcPumpCurrentMeasuredRevolutionCount( D10_PUMP );
+        data.d11_PumpTargetRevCount  = getConcPumpTargetRevolutionCount( D11_PUMP );
+        data.d11_PumpMeasuredRevCount= getConcPumpCurrentMeasuredRevolutionCount( D11_PUMP );
+        data.d10_PumpTargetRevCount  = getConcPumpTargetRevolutionCount( D10_PUMP );
+        data.d10_PumpMeasuredRevCount= getConcPumpCurrentMeasuredRevolutionCount( D10_PUMP );
         data.d11_PumpState           = concentratePumps[ D11_PUMP ].execState;
         data.d10_PumpState           = concentratePumps[ D10_PUMP ].execState;
         data.d11_PumpPulseUS         = concentratePumps[ D11_PUMP ].pulseWidthUS;