Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r44a100f8e5210a02c23b8fcc4527d8e96d577381 -rabbad386f4cc94f315300dffef321fe8c03fbd52
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 44a100f8e5210a02c23b8fcc4527d8e96d577381)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision abbad386f4cc94f315300dffef321fe8c03fbd52)
@@ -163,8 +163,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 };
@@ -203,6 +201,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 **********
 
@@ -224,7 +223,8 @@
 static void checkDialInPumpFlowAgainstSpeed( void );
 static void checkDialInPumpMCCurrent( void );
 static void checkDialInFlowSensorSignalStrength( void );
-static U32  getPublishDialInFlowDataInterval( void );
+static U32  getPublishDialInFlowDataInterval( void );
+static BOOL processCalibrationData( void );
 
 /*********************************************************************//**
  * @brief
@@ -414,16 +414,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 ) ) )
     {
@@ -748,6 +761,52 @@
 
     return result;
 }
+
+/*********************************************************************//**
+ * @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
@@ -1288,25 +1347,20 @@
  *************************************************************************/
 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 )
     {
-#ifndef DISABLE_CAL_CHECK
-        if ( cal.hdFlowSensors[ CAL_DATA_HD_DIALYZER_FLOW_SENSOR ].calibrationTime == 0 )
+        BOOL calStatus = processCalibrationData();
+
+        if ( TRUE == calStatus )
         {
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_DIALYSATE_FLOW_INVALID_CALIBRATION, cal.hdFlowSensors[ CAL_DATA_HD_DIALYZER_FLOW_SENSOR ].calibrationTime,
-                                       cal.hdFlowSensors[ CAL_DATA_HD_DIALYZER_FLOW_SENSOR ].crc );
+            result = SELF_TEST_STATUS_PASSED;
         }
         else
-#endif
         {
-            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;
+            result = SELF_TEST_STATUS_FAILED;
         }
     }
     else