Index: firmware/.cproject
===================================================================
diff -u -r52ded7b22d4b413aa8182f1343e4fbb78e8c3b0a -r5aa0b08cb09b06af807687fe03db5137e388da82
--- firmware/.cproject	(.../.cproject)	(revision 52ded7b22d4b413aa8182f1343e4fbb78e8c3b0a)
+++ firmware/.cproject	(.../.cproject)	(revision 5aa0b08cb09b06af807687fe03db5137e388da82)
@@ -51,6 +51,7 @@
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.DEFINE.1095665988" name="Pre-define NAME (--define, -D)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.DEFINE" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="__TI_VIM_128CH__"/>
+									<listOptionValue builtIn="false" value="__PUMPTEST__"/>
 									<listOptionValue builtIn="false" value="DEBUG_ENABLED"/>
 									<listOptionValue builtIn="false" value="__TI_VFPV3D16_SUPPORT__"/>
 									<listOptionValue builtIn="false" value="_DD_"/>
Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -rc4a199308f24cb8f6c805928b433903d95b59c6d -r5aa0b08cb09b06af807687fe03db5137e388da82
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision c4a199308f24cb8f6c805928b433903d95b59c6d)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 5aa0b08cb09b06af807687fe03db5137e388da82)
@@ -41,8 +41,12 @@
 #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.
-
+#ifdef __PUMPTEST__
+#define PISTON_PUMP_REV_PER_ML                              700.0F                                              ///< Revolution count for 1ml volume delivery.
+#define CONCENTRATE_PUMP_VOLUME_PER_REV                     ( CONCENTRATE_PUMP_STEP_PER_REV / PISTON_PUMP_REV_PER_ML )  ///< Volume output every revolution (mL).
+#else
 #define CONCENTRATE_PUMP_VOLUME_PER_REV                     0.1F                                                ///< Volume output every revolution (mL).
+#endif
 #define CONCENTRATE_PUMP_PULSE_PER_REV                      2.0F                                                ///< Number of pulses generate for every revolution.
 #define CONCENTRATE_PUMP_STEP_PER_REV                       200.0F                                              ///< Number of steps for every revolution.
 #define CONCENTRATE_PUMP_HALL_SENSE_PERIOD_RESOLUTION       100.0F                                              ///< Hall sense period resolution in microseconds.
@@ -53,6 +57,9 @@
 #define CONCENTRATE_PUMP_VOLUME_TO_REVOLUTION               ( ( 1 / CONCENTRATE_PUMP_VOLUME_PER_REV ) * \
                                                               ( CONCENTRATE_PUMP_STEP_PER_REV * \
                                                                 CONCENTRATE_PUMP_MICRO_STEPS_PER_STEP ) )       ///< Convert volume in to number of revolutions needed.
+#ifdef __PUMPTEST__
+#define PISTON_PUMP_VOLUME_TO_REVOLUTION                    ( PISTON_PUMP_REV_PER_ML * CONCENTRATE_PUMP_MICRO_STEPS_PER_STEP )  ///< Convert volume in to number of revolutions needed.
+#endif
 #define CONCENTRATE_PUMP_STEP_PERIOD_RESOLUTION             ( 0.50F / ( US_PER_SECOND * SEC_PER_MIN ) )         ///< Convert step period resolution (0.50 us) to minute.
 
 /// Volume output per pulse.
