Index: firmware/App/Controllers/DrainPump.c
===================================================================
diff -u -r2e3b3b2034ee5afb52a8630568145c9705afff9f -r1a5efe97f5f39594b45797fded52cafce92afe80
--- firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision 2e3b3b2034ee5afb52a8630568145c9705afff9f)
+++ firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision 1a5efe97f5f39594b45797fded52cafce92afe80)
@@ -47,12 +47,17 @@
                                                 DRP_SPEED_RPM_TO_ADC_FACTOR ) + FLOAT_TO_INT_ROUNDUP_OFFSET )   ///< Drain pump minimum RPM to DAC conversion.
 #define DRAIN_PUMP_MAX_DAC                     ( ( (F32)MAX_DRAIN_PUMP_RPM * \
                                                 DRP_SPEED_RPM_TO_ADC_FACTOR ) + FLOAT_TO_INT_ROUNDUP_OFFSET )   ///< Drain pump maximum RPM to DAC conversion.
+#define DRP_SPEED_ADC_TO_RPM_CONVERSION        12.94                                     // TODO remove                       ///< Conversion factor from ADC counts to RPM for Drain pump.
+#define DRP_SPEED_RPM_TO_ADC_FACTOR            ( 1.0 / DRP_SPEED_ADC_TO_RPM_CONVERSION ) // TODO remove                       ///< Conversion factor from RPM to ADC counts for Drain pump.
+
 #define DRAIN_PUMP_DATA_PUB_INTERVAL           ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL )                       ///< Interval (ms/task time) at which the Drain Pump data is published on the CAN bus.
 
 #define DRP_CONTROL_INTERVAL                   ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )                        ///< Interval (ms/task time) at which the Drain pump is controlled.
 
-#define DRP_SPEED_ADC_TO_RPM_CONVERSION        12.94                                                            ///< Conversion factor from ADC counts to RPM for Drain pump.
-#define DRP_SPEED_RPM_TO_ADC_FACTOR            ( 1.0 / DRP_SPEED_ADC_TO_RPM_CONVERSION )                        ///< Conversion factor from RPM to ADC counts for Drain pump.
+#define RPM_2_DAC_SLOPE                        0.0547                                                           ///< RPM to DAC conversion slope.
+#define RPM_2_DAC_INTERCEPT                    2.9968                                                           ///< RPM to DAC conversion intercept.
+#define GET_RPM_2_DAC_CONVERSION(rpm)          ( ( RPM_2_DAC_SLOPE * rpm ) - RPM_2_DAC_INTERCEPT + \
+                                                   FLOAT_TO_INT_ROUNDUP_OFFSET )                                ///< RPM to DAC conversion equation.
 
 #define TOGGLE_PERIOD_RESOLUTION_SECONDS       0.000005                                                         ///< Toggle period to resolution in seconds.
 #define ROTATIONAL_TO_TOGGLE_PERIOD_CONVERSION 4                                                                ///< Rotational to toggle period conversion coefficient.
@@ -174,8 +179,10 @@
 
     if ( ( 0 == rpm ) || ( ( rpm >= MIN_DRAIN_PUMP_RPM ) && ( rpm <= MAX_DRAIN_PUMP_RPM ) ) )
     {
-        drainPumpDAC = (U32)((F32)rpm * DRP_SPEED_RPM_TO_ADC_FACTOR + FLOAT_TO_INT_ROUNDUP_OFFSET);
+        //drainPumpDAC = (U32)((F32)rpm * DRP_SPEED_RPM_TO_ADC_FACTOR + FLOAT_TO_INT_ROUNDUP_OFFSET); //TODO remove. Yes, it is temporary don't laugh
 
+        drainPumpDAC = (U32)GET_RPM_2_DAC_CONVERSION(rpm);
+
         targetDrainPumpRPM      = rpm;
         drainPumpControlMode    = PUMP_CONTROL_MODE_OPEN_LOOP;
         drainPumpControlModeSet = drainPumpControlMode;