Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -r021e6ea5f99fd6da424d8ab81d6a106f2cb41294 -r956bf7dbc9e63c875428495061dbdbcdbb8cacb0
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 021e6ea5f99fd6da424d8ab81d6a106f2cb41294)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 956bf7dbc9e63c875428495061dbdbcdbb8cacb0)
@@ -8,8 +8,8 @@
 *
 * @file FPGA.c
 *
-* @author (last) Quang Nguyen
-* @date (last) 18-Sep-2020
+* @author (last) Peman Montazemi
+* @date (last) 09-Mar-2021
 *
 * @author (original) Dara Navaei
 * @date (original) 05-Nov-2019
@@ -23,6 +23,7 @@
 
 #include "FPGA.h"
 #include "Comm.h"
+#include "Compatible.h"
 #include "SystemCommMessages.h"
 #include "Utilities.h"
 
@@ -76,6 +77,8 @@
 
 #define DRAIN_PUMP_DAC_SHIFT_BITS       4                       ///< Drain pump DAC shift bits.
 
+#define FPGA_FLUIDLEAK_STATE_MASK       0x0004                  ///< Bit mask for fluid leak detector.
+
 // FPGA header struct.
 #pragma pack(push,1)
 typedef struct
@@ -138,8 +141,8 @@
     U08 fpgaADC2ErrorCnt;                   ///< Reg 357.
     U08 fpgaRTDReadCnt;                     ///< Reg 358. Temperature sensors read count
     U08 fpgaRTDErrorCnt;                    ///< Reg 359. Temperature sensors error count
-    U08 fpgaTHDoReadCnt;                    ///< Reg 360. Redundant outlet temperature sensor read count
-    U08 fpgaTHDoErrorCnt;                   ///< Reg 361. Redundant outlet temperature sensor error count
+    U08 fpgaTRoReadCnt;                     ///< Reg 360. Redundant outlet temperature sensor read count
+    U08 fpgaTRoErrorCnt;                    ///< Reg 361. Redundant outlet temperature sensor error count
     U08 fpgaTDiReadCnt;                     ///< Reg 362. Dialysate inlet temperature sensor read count
     U08 fpgaTDiErrorCnt;                    ///< Reg 363. Dialysate inlet temperature sensor error count
     U08 fpgaPrimaryHeaterFlags;             ///< Reg 364. Primary heater flags
@@ -166,7 +169,7 @@
     U16 fpgaCP1HallSense;                   ///< Reg 388. Concentrate pump CP1 hall sensor pulse width.
     U16 fpgaCP2HallSense;                   ///< Reg 390. Concentrate pump CP2 hall sensor pulse width.
 
-    U08 fpgaGPIOReg;                        ///< Reg 392. FGPA GPIO register
+    U08 fpgaGPIO;                           ///< Reg 392. FGPA GPIO register
     U08 fpgaDummyByte2Addr;                 ///< Reg 393. Dummy byte address to maintain an even addressing scheme
     U16 fpgaADCTemp;                        ///< Reg 394. Internal FPGA die temperature ADC
 
@@ -464,10 +467,15 @@
             break;
     }
 
-    // if retries for commands exceeds limit, fault
-    if ( fpgaCommRetryCount > MAX_COMM_ERROR_RETRIES )
+    // if retries for commands exceeds limit or FPGA reports comm error, fault
+    if ( ( fpgaCommRetryCount > MAX_COMM_ERROR_RETRIES )
+#ifdef _RELEASE_
+         || ( fpgaSensorReadings.fpgaIOErrorCntProcessor > MAX_COMM_ERROR_RETRIES ) )
+#else
+         )
+#endif
     {
-        // TODO - FPGA comm fault
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_FPGA_COMM_TIMEOUT, fpgaCommRetryCount, (U32)fpgaSensorReadings.fpgaIOErrorCntProcessor )
     }
 
     // reset comm flags after processing incoming responses
@@ -720,12 +728,28 @@
     if ( 1 )
 #endif
     {
-        result = SELF_TEST_STATUS_PASSED;
+        // Check FPGA compatibility w/ firmware
+        if ( fpgaHeader.fpgaRevMajor > MIN_DG_FPGA_MAJOR )
+        {
+            result = SELF_TEST_STATUS_PASSED;
+        }
+        else
+        {
+            if ( ( MIN_DG_FPGA_MAJOR == fpgaHeader.fpgaRevMajor ) && ( fpgaHeader.fpgaRevMinor >= MIN_DG_FPGA_MINOR ) )
+            {
+                result = SELF_TEST_STATUS_PASSED;
+            }
+            else
+            {
+                result = SELF_TEST_STATUS_FAILED;
+                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_FPGA_POST_TEST_FAILED, (U32)fpgaHeader.fpgaRevMajor, (U32)fpgaHeader.fpgaRevMinor )
+            }
+        }
     }
     else
     {
         result = SELF_TEST_STATUS_FAILED;
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_FPGA_POST_TEST_FAILED, (U32)fpgaHeader.fpgaId )
+        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_FPGA_POST_TEST_FAILED, (U32)fpgaHeader.fpgaId )
     }
 
     return result;