@@ -498,7 +505,11 @@
         //Update target revolution count
         if ( targetVolume_ml > 0.0 )
         {
+#ifdef __PUMPTEST__
+            pumpTargetRevCnt[ pumpId ].data = (U32)( targetVolume_ml * PISTON_PUMP_VOLUME_TO_REVOLUTION );
+#else
             pumpTargetRevCnt[ pumpId ].data = (U32)( targetVolume_ml * CONCENTRATE_PUMP_VOLUME_TO_REVOLUTION );
+#endif
             if ( CONCENTRATEPUMPS_CP1_ACID == pumpId )
             {
                 setFPGACPARevolutionCount( getConcPumpTargetRevolutionCount( pumpId ) );
Index: firmware/App/Controllers/PistonPumpControl.c
===================================================================
diff -u
--- firmware/App/Controllers/PistonPumpControl.c	(revision 0)
+++ firmware/App/Controllers/PistonPumpControl.c	(revision 5aa0b08cb09b06af807687fe03db5137e388da82)
@@ -0,0 +1,534 @@
+/**************************************************************************
+*
+* Copyright (c) 2024-2024 Diality Inc. - All Rights Reserved.
+*
+* THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+* WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+*
+* @file    PistonPumpControl.c
+*
+* @author  (last)      Vinayakam Mani
+* @date    (last)      07-Jan-2025
+*
+* @author  (original)  Vinayakam Mani
+* @date    (original)  07-Jan-2025
+*
+***************************************************************************/
+
+#include "ConcentratePumps.h"
+#include "FpgaDD.h"
+#include "Messaging.h"
+#include "PistonPumpControl.h"
+#include "TaskGeneral.h"
+#include "Valves.h"
+
+#ifdef __PUMPTEST__
+/**
+ *  @addtogroup PistonPumpControl
+ *  @{
+ */
+
+// ********** private definitions **********
+
+#define PISTON_PUMP_CONTROL_DATA_PUBLISH_INTERVAL   ( 1000 / TASK_GENERAL_INTERVAL )            ///< Interval (ms/task time) at which the piston pump control data published.
+#define PISTON_PUMP_FILL_PERIOD                     ( 2000 / TASK_GENERAL_INTERVAL )            ///< Interval (ms/task time) at which the piston pump filling cycle time
+#define PISTON_PUMP_DISPENSE_PERIOD                 ( 2000 / TASK_GENERAL_INTERVAL )            ///< Interval (ms/task time) at which the piston pump dispense cycle time
+#define PISTON_PUMP_MIN_SPEED                       3.0F                                        ///< Piston pump minimum speed in ml/min.
+#define PISTON_PUMP_MAX_SPEED                       48.0F                                       ///< Maximum speed for piston pump in mL/min
+
+/// Enumeration of piston pump states.
+typedef enum PistonPumpState
+{
+    PISTON_PUMP_OFF_STATE = 0,                                                                 ///< Piston pump off state.
+    PISTON_PUMP_FILL_START_STATE,                                                              ///< Piston pump fill start state.
+    PISTON_PUMP_FILL_COMPLETE_STATE,                                                           ///< Piston pump fill complete state.
+    PISTON_PUMP_DISPENSE_START_STATE,                                                          ///< Piston pump dispense start state.
+    PISTON_PUMP_DISPENSE_COMPLETE_STATE,                                                       ///< Piston pump dispense complete state.
+    NUM_OF_PISTON_PUMP_STATES                                                                  ///< Number of piston pump states.
+} PISTON_PUMP_EXEC_STATE_T;
+
+/// Payload record structure for piston pump start/stop request
+typedef struct
+{
+    U32 pumpId;                                                                                 ///< Piston pump ID (0:Acid ,1:Bicarb, 2: UF pump)
+    U32 startStop;                                                                              ///< Piston pump start:1,stop :0.
+    U32 cycleCount;                                                                             ///< Piston pump cycle count
+    F32 volume;                                                                                 ///< Target volume in ml
+    F32 speed;                                                                                  ///< Speed range from 0.3 ml/min to 48.0 ml/min.
+} PISTON_PUMP_START_STOP_CMD_PAYLOAD_T;
+
+// ********** private data **********
+
+static PISTON_PUMP_EXEC_STATE_T pistonPumpExecState[ NUM_OF_PISTON_PUMPS ];                     ///< Current piston pump control executive state.
+static F32 pistonPumpSetSpeed[ NUM_OF_PISTON_PUMPS ];                                           ///< Current piston pump set speed.
+static F32 pistonPumpVolumeinMl[ NUM_OF_PISTON_PUMPS ];                                         ///< Current piston pump set volume to deliver.
+static U32 pistonPumpFillPeriod;                                                                ///< Piston pump fill period
+static U32 pistonPumpDispensePeriod;                                                            ///< Piston pump dispense period
+static U32 pistonPumpCycleCount[ NUM_OF_PISTON_PUMPS ];                                         ///< Number of piston pump (fill and dispense) cycle count
+static U32 currentPistonPumpSwitchingCounter[ NUM_OF_PISTON_PUMPS ];                            ///< Counter (in task interval) to monitor the piston pump fill/drain operation.
+static U32 pistonPumpControlDataPublicationTimerCounter;                                        ///< Used to schedule piston pump control data publication to CAN bus.
+static OVERRIDE_U32_T pistonPumpControlDataPublishInterval;                                     ///< Piston Pump control data publish interval.
+
+// ********** private function prototypes **********
+
+static void pistonPumpInletOutletValveControl( PISTON_PUMPS_T pumpId, BOOL inletValveState, BOOL outletValveState );
+static PISTON_PUMP_EXEC_STATE_T handlePistonPumpOffState( PISTON_PUMPS_T pumpId );
+static PISTON_PUMP_EXEC_STATE_T handlePistonPumpFillStartState( PISTON_PUMPS_T pumpId );
+static PISTON_PUMP_EXEC_STATE_T handlePistonPumpFillCompleteState( PISTON_PUMPS_T pumpId );
+static PISTON_PUMP_EXEC_STATE_T handlePistonPumpDispenseStartState( PISTON_PUMPS_T pumpId );
+static PISTON_PUMP_EXEC_STATE_T handlePistonPumpDispenseCompleteState( PISTON_PUMPS_T pumpId );
+static U32 getPistonPumpControlDataPublishInterval( void );
+static void publishPistonPumpControlData( void );
+
+/*********************************************************************//**
+ * @brief
+ * The initPistonPumpControl function initializes the piston pump control
+ * ( Dosing and ultrafilteraion control) unit.
+ * @details \b Inputs: none
+ * @details \b Outputs: unit variables initialized.
+ * @return none
+ *************************************************************************/
+void initPistonPumpControl( void )
+{
+    pistonPumpExecState[ PISTONPUMPS_ACID ]                 = PISTON_PUMP_OFF_STATE;
+    pistonPumpExecState[ PISTONPUMPS_BICARB ]               = PISTON_PUMP_OFF_STATE;
+    pistonPumpExecState[ PISTONPUMPS_UF ]                   = PISTON_PUMP_OFF_STATE;
+    currentPistonPumpSwitchingCounter[ PISTONPUMPS_ACID ]   = 0;
+    currentPistonPumpSwitchingCounter[ PISTONPUMPS_BICARB ] = 0;
+    currentPistonPumpSwitchingCounter[ PISTONPUMPS_UF ]     = 0;
+    pistonPumpCycleCount[ PISTONPUMPS_ACID ]                = 0;
+    pistonPumpCycleCount[ PISTONPUMPS_BICARB ]              = 0;
+    pistonPumpCycleCount[ PISTONPUMPS_UF ]                  = 0;
+    pistonPumpVolumeinMl[ PISTONPUMPS_ACID ]                = 0.0F;
+    pistonPumpVolumeinMl[ PISTONPUMPS_BICARB ]              = 0.0F;
+    pistonPumpVolumeinMl[ PISTONPUMPS_UF ]                  = 0.0F;
+    pistonPumpSetSpeed[ PISTONPUMPS_ACID ]                  = PISTON_PUMP_MIN_SPEED;
+    pistonPumpSetSpeed[ PISTONPUMPS_BICARB ]                = PISTON_PUMP_MIN_SPEED;
+    pistonPumpSetSpeed[ PISTONPUMPS_UF ]                    = PISTON_PUMP_MIN_SPEED;
+    pistonPumpControlDataPublishInterval.data               = PISTON_PUMP_CONTROL_DATA_PUBLISH_INTERVAL;
+    pistonPumpControlDataPublishInterval.ovData             = PISTON_PUMP_CONTROL_DATA_PUBLISH_INTERVAL;
+    pistonPumpControlDataPublishInterval.ovInitData         = 0;
+    pistonPumpControlDataPublishInterval.override           = OVERRIDE_RESET;
+    pistonPumpFillPeriod                                    = PISTON_PUMP_FILL_PERIOD;
+    pistonPumpDispensePeriod                                = PISTON_PUMP_DISPENSE_PERIOD;
+    pistonPumpControlDataPublicationTimerCounter            = 0;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The execPistonPumpControl function executes the piston pump control state machine.
+ * @details \b Inputs: pistonPumpExecState
+ * @details \b Outputs: pistonPumpExecState
+ * @details \b Alarm: ALARM_ID_DD_SOFTWARE_FAULT when wrong piston pump control state invoked.
+ * @return current state.
+ *************************************************************************/
+void execPistonPumpControl( void )
+{
+    PISTON_PUMPS_T pumpId;
+
+    for ( pumpId = PISTONPUMPS_FIRST; pumpId < NUM_OF_PISTON_PUMPS; pumpId++ )
+    {
+       // Increment free running counter
+       currentPistonPumpSwitchingCounter [ pumpId ]++;
+
+       switch ( pistonPumpExecState[pumpId] )
+       {
+           case PISTON_PUMP_OFF_STATE:
+               pistonPumpExecState[ pumpId ] = handlePistonPumpOffState( pumpId );
+               break;
+
+           case PISTON_PUMP_FILL_START_STATE:
+               pistonPumpExecState[ pumpId ] = handlePistonPumpFillStartState( pumpId );
+               break;
+
+           case PISTON_PUMP_FILL_COMPLETE_STATE:
+               pistonPumpExecState[ pumpId ] = handlePistonPumpFillCompleteState( pumpId );
+               break;
+
+           case PISTON_PUMP_DISPENSE_START_STATE:
+               pistonPumpExecState[ pumpId ] = handlePistonPumpDispenseStartState( pumpId );
+               break;
+
+           case PISTON_PUMP_DISPENSE_COMPLETE_STATE:
+               pistonPumpExecState[ pumpId ] = handlePistonPumpDispenseCompleteState( pumpId );
+               break;
+
+    #ifndef _VECTORCAST_
+           // The switch case is in a for loop so the default case cannot be covered in VectorCAST
+           default:
+               SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_PISTON_PUMP_EXEC_INVALID_STATE, pumpId )
+               pistonPumpExecState[ pumpId ] = PISTON_PUMP_OFF_STATE;
+               break;
+    #endif
+       }
+    }
+
+    //Publish piston control pump data
+    publishPistonPumpControlData();
+
+}
+
+/*********************************************************************//**
+ * @brief
+ * The pistonPumpInletOutletValveControl function actuates the inlet and
+ * Outlet valve for given pump ( dosing/UF ).
+ * @details \b Inputs: none
+ * @details \b Outputs: valve states
+ * @param pumpId pump id to configure valve settings
+ * @param inletValveState Inlet Valve open/close state
+ * @param outletValveState Outlet Valve open/close state
+ * @return none.
+ *************************************************************************/
+static void pistonPumpInletOutletValveControl( PISTON_PUMPS_T pumpId, BOOL inletValveState, BOOL outletValveState )
+{
+    switch ( pumpId )
+    {
+        case PISTONPUMPS_ACID:
+            // Valves assocaited to Acid concentrate Pumps
+            setValveState( UFI1, (VALVE_STATE_NAMES_T)inletValveState );
+            setValveState( UFI2, (VALVE_STATE_NAMES_T)outletValveState );
+            break;
+
+        case PISTONPUMPS_BICARB:
+            // Valves assocaited to Bicarb concentrate Pumps
+            setValveState( UFO1, (VALVE_STATE_NAMES_T)inletValveState );
+            setValveState( UFO2, (VALVE_STATE_NAMES_T)outletValveState );
+            break;
+
+        case PISTONPUMPS_UF:
+            // Valves assocaited to Ultrafilteration
+            setValveState( UF1, (VALVE_STATE_NAMES_T)inletValveState );
+            setValveState( UF2, (VALVE_STATE_NAMES_T)outletValveState );
+            break;
+
+        default:
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_PISTON_PUMP_INVALID_PUMP_ID, pumpId );
+            break;
+    }
+}
+
+/*********************************************************************//**
+ * @brief
+ * The startPistonPumpCycle function sets the given piston pump parameters
+ * for dosing/UF operations.
+ * @details \b Inputs: none
+ * @details \b Outputs: piston pump parameters.
+ * @param pumpId pump id to configure pump parameters
+ * @param cycleCount Number of piston pump cycle.
+ * @param targetVolume_ml Volume to be filled/dispensed
+ * @param speed The flow rate in ml/min
+ * @return none.
+ *************************************************************************/
+void startPistonPumpCycle( PISTON_PUMPS_T pumpId, U32 cycleCount, F32 targetVolume_ml, F32 speed )
+{
+    if ( pumpId < NUM_OF_PISTON_PUMPS )
+    {
+        pistonPumpCycleCount[ pumpId ] = cycleCount;
+        pistonPumpVolumeinMl[ pumpId ] = targetVolume_ml;
+        pistonPumpSetSpeed[ pumpId ]   = speed;
+        pistonPumpExecState[ pumpId ]  = PISTON_PUMP_OFF_STATE;
+    }
+    else
+    {
+       SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_PISTON_PUMP_INVALID_PUMP_ID, pumpId );
+    }
+}
+
+/*********************************************************************//**
+ * @brief
+ * The stopPistonPumpCycle function stops the given piston pump
+ * @details \b Inputs: none
+ * @details \b Outputs: pistonPumpCycleCount,pistonPumpVolumeinMl,pistonPumpSetSpeed,
+ * pistonPumpExecState.
+ * @param pumpId pump id to stop the pump
+ * @return none.
+ *************************************************************************/
+void stopPistonPumpCycle( PISTON_PUMPS_T pumpId )
+{
+    if ( pumpId < NUM_OF_PISTON_PUMPS )
+    {
+        pistonPumpCycleCount[ pumpId ] = 0;
+        pistonPumpVolumeinMl[ pumpId ] = 0.0F;
+        pistonPumpSetSpeed[ pumpId ]   = 0.0F;
+        pistonPumpExecState[ pumpId ]  = PISTON_PUMP_OFF_STATE;
+    }
+    else
+    {
+       SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_PISTON_PUMP_INVALID_PUMP_ID, pumpId );
+    }
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handlePistonPumpOffState function handles the piston pump
+ * Off state to handle piston pump control initiation when asked to.
+ * @details \b Inputs: pump Id
+ * @details \b Outputs: valve states and motor control
+ * @param pumpId pump id to start/stop the pump
+ * @return next piston pump control state.
+ *************************************************************************/
+static PISTON_PUMP_EXEC_STATE_T handlePistonPumpOffState( PISTON_PUMPS_T pumpId )
+{
+    PISTON_PUMP_EXEC_STATE_T state = PISTON_PUMP_OFF_STATE;
+
+    // Close Inlet and Outlet valve
+    pistonPumpInletOutletValveControl( pumpId, TRUE, TRUE );
+
+    //Stop the pump
+    requestConcentratePumpOff( (CONCENTRATE_PUMPS_T)pumpId, FALSE );
+
+    // Initiate piston pump control
+    if ( pistonPumpCycleCount[ pumpId ] > 0 )
+    {
+        state = PISTON_PUMP_FILL_START_STATE;
+        pistonPumpCycleCount[ pumpId ]--;
+    }
+
+    return state;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handlePistonPumpFillStartState function handles the inlet and outlet
+ * valve control and start the piston pumps with the set speed and volume
+ * @details \b Inputs: pump Id
+ * @details \b Outputs: Valve actuation and motor control
+ * @param pumpId pump id to actuate valves pair and control stepper motor
+ * @return next piston pump control state.
+ *************************************************************************/
+static PISTON_PUMP_EXEC_STATE_T handlePistonPumpFillStartState( PISTON_PUMPS_T pumpId )
+{
+    PISTON_PUMP_EXEC_STATE_T state                  = PISTON_PUMP_FILL_START_STATE;
+    currentPistonPumpSwitchingCounter [ pumpId ]    = 0;
+
+    // Open Inlet and Outlet valve
+    pistonPumpInletOutletValveControl( pumpId, FALSE, TRUE );
+
+    // start stepper motor with the expected quantity
+    setConcentratePumpTargetSpeed( (CONCENTRATE_PUMPS_T)pumpId, pistonPumpSetSpeed[ pumpId ], pistonPumpVolumeinMl[ pumpId ] );
+    requestConcentratePumpOn( (CONCENTRATE_PUMPS_T)pumpId );
+
+    //Move to next state
+    state = PISTON_PUMP_FILL_COMPLETE_STATE;
+
+    return state;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handlePistonPumpFillCompleteState function check for the piston pump
+ * fill complete and close the currently opened valve.
+ * @details \b Inputs: currentPistonPumpSwitchingCounter,pistonPumpFillPeriod
+ * @details \b Outputs: currentPistonPumpSwitchingCounter
+ * @param pumpId pump id to actuate valves pair and control stepper motor
+ * @return next piston pump control state.
+ *************************************************************************/
+static PISTON_PUMP_EXEC_STATE_T handlePistonPumpFillCompleteState( PISTON_PUMPS_T pumpId )
+{
+    PISTON_PUMP_EXEC_STATE_T state = PISTON_PUMP_FILL_COMPLETE_STATE;
+
+    // TODO: The FPGA status register for step revolution count - downcounter to be monitered here
+    // to confirm the motor stop. Once FPGA status register issue is fixed, we can bring that here.
+    // Till then go with some guess timing for filling and dispensing.
+    if ( currentPistonPumpSwitchingCounter[ pumpId ] >= pistonPumpFillPeriod )
+    {
+        // Close Inlet and Outlet valve
+        pistonPumpInletOutletValveControl( pumpId, TRUE, TRUE );
+
+        //Stop the pump
+        requestConcentratePumpOff( (CONCENTRATE_PUMPS_T)pumpId, FALSE );
+
+        //Move to next state
+        state = PISTON_PUMP_DISPENSE_START_STATE;
+    }
+
+    return state;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handlePistonPumpDispenseStartState function handles the inlet and outlet
+ * valve control for dispensing fluid  and start the piston pumps with the set
+ * speed and volume
+ * @details \b Inputs: pump Id
+ * @details \b Outputs: Valve actuation and motor control
+ * @param pumpId pump id to actuate valves pair and control stepper motor
+ * @return next piston pump control state.
+ *************************************************************************/
+static PISTON_PUMP_EXEC_STATE_T handlePistonPumpDispenseStartState( PISTON_PUMPS_T pumpId )
+{
+    PISTON_PUMP_EXEC_STATE_T state = PISTON_PUMP_DISPENSE_START_STATE;
+    currentPistonPumpSwitchingCounter[ pumpId ] = 0;
+    F32 pumpSpeed = pistonPumpSetSpeed[ pumpId ] * -1.0 ; // This is to rotate motor in reverse direction
+
+    // Close Inlet and Open Outlet valve
+    pistonPumpInletOutletValveControl( pumpId, TRUE, FALSE );
+
+    // start stepper motor with the expected quantity
+    setConcentratePumpTargetSpeed( (CONCENTRATE_PUMPS_T)pumpId, pumpSpeed, pistonPumpVolumeinMl[ pumpId ] );
+    requestConcentratePumpOn( (CONCENTRATE_PUMPS_T)pumpId );
+
+    //Move to next state
+    state = PISTON_PUMP_DISPENSE_COMPLETE_STATE;
+
+    return state;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handlePistonPumpDispenseCompleteState function check for the piston pump
+ * dispense complete and close the currently opened valve.
+ * @details \b Inputs: currentPistonPumpSwitchingCounter,pistonPumpDispensePeriod
+ * @details \b Outputs: currentPistonPumpSwitchingCounter
+ * @param pumpId pump id to actuate valves pair and control stepper motor
+ * @return next piston pump control state.
+ *************************************************************************/
+static PISTON_PUMP_EXEC_STATE_T handlePistonPumpDispenseCompleteState( PISTON_PUMPS_T pumpId )
+{
+    PISTON_PUMP_EXEC_STATE_T state = PISTON_PUMP_DISPENSE_COMPLETE_STATE;
+
+    // TODO: The FPGA status register for step revolution count - downcounter to be monitered here
+    // to confirm the motor stop. Once FPGA status register issue is fixed, we can bring that here.
+    // Till then go with some guess timing for filling and dispensing.
+    if ( currentPistonPumpSwitchingCounter[ pumpId ] >= pistonPumpDispensePeriod )
+    {
+        // Close Inlet and Outlet valve
+        pistonPumpInletOutletValveControl( pumpId, TRUE, TRUE );
+
+        //Stop the pump
+        requestConcentratePumpOff( (CONCENTRATE_PUMPS_T)pumpId, FALSE );
+
+        //Move to next state
+        state = PISTON_PUMP_OFF_STATE;
+    }
+
+    return state;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The getPistonPumpControlDataPublishInterval function gets the piston pump
+ * control data publish interval.
+ * @details \b Inputs: pistonPumpControlDataPublishInterval
+ * @details \b Outputs: none
+ * @return the interval at piston pump control data being published.
+ *************************************************************************/
+static U32 getPistonPumpControlDataPublishInterval( void )
+{
+    U32 result = pistonPumpControlDataPublishInterval.data;
+
+    if ( OVERRIDE_KEY == pistonPumpControlDataPublishInterval.override )
+    {
+        result = pistonPumpControlDataPublishInterval.ovData;
+    }
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The publishPistonPumpControlData function broadcasts the piston pump
+ * control execution data at defined interval.
+ * @details \b Inputs: pistonPumpControlDataPublicationTimerCounter
+ * @details \b Outputs: DD piston pump control data broadcast message sent
+ * @details \b Message \Sent: MSG_ID_DD_PISTON_PUMP_CONTROL_DATA to publish the balancing
+ * chamber data.
+ * @return none
+ *************************************************************************/
+static void publishPistonPumpControlData( void )
+{
+    if ( ++pistonPumpControlDataPublicationTimerCounter >= getPistonPumpControlDataPublishInterval() )
+    {
+        PISTON_PUMP_CONTROL_DATA_T data;
+
+        data.acidPumpControlExecState           = (U32)pistonPumpExecState[ PISTONPUMPS_ACID ];
+        data.bicarbPumpControlExecState         = (U32)pistonPumpExecState[ PISTONPUMPS_BICARB ];
+        data.ufPumpControlExecState             = (U32)pistonPumpExecState[ PISTONPUMPS_UF ];
+        data.acidPistonPumpSwCounter            = currentPistonPumpSwitchingCounter[ PISTONPUMPS_ACID ];
+        data.bicarbPistonPumpSwCounter          = currentPistonPumpSwitchingCounter[ PISTONPUMPS_BICARB ];
+        data.ufPistonPumpSwCounter              = currentPistonPumpSwitchingCounter[ PISTONPUMPS_UF ];
+        data.acidPistonPumpCycleCount           = pistonPumpCycleCount[ PISTONPUMPS_ACID ];
+        data.acidPistonPumpCycleCount           = pistonPumpCycleCount[ PISTONPUMPS_BICARB ];
+        data.acidPistonPumpCycleCount           = pistonPumpCycleCount[ PISTONPUMPS_UF ];
+
+        broadcastData( MSG_ID_DD_PISTON_PUMP_CONTROL_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( PISTON_PUMP_CONTROL_DATA_T ) );
+
+        pistonPumpControlDataPublicationTimerCounter = 0;
+    }
+}
+
+
+/*************************************************************************
+ *                       TEST SUPPORT FUNCTIONS
+ *************************************************************************/
+
+
+/*********************************************************************//**
+ * @brief
+ * The testDDPistonPumpControlDataPublishIntervalOverride function overrides the
+ * DD piston pump data publish interval.
+ * @details \b Inputs: pistonPumpControlDataPublishInterval
+ * @details \b Outputs: pistonPumpControlDataPublishInterval
+ * @param Override message from Dialin which includes the interval
+ * (in ms) to override the DD piston pump data publish interval to.
+ * @return TRUE if override successful, FALSE if not
+ *************************************************************************/
+BOOL testDDPistonPumpControlDataPublishIntervalOverride( MESSAGE_T *message )
+{
+    BOOL result = u32BroadcastIntervalOverride( message, &pistonPumpControlDataPublishInterval, TASK_GENERAL_INTERVAL );
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The testDDPistonPumpStartStopOverride function sets the override
+ * of start/stop piston pump.
+ * @details Inputs: piston pump parameters
+ * @details Outputs: valve and motor control
+ * @param message Override message from Dialin which includes the override
+ * value to override the piston pump control parameters.
+ * @return TRUE if override successful, FALSE if not
+ *************************************************************************/
+BOOL testDDPistonPumpStartStopOverride( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    // Verify tester has logged in with TD
+    if ( TRUE == isTestingActivated() )
+    {
+        // Verify payload length is valid
+        if ( sizeof( PISTON_PUMP_START_STOP_CMD_PAYLOAD_T ) == message->hdr.payloadLen )
+        {
+            PISTON_PUMP_START_STOP_CMD_PAYLOAD_T payload;
+
+            memcpy( &payload, message->payload, sizeof(PISTON_PUMP_START_STOP_CMD_PAYLOAD_T) );
+
+            if ( (PISTON_PUMPS_T)payload.pumpId < NUM_OF_PISTON_PUMPS )
+            {
+                // Handle start command
+                if ( ( TRUE == payload.startStop ) &&
+                      ( ( payload.speed >= PISTON_PUMP_MIN_SPEED ) && ( payload.speed <= PISTON_PUMP_MAX_SPEED ) ) &&
+                      ( payload.volume > 0.0 ) &&
+                      ( payload.cycleCount > 0 ) )
+                {
+                    startPistonPumpCycle( (PISTON_PUMPS_T)payload.pumpId, payload.cycleCount, payload.volume, payload.speed );
+                    result = TRUE;
+                }
+
+                //Handle stop command
+                if ( FALSE == payload.startStop )
+                {
+                    stopPistonPumpCycle( (PISTON_PUMPS_T)payload.pumpId );
+                    result = TRUE;
+                }
+            }
+        }
+    }
+
+    return result;
+}
+
+#endif
+
+/**@}*/
Index: firmware/App/Controllers/PistonPumpControl.h
===================================================================
diff -u
--- firmware/App/Controllers/PistonPumpControl.h	(revision 0)
+++ firmware/App/Controllers/PistonPumpControl.h	(revision 5aa0b08cb09b06af807687fe03db5137e388da82)
@@ -0,0 +1,74 @@
+/**************************************************************************
+*
+* Copyright (c) 2024-2024 Diality Inc. - All Rights Reserved.
+*
+* THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+* WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+*
+* @file    PistonPumpControl.h
+*
+* @author  (last)      Vinayakam Mani
+* @date    (last)      07-Jan-2025
+*
+* @author  (original)  Vinayakam Mani
+* @date    (original)  07-Jan-2025
+*
+***************************************************************************/
+
+#ifndef __PISTON_PUMP_CONTROL_H__
+#define __PISTON_PUMP_CONTROL_H__
+
+#ifdef __PUMPTEST__
+
+#include "DDCommon.h"
+#include "DDDefs.h"
+
+/**
+ *  @defgroup PistonPumpControl PistonPumpControl
+ *  @brief PistonPumpControl unit. Performs Dosing and ultrafilteration functions via a state machine.
+ *
+ *  @addtogroup PistonPumpControl
+ *  @{
+ */
+
+// ********** public definitions **********
+
+/// Enumeration of piston pumps.
+typedef enum PistonPump
+{
+    PISTONPUMPS_ACID = 0,                                  ///< Acid piston pump
+    PISTONPUMPS_FIRST = PISTONPUMPS_ACID,                  ///< First piston pump in list
+    PISTONPUMPS_BICARB,                                    ///< Bicarbonate piston pump
+    PISTONPUMPS_UF,                                        ///< Ultrafilteration piston pump
+    NUM_OF_PISTON_PUMPS                                    ///< Number of piston pumps
+} PISTON_PUMPS_T;
+
+/// piston pump control data structure
+typedef struct
+{
+    U32 acidPumpControlExecState;                       ///< Acid piston pump control execution state
+    U32 bicarbPumpControlExecState;                     ///< Bicarb piston pump control execution state
+    U32 ufPumpControlExecState;                         ///< UF piston pump control execution state
+    U32 acidPistonPumpSwCounter;                        ///< Acid piston pump switching counter
+    U32 bicarbPistonPumpSwCounter;                      ///< Bicarb piston pump switching counter
+    U32 ufPistonPumpSwCounter;                          ///< UF piston pump switching counter
+    U32 acidPistonPumpCycleCount;                       ///< Acid piston cycle count
+    U32 bicarbPistonPumpCycleCount;                     ///< Bicarb piston cycle count
+    U32 ufPistonPumpCycleCount;                         ///< UF piston cycle count
+} PISTON_PUMP_CONTROL_DATA_T;
+
+// ********** public function prototypes **********
+
+void initPistonPumpControl( void );                                     // Initialize piston pump control unit
+void execPistonPumpControl( void );                                      // Execute the piston pump control state machine
+void startPistonPumpCycle( PISTON_PUMPS_T pumpId, U32 cycleCount, F32 targetVolume_ml, F32 speed ); // Set the piston pump parameters
+void stopPistonPumpCycle( PISTON_PUMPS_T pumpId );                      // Stop the piston pump
+
+BOOL testDDPistonPumpControlDataPublishIntervalOverride( MESSAGE_T *message ); // To override the piston pump control data publish interval
+BOOL testDDPistonPumpStartStopOverride( MESSAGE_T *message );                  // To override the piston pump start/stop control
+
+/**@}*/
+
+#endif
+
+#endif
Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -rbc1ec8e71e5e5e7aef6d84775e07f5935653593f -r5aa0b08cb09b06af807687fe03db5137e388da82
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision bc1ec8e71e5e5e7aef6d84775e07f5935653593f)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 5aa0b08cb09b06af807687fe03db5137e388da82)
@@ -230,6 +230,9 @@
             if ( ( VDR == valveID )  || ( VTD == valveID )  || ( VHB == valveID )  || ( VRP == valveID )  || ( VHO == valveID )  ||
                  ( VDB1 == valveID ) || ( VP1 == valveID )  || ( VPT == valveID )  || ( VDB2 == valveID ) || ( VDI == valveID )  ||
                  ( VDO == valveID )  || ( VP2 == valveID )  || ( VHI == valveID )  || ( VWI == valveID )  || ( BCV1 == valveID ) ||
+#ifdef __PUMPTEST__
+                 ( UF1 == valveID )  || ( UF2 == valveID )  ||
+#endif
                  ( BCV2 == valveID ) || ( BCV3 == valveID ) || ( BCV4 == valveID ) || ( BCV5 == valveID ) || ( BCV6 == valveID ) ||
                  ( BCV7 == valveID ) || ( BCV8 == valveID ) || ( UFI1 == valveID ) || ( UFO1 == valveID ) || ( UFI2 == valveID ) ||
                  ( UFO2 == valveID ) )
Index: firmware/App/Controllers/Valves.h
===================================================================
diff -u -rbc1ec8e71e5e5e7aef6d84775e07f5935653593f -r5aa0b08cb09b06af807687fe03db5137e388da82
--- firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision bc1ec8e71e5e5e7aef6d84775e07f5935653593f)
+++ firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 5aa0b08cb09b06af807687fe03db5137e388da82)
@@ -47,9 +47,15 @@
     VP2,                                          ///< Valve Dialysate Out Purge 2 (D47)
     VHI,                                          ///< Valve Hydraulics Inlet (D3)
     VWI,                                          ///< Valve Water Inlet (M4)
+#ifdef __PUMPTEST__
+    UF1,                                          ///< UF1 valve
+    UF2,                                          ///< UF2 valve
+    LAST_HYD_VALVE = UF2,                         ///< End of Hydraulics valve of group
+#else
     LAST_HYD_VALVE = VWI,                         ///< End of Hydraulics valve of group
     RSRVD_SPACE1,                                 ///< This space has been reserved
     RSRVD_SPACE2,                                 ///< This space has been reserved
+#endif
     FIRST_BC_VALVE,                               ///< Start of Balancing Chamber valve group
     BCV1 = FIRST_BC_VALVE,                        ///< Balancing chamber Valve 1 (D23)
     BCV2,                                         ///< Balancing chamber Valve 2 (D19)
Index: firmware/App/Services/AlarmMgmtSWFaults.h
===================================================================
diff -u -r9102c5da21a15bdaf4bb3bc38795ceb064e3c443 -r5aa0b08cb09b06af807687fe03db5137e388da82
--- firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 9102c5da21a15bdaf4bb3bc38795ceb064e3c443)
+++ firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 5aa0b08cb09b06af807687fe03db5137e388da82)
@@ -133,6 +133,10 @@
     SW_FAULT_ID_GEND_MODE_INVALID_EXEC_STATE = 102,
     SW_FAULT_ID_GEND_MODE_INVALID_EXEC_STATE1 = 103,
     SW_FAULT_ID_INVALID_RO_OPERATING_MODE = 104,
+#ifdef __PUMPTEST__
+    SW_FAULT_ID_PISTON_PUMP_EXEC_INVALID_STATE = 105,
+    SW_FAULT_ID_PISTON_PUMP_INVALID_PUMP_ID = 106,
+#endif
     NUM_OF_SW_FAULT_IDS
 } SW_FAULT_ID_T;
 
Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -rbc1ec8e71e5e5e7aef6d84775e07f5935653593f -r5aa0b08cb09b06af807687fe03db5137e388da82
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision bc1ec8e71e5e5e7aef6d84775e07f5935653593f)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 5aa0b08cb09b06af807687fe03db5137e388da82)
@@ -31,6 +31,9 @@
 #include "ModeGenDialysate.h"
 #include "OperationModes.h"
 #include "PAL.h"
