Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -rab7dfc361e5ee347141842b317f1fc2f16e4e3f3 -r3555f182983cb3852f1e414017d11aeb537d3274
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision ab7dfc361e5ee347141842b317f1fc2f16e4e3f3)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 3555f182983cb3852f1e414017d11aeb537d3274)
@@ -1,15 +1,15 @@
 
 /**************************************************************************
 *
-* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file FPGA.c
 *
-* @author (last) Peman Montazemi
-* @date (last) 09-Mar-2021
+* @author (last) H. Nguyen
+* @date (last) 21-Oct-2021
 *
 * @author (original) Dara Navaei
 * @date (original) 05-Nov-2019
@@ -186,16 +186,13 @@
     U16 fpgaFanIn3Pulse;                    ///< Reg 400. Fan inlet 3 pulse time in 2.5 resolution
     U16 fpgaFanOut3Pulse;                   ///< Reg 402. Fan outlet 3 pulse time in 2.5 resolution
     U16 fpgaTimerCount_ms;                  ///< Reg 404. Internal FPGA timer count in ms.
-
-    U16 fpgaADCVccInt;                      ///< Reg 406. Internal FPGA Vcc Voltage.
-    U16 fpgaADCVccAux;                      ///< Reg 408. Internal FPGA Vcc auxiliary voltage.
-    U16 fpgaADCVPVN;                        ///< Reg 410. Internal FPGA VPVN voltage.
-
-    U16 fpgaROPumpFeedback;                 ///< Reg 412. RO pump duty cycle feedback.
-    U16 fpgaDrainPumpSpeedFeedback;         ///< Reg 414. Drain pump speed feedback.
-    U16 fpgaDrainPumpCurrentFeedback;       ///< Reg 416. Drain pump current feedback.
-
-    U16 fpgaFMPROFlowTemporary;             ///< Reg 418. FMP flow sensor temporary register.
+    U16 fpgaVccIntVoltage;                  ///< Req 406. Internal FPGA Vcc Int voltage
+    U16 fpgaVccAuxVoltage;                  ///< Req 408. Internal FPGA Vcc Aux voltage
+    U16 fpgaVpvnVoltage;                    ///< Req 410. Internal FPGA VPVN voltage
+    U16 fpgaRoPumpFeedBack;                 ///< Req 412. Internal FPGA RO pump feedback register
+    U16 fpgaDrainPumpSpeedMeasure;          ///< Req 414. Drain pump speed measurement
+    U16 fpgaDrainPumpCurrent;               ///< Req 416. Drain pump electrical current measurement
+    U16 fpgaDialysateFlowRate;              ///< Req 418. Dialysate flow rate measurement
 } DG_FPGA_SENSORS_T;
 
 typedef struct
@@ -1190,6 +1187,18 @@
 
 /*********************************************************************//**
  * @brief
+ * The getFPGADialysateFlowRate function gets the latest dialysate flow rate.
+ * @details Inputs: fpgaSensorReadings.fpgaDialysateFlowRate
+ * @details Outputs: none
+ * @return last dialysate flow rate reading
+ *************************************************************************/
+U16 getFPGADialysateFlowRate( void )
+{
+    return fpgaSensorReadings.fpgaDialysateFlowRate;
+}
+
+/*********************************************************************//**
+ * @brief
  * The getFPGADrainPumpSpeed function gets the latest sensed drain pump speed.
  * @details Inputs: fpgaSensorReadings.fpgaDrainPumpSpeed
  * @details Outputs: none
@@ -1936,9 +1945,4 @@
     return ( fpgaSensorReadings.fpgaGPIO & CONCENTRATE_CAP_SWITCH_MASK );
 }
 
-U16 getFPGAFMPTemporaryFlow( void )
-{
-    return fpgaSensorReadings.fpgaFMPROFlowTemporary;
-}
-
 /**@}*/