@@ -1045,49 +1069,57 @@
 /*********************************************************************//**
  * @brief
  * The getFPGALoadCellA1 function gets the latest load cell A 1 reading.
+ * Least significant 24 bits are the reading.  Most significant bit indicates
+ * CRC or status error.
  * @details Inputs: fpgaSensorReadings
  * @details Outputs: none
  * @return last load cell A 1 reading
  *************************************************************************/
 U32 getFPGALoadCellA1( void )
 {
-    return ( fpgaSensorReadings.fpgaLCA1 & MASK_OFF_U32_MSB );
+    return fpgaSensorReadings.fpgaLCA1;
 }
 
 /*********************************************************************//**
  * @brief
  * The getFPGALoadCellA2 function gets the latest load cell A 2 reading.
+ * Least significant 24 bits are the reading.  Most significant bit indicates
+ * CRC or status error.
  * @details Inputs: fpgaSensorReadings
  * @details Outputs: none
  * @return last load cell A 2 reading
  *************************************************************************/
 U32 getFPGALoadCellA2( void )
 {
-    return ( fpgaSensorReadings.fpgaLCA2 & MASK_OFF_U32_MSB );
+    return fpgaSensorReadings.fpgaLCA2;
 }
 
 /*********************************************************************//**
  * @brief
  * The getFPGALoadCellB1 function gets the latest load cell B 1 reading.
+ * Least significant 24 bits are the reading.  Most significant bit indicates
+ * CRC or status error.
  * @details Inputs: fpgaSensorReadings
  * @details Outputs: none
  * @return last load cell B 1 reading
  *************************************************************************/
 U32 getFPGALoadCellB1( void )
 {
-    return ( fpgaSensorReadings.fpgaLCB1 & MASK_OFF_U32_MSB );
+    return fpgaSensorReadings.fpgaLCB1;
 }
 
 /*********************************************************************//**
  * @brief
  * The getFPGALoadCellB2 function gets the latest load cell B 2 reading.
+ * Least significant 24 bits are the reading.  Most significant bit indicates
+ * CRC or status error.
  * @details Inputs: fpgaSensorReadings
  * @details Outputs: none
  * @return last load cell B 2 reading
  *************************************************************************/
 U32 getFPGALoadCellB2( void )
 {
-    return ( fpgaSensorReadings.fpgaLCB2 & MASK_OFF_U32_MSB );
+    return fpgaSensorReadings.fpgaLCB2;
 }
 
 /*********************************************************************//**
@@ -1219,26 +1251,26 @@
 
 /*********************************************************************//**
  * @brief
- * The getFPGATHDoErrorCount gets the error count of the THDo (redundant) temperature sensor.
- * @details Inputs: fpgaSensorReadings.fpgaTHDoErrorCnt
+ * The getFPGATRoErrorCount gets the error count of the THDo (redundant) temperature sensor.
+ * @details Inputs: fpgaSensorReadings.fpgaTRoErrorCnt
  * @details Outputs: none
  * @return Last redundant sensor outlet temperature error count
  *************************************************************************/
-U08 getFPGATHDoErrorCount( void )
+U08 getFPGATRoErrorCount( void )
 {
-    return fpgaSensorReadings.fpgaTHDoErrorCnt;
+    return fpgaSensorReadings.fpgaTRoErrorCnt;
 }
 
 /*********************************************************************//**
  * @brief
- * The getFPGATHDoReadCount gets the read count of the THDo (redundant) temperature sensor.
- * @details Inputs: fpgaSensorReadings.fpgaTHDoReadCnt
+ * The getFPGATRoReadCount gets the read count of the THDo (redundant) temperature sensor.
+ * @details Inputs: fpgaSensorReadings.fpgaTRoReadCnt
  * @details Outputs: none
  * @return Last redundant sensor outlet temperature error count reading
  *************************************************************************/
-U08 getFPGATHDoReadCount( void )
+U08 getFPGATRoReadCount( void )
 {
-    return fpgaSensorReadings.fpgaTHDoReadCnt;
+    return fpgaSensorReadings.fpgaTRoReadCnt;
 }
 
 /*********************************************************************//**
@@ -1530,6 +1562,19 @@
 
 /*********************************************************************//**
  * @brief
+ * The getFPGAConcentratePumpsFault function gets concentrate pumps fault
+ * reported by FGPA.
+ * @details Inputs: fpgaSensorReadings.fpgaCP1CP2Fault
+ * @details Outputs: none
+ * @return Latest concentrate pumps fault value
+ *************************************************************************/
+U08 getFPGAConcentratePumpsFault( void )
+{
+    return fpgaSensorReadings.fpgaCP1CP2Fault;
+}
+
+/*********************************************************************//**
+ * @brief
  * The getFPGAEmstatOutByte function gets Emstat conductivity sensor output byte.
  * @details Inputs: fpgaSensorReadings.fpgaEmstatOutByte
  * @details Outputs: none
@@ -1784,5 +1829,19 @@
     return fpgaSensorReadings.fpgaADC2ErrorCnt;
 }
 
-/**@}*/
+/*********************************************************************//**
+ * @brief
+ * The noFluidLeakDetected function returns TRUE if no fluid leak has been
+ * detected (dry) and FALSE if a fluid leak has been detected (wet).
+ * @details Inputs: fpgaSensorReadings
+ * @details Outputs: none
+ * @return noFluidLeakDetected
+ *************************************************************************/
+BOOL noFPGAFluidLeakDetected( void )
+{
+    U16 noFluidLeakDetected = fpgaSensorReadings.fpgaGPIO & FPGA_FLUIDLEAK_STATE_MASK;
 
+    return ( 0 == noFluidLeakDetected ? FALSE : TRUE );
+}
+
+/**@}*/