Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -rf8bb43e62a4d10b64d8b197e372a56adfcfb88b9 -rd2fb916f924e8d988cb62b1e3a16aad2d923f7e7
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision f8bb43e62a4d10b64d8b197e372a56adfcfb88b9)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision d2fb916f924e8d988cb62b1e3a16aad2d923f7e7)
@@ -589,6 +589,28 @@
 
 /*********************************************************************//**
  * @brief
+ * The isConcentratePumpDosingCompleted function returns the dosing status
+ * for a given concentrate pump.
+ * @details \b Inputs: concentratePumps
+ * @details \b Outputs: none
+ * @param pumpId concentrate pump id to get current dosing status
+ * @return TRUE if dosing completed otherwise,FALSE.
+ *************************************************************************/
+BOOL isConcentratePumpDosingCompleted( CONCENTRATE_PUMPS_T pumpId )
+{
+    BOOL state = FALSE;
+
+    //On dosing completion,state transition to off state
+    if ( CONCENTRATE_PUMP_OFF_STATE == concentratePumps[ pumpId ].execState )
+    {
+        state = TRUE;
+    }
+
+    return state;
+}
+
+/*********************************************************************//**
+ * @brief
  * The getPumpTargetSpeed function gets the current target spped for the given
  * concentrate pump.
  * @details \b Inputs: pumpTargetSpeed
@@ -698,28 +720,6 @@
 
 /*********************************************************************//**
  * @brief
- * The IsConcentratePumpDosingCompleted function gets the concentrate pump
- * dosing completion status.
- * @details \b Inputs: execState
- * @details \b Outputs: none
- * @return true when dosing completed,otherwise false.
- *************************************************************************/
-BOOL IsConcentratePumpDosingCompleted( void )
-{
-    BOOL result = FALSE;
-
-    // Check doisng completed status
-    if ( ( concentratePumps[D11_PUMP].execState == CONCENTRATE_PUMP_OFF_STATE ) &&
-         ( concentratePumps[D10_PUMP].execState == CONCENTRATE_PUMP_OFF_STATE ) )
-    {
-        result = TRUE;
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
  * The getConcPumpCurrentMeasuredRevolutionCount function gets the concentrate pump
  * current measured revolution count.
  * @details \b Inputs: pumpMesauredRevCnt
@@ -1319,7 +1319,7 @@
 {
     BOOL result = FALSE;
 
-    // Verify tester has logged in with TD
+    // Verify tester has logged in with DD
     if ( TRUE == isTestingActivated() )
     {
         // Verify payload length is valid