Index: firmware/App/DDCommon.h
===================================================================
diff -u -r97eba3d39e6ddf44276b77b1aea1171805ca142d -rd5f400afa9c81bf42d813af25961d63132ad297a
--- firmware/App/DDCommon.h	(.../DDCommon.h)	(revision 97eba3d39e6ddf44276b77b1aea1171805ca142d)
+++ firmware/App/DDCommon.h	(.../DDCommon.h)	(revision d5f400afa9c81bf42d813af25961d63132ad297a)
@@ -48,15 +48,9 @@
 //Uncomment below for bicarb chamber filling
 //#define __BICARB_CHAMBER_FILL__   1
 
-//Uncomment below for Maxon controller speed change
-#define __MAXON_SPEED_UPDATE__    1
-
 //Uncomment below to disable heaters debug message
 #define __HEATERS_DEBUG__         1
 
-//Uncomment below for new D48 pump changes
-//#define __NEW_D48_PUMP__    1
-
 //Uncomment below to disable Teensy conductivity driver
 #define __TEENSY_CONDUCTIVITY_DRIVER__  1
 
Index: firmware/App/Services/FpgaDD.c
===================================================================
diff -u -r046bc2b62cf942b7e846fa5bff698b94238edf24 -rd5f400afa9c81bf42d813af25961d63132ad297a
--- firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision 046bc2b62cf942b7e846fa5bff698b94238edf24)
+++ firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision d5f400afa9c81bf42d813af25961d63132ad297a)
@@ -143,6 +143,10 @@
 #define PUMP_SPEED_OFFSET                       168.7F          ///< Speed Scale adjustment intercept factor
 #define PUMP_SPEED_FULL_SCALE                   3187.0F         ///< Speed scale adjustment slope factor
 
+#define DIENER_1000_PUMP_SLOPE                  0.000296F
+#define DIENER_1000_PUMP_INTERCEPT              0.07040F
+#define DIENER_1000_PUMP_SPEED_FULL_SCALE       3150
+
 #pragma pack(push,1)
 /// FPGA header struct.
 typedef struct
@@ -1087,16 +1091,16 @@
  *************************************************************************/
 void setFPGAD48PumpSpeed( U16 speed )
 {
-#ifdef __MAXON_SPEED_UPDATE__  //TODO: Enable for Beat 1/1.9 with Diener silencer 2000 pump.
+    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DIENER_1000_PUMP ))
     {
-        U16 currentSpeed =(U16)( ( ( speed + PUMP_SPEED_OFFSET  ) / PUMP_SPEED_FULL_SCALE ) *  MAX_PUMP_SPEED );
+        U16 currentSpeed = (U16)( ( (  DIENER_1000_PUMP_SLOPE * speed ) + DIENER_1000_PUMP_INTERCEPT) * DIENER_1000_PUMP_SPEED_FULL_SCALE );
         SET_FPGA_ACTUATOR_FIELD( fpgaD48PumpSpeed, currentSpeed );
     }
-#else
+    else
     {
-        SET_FPGA_ACTUATOR_FIELD( fpgaD48PumpSpeed, speed );
+        U16 currentSpeed =(U16)( ( ( speed + PUMP_SPEED_OFFSET  ) / PUMP_SPEED_FULL_SCALE ) *  MAX_PUMP_SPEED );
+        SET_FPGA_ACTUATOR_FIELD( fpgaD48PumpSpeed, currentSpeed );
     }
-#endif
 }
 
 /*********************************************************************//**
@@ -1110,16 +1114,10 @@
  *************************************************************************/
 void setFPGAD12PumpSpeed( U16 speed )
 {
-#ifdef __MAXON_SPEED_UPDATE__  /* Enable for B1.0/B1.9 with Diener Silencer 2000 pumps */
-    {
-        U16 currentSpeed =(U16)( ( ( speed + PUMP_SPEED_OFFSET  ) / PUMP_SPEED_FULL_SCALE ) *  MAX_PUMP_SPEED );
-        SET_FPGA_ACTUATOR_FIELD( fpgaD12PumpSpeed, currentSpeed );
-    }
-#else
-    {
-        SET_FPGA_ACTUATOR_FIELD( fpgaD12PumpSpeed, speed );
-    }
-#endif
+
+    U16 currentSpeed =(U16)( ( ( speed + PUMP_SPEED_OFFSET  ) / PUMP_SPEED_FULL_SCALE ) *  MAX_PUMP_SPEED );
+    SET_FPGA_ACTUATOR_FIELD( fpgaD12PumpSpeed, currentSpeed );
+
 }
 
 /*********************************************************************//**