Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r7a7bf19d0cf16745566956f45cef57f8eb5df445 -r8466e63f95f65a3ffb18c3af85ac99328e41167b
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 7a7bf19d0cf16745566956f45cef57f8eb5df445)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 8466e63f95f65a3ffb18c3af85ac99328e41167b)
@@ -87,13 +87,8 @@
 #define DIP_MAX_CURR_WHEN_RUNNING_MA         2000.0          ///< Motor controller current should not exceed this when pump should be running.
 #define DIP_MAX_CURR_ERROR_DURATION_MS       2000            ///< Motor controller current errors persisting beyond this duration will trigger an alarm.
 
-#ifndef V2_0_SYSTEM
-    #define DIP_SPEED_ADC_TO_RPM_FACTOR          1.751752    ///< Conversion factor from ADC counts to RPM for dialIn pump motor.
-    #define DIP_MOTOR_RPM_TO_PWM_DC_FACTOR       0.000193    ///< ~52 BP motor RPM = 1% PWM duty cycle
-#else
-    #define DIP_SPEED_ADC_TO_RPM_FACTOR          1.280938    ///< Conversion factor from ADC counts to RPM for dialIn pump motor
-    #define DIP_MOTOR_RPM_TO_PWM_DC_FACTOR       0.0003125   ///< ~32 BP motor RPM = 1% PWM duty cycle
-#endif
+#define DIP_SPEED_ADC_TO_RPM_FACTOR          1.751752        ///< Conversion factor from ADC counts to RPM for dialIn pump motor.
+#define DIP_MOTOR_RPM_TO_PWM_DC_FACTOR       0.000193        ///< ~52 BP motor RPM = 1% PWM duty cycle
 #define DIP_CURRENT_ADC_TO_MA_FACTOR         3.002           ///< Conversion factor from ADC counts to mA for dialIn pump motor.
 
 #define DIP_REV_PER_LITER                    150.0           ///< Rotor revolutions per liter.
@@ -104,11 +99,7 @@
 /// Macro converts flow rate to estimate PWM needed to achieve it.
 #define DIP_PWM_FROM_ML_PER_MIN(rate)        ( (rate) * DIP_ML_PER_MIN_TO_PUMP_RPM_FACTOR * DIP_GEAR_RATIO * DIP_MOTOR_RPM_TO_PWM_DC_FACTOR + DIP_PWM_ZERO_OFFSET )
 /// Conversion from PWM duty cycle % to commanded pump motor speed.
-#ifndef V2_0_SYSTEM
-    #define DIP_PWM_TO_MOTOR_SPEED_RPM(pwm)      ( ((pwm) - DIP_PWM_ZERO_OFFSET) * 4000.0 )
-#else
-    #define DIP_PWM_TO_MOTOR_SPEED_RPM(pwm)      ( ((pwm) - DIP_PWM_ZERO_OFFSET) * 3200.0 )
-#endif
+#define DIP_PWM_TO_MOTOR_SPEED_RPM(pwm)      ( ((pwm) - DIP_PWM_ZERO_OFFSET) * 4000.0 )
 
 #define DIAL_IN_PUMP_ADC_FULL_SCALE_V        3.0             ///< BP analog signals are 0-3V (while int. ADC ref V may be different).
 #define DIAL_IN_PUMP_ADC_ZERO                1998            ///< Mid-point (zero) for ADC readings.
@@ -173,8 +164,6 @@
 static MOTOR_DIR_T dialInPumpDirectionSet = MOTOR_DIR_FORWARD;                      ///< Currently set dialysate flow direction
 static PUMP_CONTROL_MODE_T dialInPumpControlMode = PUMP_CONTROL_MODE_CLOSED_LOOP;   ///< Requested dialIn pump control mode.
 static PUMP_CONTROL_MODE_T dialInPumpControlModeSet = PUMP_CONTROL_MODE_CLOSED_LOOP;///< Currently set dialIn pump control mode.
