Index: firmware/App/Controllers/DialysatePumps.h
===================================================================
diff -u -rbbcdba8850dd6f6a53044eca6a5ece611654653a -r60165f6d155831cfce06560fb45abaaaadea9798
--- firmware/App/Controllers/DialysatePumps.h	(.../DialysatePumps.h)	(revision bbcdba8850dd6f6a53044eca6a5ece611654653a)
+++ firmware/App/Controllers/DialysatePumps.h	(.../DialysatePumps.h)	(revision 60165f6d155831cfce06560fb45abaaaadea9798)
@@ -24,49 +24,52 @@
  *  @defgroup DialysatePumps DialysatePumps
  *  @brief Dialysate Pumps monitor/controller module. Controls and monitors the dialysate pumps.
  *  Dialysate pump manufacturer: Diener Silencer Series Gear Pumps, PN: 01483-PM-3-RA.
- *  The pump shall produce flow rates of 50-4500 ml/min.
+ *  The pump shall produce flow rates of 350-2700 ml/min.
  *
  *  @addtogroup DialysatePumps
  *  @{
  */
 
 // ********** public definitions **********
 
-#define MIN_DIALYSATE_PUMP_RPM       300     ///< Minimum RPM target for dialysate pump (though zero is allowed if turning pump off).
-#define MAX_DIALYSATE_PUMP_RPM       4500    ///< Maximum RPM target for dialysate pump.
+#define MIN_DIALYSATE_PUMP_RPM       350            ///< Minimum RPM target for dialysate pump (though zero is allowed if turning pump off).
+#define MAX_DIALYSATE_PUMP_RPM       2650           ///< Maximum RPM target for dialysate pump.
 
+#define MIN_DIALYSATE_FLOW_RATE      ( 100.0F )     ///< Minimum dialysate flow rate
+#define MAX_DIALYSATE_FLOW_RATE      ( 600.0F )     ///< Maximum dialysate flow rate
+
 /// Enumeration of dialysate pumps.
 typedef enum DialysatePumps
 {
-    FRESH_DIALYSATE_PUMP = 0,                               ///< Fresh dialysate pump
-    DIALYSATE_PUMPS_FIRST = FRESH_DIALYSATE_PUMP,           ///< First dialysate pump in list
-    SPENT_DIALYSATE_PUMP,                                   ///< Spent dialysate pump
-    NUM_OF_DIALYSATE_PUMPS                                  ///< Number of dialysate pumps
+    D12_PUMP = 0,                               ///< Fresh dialysate pump
+    DIALYSATE_PUMPS_FIRST = D12_PUMP,           ///< First dialysate pump in list
+    D48_PUMP,                                   ///< Spent dialysate pump
+    NUM_OF_DIALYSATE_PUMPS                      ///< Number of dialysate pumps
 } DIALYSATE_PUMPS_T;
 
 /// Dialysate pumps data publish
 typedef struct
 {
-    F32 freshDialPumpTargetRPM;                     ///< Fresh dialysate pump speed set point.
-    F32 spentDialPumpTargetRPM;                     ///< Spent dialysate pump speed set point.
-    F32 freshDialPumpMeasuredSpeed;                 ///< Fresh dialysate pump measured speed.
-    F32 spentDialPumpMeasuredSpeed;                 ///< Spent dialysate pump measured speed.
-    F32 freshDialPumpCurrentSpeed;                  ///< Fresh dialysate pump current speed.
-    F32 spentDialPumpCurrentSpeed;                  ///< Spent dialysate pump current speed.
-    U32 freshDialPumpState;                         ///< Fresh dialysate pump state machine state.
-    U32 spentDialPumpState;                         ///< Spent state machine state.
-    F32 freshDialPumpTargetPressure;                ///< Fresh dialysate pump target pressure.
-    F32 spentDialPumpTargetPressure;                ///< Spent dialysate pump target pressure.
-    F32 freshDialPumpMeasuredPressure;              ///< Fresh dialysate pump measured pressure.
-    F32 spentDialPumpMeasuredPressure;              ///< Spent dialysate pump measured pressure.
-    F32 freshDialPumpMeasuredCurrent;               ///< Fresh dialysate pump measured current.
-    F32 spentDialPumpMeasuredCurrent;               ///< Spent dialysate pump measured current.
-    U32 freshDialPumpControl;                       ///< Fresh dialysate pump control to check run/stop state.
-    U32 spentDialPumpControl;                       ///< Spent dialysate pump control to check run/stop state.
-    U32 freshDialPumpDirErrCnt;                     ///< Fresh dialysate pump direction error count.
-    U32 spentDialPumpDirErrCnt;                     ///< Spent dialysate pump direction error count.
-    U32 freshDialPumpMeasuredDir;                   ///< Fresh dialysate pump direction.
-    U32 spentDialPumpMeasuredDir;                   ///< Spent dialysate pump direction.
+    F32 d12PumpTargetRPM;                     ///< Fresh dialysate pump speed set point.
+    F32 d48PumpTargetRPM;                     ///< Spent dialysate pump speed set point.
+    F32 d12PumpMeasuredSpeed;                 ///< Fresh dialysate pump measured speed.
+    F32 d48PumpMeasuredSpeed;                 ///< Spent dialysate pump measured speed.
+    F32 d12PumpCurrentSpeed;                  ///< Fresh dialysate pump current speed.
+    F32 d48PumpCurrentSpeed;                  ///< Spent dialysate pump current speed.
+    U32 d12PumpState;                         ///< Fresh dialysate pump state machine state.
+    U32 d48PumpState;                         ///< Spent state machine state.
+    F32 d12PumpTargetPressure;                ///< Fresh dialysate pump target pressure.
+    F32 d48PumpTargetPressure;                ///< Spent dialysate pump target pressure.
+    F32 d12PumpMeasuredPressure;              ///< Fresh dialysate pump measured pressure.
+    F32 d48PumpMeasuredPressure;              ///< Spent dialysate pump measured pressure.
+    F32 d12PumpMeasuredCurrent;               ///< Fresh dialysate pump measured current.
+    F32 d48PumpMeasuredCurrent;               ///< Spent dialysate pump measured current.
+    U32 d12PumpControl;                       ///< Fresh dialysate pump control to check run/stop state.
+    U32 d48PumpControl;                       ///< Spent dialysate pump control to check run/stop state.
+    U32 d12PumpDirErrCnt;                     ///< Fresh dialysate pump direction error count.
+    U32 d48PumpDirErrCnt;                     ///< Spent dialysate pump direction error count.
+    U32 d12PumpMeasuredDir;                   ///< Fresh dialysate pump direction.
+    U32 d48PumpMeasuredDir;                   ///< Spent dialysate pump direction.
 } DIALYSATE_PUMPS_PUBLISH_DATA_T;
 
 // ********** public function prototypes **********
@@ -91,6 +94,7 @@
 BOOL testDialysatePumpTargetPressureOverride( MESSAGE_T *message );
 BOOL testDialysatePumpMeasuredCurrentOverride( MESSAGE_T *message );
 BOOL testDialysatePumpMeasuredDirectionOverride( MESSAGE_T *message );
+BOOL testDialysatePumpStartStopOverride( MESSAGE_T *message );
 
 /**@}*/