Index: firmware/App/Services/FpgaDD.c
===================================================================
diff -u -r812ad8c00b6e976736cc3af210adeaa125f5478d -rc400845083cc6fc90f70f308ae953e05b45acbf8
--- firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision 812ad8c00b6e976736cc3af210adeaa125f5478d)
+++ firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision c400845083cc6fc90f70f308ae953e05b45acbf8)
@@ -102,6 +102,10 @@
 #define FPGA_D5_HEATER_CNTRL_BIT        0x01                    ///< FPGA GIO D5 heater control bit mask
 #define FPGA_D5_HEATER_PWM_ENABLE_BIT   0x02                    ///< FPGA D5 PWM based heater control bit mask
 
+#define MAX_PUMP_SPEED                  3000.0F                 ///< Maxon controller pump maximum speed
+#define PUMP_SPEED_OFFSET               168.7F                  ///< Speed Scale adjustment intercept factor
+#define PUMP_SPEED_FULL_SCALE           3187.0F                 ///< Speed scale adjustment slope factor
+
 /// FPGA size of V3 read bytes.
 #define FPGA_SIZE_OF_V3_READ_BYTES      ( FPGA_READ_V3_END_BYTE_NUM - FPGA_READ_V3_START_BYTE_NUM )
 
@@ -568,7 +572,16 @@
  *************************************************************************/
 void setFPGAD48PumpSpeed( U16 speed )
 {
-    fpgaActuatorSetPoints.fpgaD48PumpSpeed = speed;
+#ifdef __MAXON_SPEED_UPDATE__
+    {
+        U16 currentSpeed =(U16)( ( ( speed + PUMP_SPEED_OFFSET  ) / PUMP_SPEED_FULL_SCALE ) *  MAX_PUMP_SPEED );
+        fpgaActuatorSetPoints.fpgaD48PumpSpeed = currentSpeed;
+    }
+#else
+    {
+        fpgaActuatorSetPoints.fpgaD48PumpSpeed = speed;
+    }
+#endif
 }
 
 /*********************************************************************//**
@@ -582,7 +595,16 @@
  *************************************************************************/
 void setFPGAD12PumpSpeed( U16 speed )
 {
-    fpgaActuatorSetPoints.fpgaD12PumpSpeed = speed;
+#ifdef __MAXON_SPEED_UPDATE__
+    {
+        U16 currentSpeed =(U16)( ( ( speed + PUMP_SPEED_OFFSET  ) / PUMP_SPEED_FULL_SCALE ) *  MAX_PUMP_SPEED );
+        fpgaActuatorSetPoints.fpgaD12PumpSpeed = currentSpeed;
+    }
+#else
+    {
+        fpgaActuatorSetPoints.fpgaD12PumpSpeed = speed;
+    }
+#endif
 }
 
 /*********************************************************************//**