-static F32 dialInFlowCalGain = 1.0;                                                 ///< Dialysate flow calibration gain.
-static F32 dialInFlowCalOffset = 0.0;                                               ///< Dialysate flow calibration offset.
 
 /// Interval (in ms) at which to publish dialIn flow data to CAN bus
 static OVERRIDE_U32_T dialInFlowDataPublishInterval = { DIAL_IN_FLOW_DATA_PUB_INTERVAL, DIAL_IN_FLOW_DATA_PUB_INTERVAL, DIAL_IN_FLOW_DATA_PUB_INTERVAL, 0 };
@@ -213,6 +202,7 @@
 static U08 lastDialysateFlowSlowPacketReadCtr = 0;                                  ///< Previous read counter for the dialysate flow slow packets.
 static U08 lastDialInPumpDirectionCount = 0;                                        ///< Previous pump direction error count reported by FPGA.
 static U08 lastDialysateFlowCommErrorCount = 0;                                     ///< Previous DPi flow sensor comm error count.
+static HD_FLOW_SENSORS_CAL_RECORD_T dialysateFlowCalRecord;                         ///< Dialysate flow sensor calibration record.
 
 // ********** private function prototypes **********
 
@@ -234,6 +224,7 @@
 static void checkDialInPumpFlowAgainstSpeed( void );
 static void checkDialInPumpMCCurrent( void );
 static void checkDialInFlowSensorSignalStrength( void );
+static BOOL processCalibrationData( void );
 
 /*********************************************************************//**
  * @brief
@@ -428,16 +419,29 @@
  * @return none
  *************************************************************************/
 void execDialInFlowMonitor( void )