+#ifdef __PUMPTEST__
+#include "PistonPumpControl.h"
+#endif
 #include "Pressure.h"
 #include "SystemCommDD.h"
 #include "Temperature.h"
@@ -137,7 +140,11 @@
     MSG_ID_DD_DIAL_DELIVERY_IN_PROGRESS_OVERRIDE_REQUEST,
     MSG_ID_DD_DIAL_DELIVERY_GOOD_TO_DELIVER_OVERRIDE_REQUEST,
     MSG_ID_DD_HEATERS_TARGET_TEMPERATURE_OVERRIDE_REQUEST,                            //55
-    MSG_ID_DD_BC_VALVE_STATES_OVERRIDE_REQUEST
+    MSG_ID_DD_BC_VALVE_STATES_OVERRIDE_REQUEST,
+#ifdef __PUMPTEST__
+    MSG_ID_DD_PISTON_PUMP_DATA_PUBLISH_OVERRIDE_REQUEST,
+    MSG_ID_DD_PISTON_PUMP_DATA_PUBLISH_OVERRIDE_REQUEST
+#endif
 };
 
 /// Message handling function table
@@ -197,7 +204,11 @@
     &testDialDeliveryInProgressOverride,
     &testDialGoodToDeliverStatusOverride,
     &testHeaterTargetTemperatureOverride,                                              //55
-    &testBCValveStatesOverride
+    &testBCValveStatesOverride,
+#ifdef __PUMPTEST__
+    &testDDPistonPumpControlDataPublishIntervalOverride,
+    &testDDPistonPumpStartStopOverride,
+#endif
 };
 
 #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLERS) / sizeof(MsgFuncPtr))