Index: firmware/App/Controllers/DialysatePumps.h
===================================================================
diff -u -r3bafab778c613a1abd0c421128320408db407ef8 -rac5e52d907ff6adad795d8f81ca8206c5cd33c77
--- firmware/App/Controllers/DialysatePumps.h	(.../DialysatePumps.h)	(revision 3bafab778c613a1abd0c421128320408db407ef8)
+++ firmware/App/Controllers/DialysatePumps.h	(.../DialysatePumps.h)	(revision ac5e52d907ff6adad795d8f81ca8206c5cd33c77)
@@ -32,20 +32,11 @@
 
 // ********** public definitions **********
 
-#define MIN_DIALYSATE_PUMP_RPM                  200                             ///< 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_PUMP_RPM                  200                             ///< Minimum RPM target for D12 pump and D48 Diener 2000 pump.
+#define MAX_DIALYSATE_PUMP_RPM                  2650                            ///< Maximum RPM target for D12 pump and D48 Diener 2000 pump.
 
-#ifdef __NEW_D48_PUMP__
-
-#define MIN_DIALYSATE_PUMP_RPM                  200                             ///< Minimum RPM target for dialysate pump (though zero is allowed if turning pump off).
-#define MAX_DIALYSATE_PUMP_RPM                  1300                            ///< Maximum RPM target for dialysate pump.
-
-#else
-
-#define MIN_DIALYSATE_PUMP_RPM                  200                             ///< 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.
-
-#endif
+#define D48_DIENER_1000_MIN_RPM                 134                             ///< Minimum RPM for D48 Diener 1000 pump (test config enabled).
+#define D48_DIENER_1000_MAX_RPM                 2770                             ///< Maximum RPM for D48 Diener 1000 pump (test config enabled).
 #define DEGAS_PUMP_TARGET_PRES_ADJ_THRESHOLD    -1.0F                           ///< Dialysate Pump(D12) target pressure threshold adjustment factor.
 
 #define MIN_DIALYSATE_FLOW_RATE                 ( 100.0F )                      ///< Minimum dialysate flow rate
@@ -92,6 +83,8 @@
 void execDialysatePumpController( void );
 SELF_TEST_STATUS_T execDialysatePumpSelfTest( void );
 
+U32 getD48MinPumpRPM( void );
+U32 getD48MaxPumpRPM( void );
 F32 getDialysatePumpTargetSpeed( DIALYSATE_PUMPS_T pumpId );
 F32 getDialysatePumpMeasuredSpeed( DIALYSATE_PUMPS_T pumpId );
 F32 getDialysatePumpTargetPressure( DIALYSATE_PUMPS_T pumpId );