-{
+{
+    // Check if a new calibration is available
+    if ( TRUE == isNewCalibrationRecordAvailable() )
+    {
+        // Get the new calibration data and check its validity
+        processCalibrationData();
+    }
+
     HD_OP_MODE_T opMode = getCurrentOperationMode();
     U16 dipRPM = getIntADCReading( INT_ADC_DIAL_IN_PUMP_SPEED );
     U16 dipmA = getIntADCReading( INT_ADC_DIAL_IN_PUMP_MOTOR_CURRENT );
-    F32 dipFlow = ( getFPGADialysateFlow() * dialInFlowCalGain ) + dialInFlowCalOffset;
     U08 fpReadCtr = getFPGADialysateFlowFastPacketReadCounter();
     U08 spReadCtr = getFPGADialysateFlowSlowPacketReadCounter();
     U08 flowErrorCtr = getFPGADialysateFlowErrorCounter();
     U08 flowStatus = getFPGADialysateFlowMeterStatus();
 
+    F32 fpgaDialysateFlow = getFPGADialysateFlow();
+    F32 dipFlow = pow(fpgaDialysateFlow, 4) * dialysateFlowCalRecord.hdFlowSensors[ CAL_DATA_HD_DIALYSATE_FLOW_SENSOR ].fourthOrderCoeff +
+                  pow(fpgaDialysateFlow, 3) * dialysateFlowCalRecord.hdFlowSensors[ CAL_DATA_HD_DIALYSATE_FLOW_SENSOR ].thirdOrderCoeff  +
+                  pow(fpgaDialysateFlow, 2) * dialysateFlowCalRecord.hdFlowSensors[ CAL_DATA_HD_DIALYSATE_FLOW_SENSOR ].secondOrderCoeff +
+                      fpgaDialysateFlow     * dialysateFlowCalRecord.hdFlowSensors[ CAL_DATA_HD_DIALYSATE_FLOW_SENSOR ].gain +
+                                              dialysateFlowCalRecord.hdFlowSensors[ CAL_DATA_HD_DIALYSATE_FLOW_SENSOR ].offset;
+
 #ifndef DISABLE_PUMP_FLOW_CHECKS
     if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_DP_FLOW_SENSOR_ERROR, ( flowErrorCtr != lastDialysateFlowCommErrorCount ) ) )
     {
@@ -739,6 +743,52 @@
 
 /*********************************************************************//**
  * @brief
+ * The processCalibrationData function gets the calibration data and makes
+ * sure it is valid by checking the calibration date. The calibration date
+ * should not be 0.
+ * @details Inputs: none
+ * @details Outputs: dialysateFlowCalRecord
+ * @return TRUE if the calibration record is valid, otherwise FALSE
+ *************************************************************************/
+static BOOL processCalibrationData( void )
+{
+    BOOL status = TRUE;
+
+    // Get the calibration record from NVDataMgmt
+    HD_FLOW_SENSORS_CAL_RECORD_T calData = getHDFlowSensorsCalibrationRecord();
+
+    // Check if the calibration data that was received from NVDataMgmt is legitimate
+    // The calibration date item should not be zero. If the calibration date is 0,
+    // then the dialysate flow sensors data is not stored in the NV memory or it was corrupted.
+    if ( 0 == calData.hdFlowSensors[ CAL_DATA_HD_DIALYSATE_FLOW_SENSOR ].calibrationTime )
+    {
+#ifndef SKIP_CAL_CHECK
+        activateAlarmNoData( ALARM_ID_HD_DIALYSATE_FLOW_INVALID_CAL_RECORD );
+        status = FALSE;
+#endif
+    }
+
+    // The calibration data was valid, update the local copy
+    dialysateFlowCalRecord.hdFlowSensors[ CAL_DATA_HD_DIALYSATE_FLOW_SENSOR ].fourthOrderCoeff =
+            calData.hdFlowSensors[ CAL_DATA_HD_DIALYSATE_FLOW_SENSOR ].fourthOrderCoeff;
+
+    dialysateFlowCalRecord.hdFlowSensors[ CAL_DATA_HD_DIALYSATE_FLOW_SENSOR ].thirdOrderCoeff  =
+            calData.hdFlowSensors[ CAL_DATA_HD_DIALYSATE_FLOW_SENSOR ].thirdOrderCoeff;
+
+    dialysateFlowCalRecord.hdFlowSensors[ CAL_DATA_HD_DIALYSATE_FLOW_SENSOR ].secondOrderCoeff =
+            calData.hdFlowSensors[ CAL_DATA_HD_DIALYSATE_FLOW_SENSOR ].secondOrderCoeff;
+
+    dialysateFlowCalRecord.hdFlowSensors[ CAL_DATA_HD_DIALYSATE_FLOW_SENSOR ].gain             =
+            calData.hdFlowSensors[ CAL_DATA_HD_DIALYSATE_FLOW_SENSOR ].gain;
+
+    dialysateFlowCalRecord.hdFlowSensors[ CAL_DATA_HD_DIALYSATE_FLOW_SENSOR ].offset           =
+            calData.hdFlowSensors[ CAL_DATA_HD_DIALYSATE_FLOW_SENSOR ].offset;
+
+    return status;
+}
+
+/*********************************************************************//**
+ * @brief
  * The getTargetDialInFlowRate function gets the current target dialIn flow
  * rate.
  * @details Inputs: targetDialInFlowRate
@@ -1301,20 +1351,24 @@
  *************************************************************************/
 SELF_TEST_STATUS_T execDialInFlowTest( void )
 {
-    SELF_TEST_STATUS_T result = SELF_TEST_STATUS_FAILED;
+    SELF_TEST_STATUS_T result = SELF_TEST_STATUS_IN_PROGRESS;
     U08 const dfmStatus = getFPGADialysateFlowMeterStatus();
-    // Get the flow sensors calibration record
-    HD_FLOW_SENSORS_CAL_RECORD_T cal = getHDFlowSensorsCalibrationRecord();
 
     if ( DFM_SENSOR_PARAM_CORRUPT_STATUS != dfmStatus )
     {
-        dialInFlowCalGain   = cal.hdFlowSensors[ CAL_DATA_HD_DIALYZER_FLOW_SENSOR ].gain;
-        dialInFlowCalOffset = cal.hdFlowSensors[ CAL_DATA_HD_DIALYZER_FLOW_SENSOR ].offset;
-        result = SELF_TEST_STATUS_PASSED;
+        BOOL calStatus = processCalibrationData();
+
+        if ( TRUE == calStatus )
+        {
+            result = SELF_TEST_STATUS_PASSED;
+        }
+        else
+        {
+            result = SELF_TEST_STATUS_FAILED;
+        }
     }
     else
     {
-        result = SELF_TEST_STATUS_FAILED;
         SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_DIALYSATE_FLOW_STATUS_SELF_TEST_FAILURE, (U32)dfmStatus );
     }
 
@@ -1325,6 +1379,7 @@
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
+
 
 /*********************************************************************//**
  * @brief