Index: firmware/App/Controllers/ConcentratePumps.h
===================================================================
diff -u -rb6d20d9e5c704a9f7ebceea9bb12731dac61fc2a -r837e86dd59014bd075bc39839c8b4b6324288880
--- firmware/App/Controllers/ConcentratePumps.h	(.../ConcentratePumps.h)	(revision b6d20d9e5c704a9f7ebceea9bb12731dac61fc2a)
+++ firmware/App/Controllers/ConcentratePumps.h	(.../ConcentratePumps.h)	(revision 837e86dd59014bd075bc39839c8b4b6324288880)
@@ -52,6 +52,10 @@
     F32 cp1MeasuredSpeed;                                       ///< Concentrate pump CP1 measured speed
     F32 cp2CurrentSetSpeed;                                     ///< Concentrate pump CP2 current set speed
     F32 cp2MeasuredSpeed;                                       ///< Concentrate pump CP2 measured speed
+    U32 cp1TargetRevCount;                                      ///< Concentrate pump CP1 target revolution count
+    U32 cp1MeasuredRevCount;                                    ///< Concentrate pump CP1 measured revolution count
+    U32 cp2TargetRevCount;                                      ///< Concentrate pump CP1 target revolution count
+    U32 cp2MeasuredRevCount;                                    ///< Concentrate pump CP1 measured revolution count
     U32 cp1State;                                               ///< Concentrate pump CP1 current state
     U32 cp2State;                                               ///< Concentrate pump CP2 current state
     F32 cp1PulseUS;                                             ///< Concentrate pump CP1 pulse in microseconds
@@ -75,13 +79,14 @@
 void requestConcentratePumpOn( CONCENTRATE_PUMPS_T pumpId );
 void requestConcentratePumpOff( CONCENTRATE_PUMPS_T pumpId, BOOL park );
 
-void setConcentratePumpTargetSpeed( CONCENTRATE_PUMPS_T pumpId, F32 targetSpeed_ml_min );
+void setConcentratePumpTargetSpeed( CONCENTRATE_PUMPS_T pumpId, F32 targetSpeed_ml_min, F32 targetVolume_ml );
 F32  getConcentratePumpTargetFlowMLPM( CONCENTRATE_PUMPS_T pumpId );
 F32  getMeasuredPumpSpeedMLPM( CONCENTRATE_PUMPS_T pumpId );
 F32  getPumpTargetSpeed( CONCENTRATE_PUMPS_T pumpId );
 BOOL getConcPumpParkRequest( CONCENTRATE_PUMPS_T pumpId );
 BOOL getConcPumpIsParked( CONCENTRATE_PUMPS_T pumpId );
 BOOL getConcPumpParkIsFaulted( CONCENTRATE_PUMPS_T pumpId );
+U16 getConcPumpTargetRevolutionCount( CONCENTRATE_PUMPS_T pumpId );
 BOOL handleConcentratePumpParkRequest( void );
 BOOL isConcPumpParkInProgress( CONCENTRATE_PUMPS_T pumpId );
 
@@ -90,6 +95,7 @@
 BOOL testConcentratePumpMeasuredSpeedOverride( MESSAGE_T *message );
 BOOL testConcentratePumpParkedOverride( MESSAGE_T *message );
 BOOL testConcentratePumpParkCmdFaultedOverride( MESSAGE_T *message );
+BOOL testConcentratePumpTargetRevCountOverride( MESSAGE_T *message );
 
 BOOL testConcentratePumpStartStopOverride( MESSAGE_T *message );      // Concentrate pump start/stop request
 BOOL testConcentratePumpParkRequestOverride( MESSAGE_T *message );    // Concentrate pump stop/park request