Index: firmware/App/Services/FPGA.c =================================================================== diff -u -r70b000b9a49b56f1e5d41aebddf4ed97a01faa0b -rc6199e5ac2d3aea67d9eac361a84bbe7a27bcd74 --- firmware/App/Services/FPGA.c (.../FPGA.c) (revision 70b000b9a49b56f1e5d41aebddf4ed97a01faa0b) +++ firmware/App/Services/FPGA.c (.../FPGA.c) (revision c6199e5ac2d3aea67d9eac361a84bbe7a27bcd74) @@ -81,11 +81,12 @@ #define FPGA_AIRTRAP_LEVEL_LOW_MASK 0x0008 ///< Bit mask for air trap lower level sensor. #define FPGA_AIRTRAP_LEVEL_HIGH_MASK 0x0004 ///< Bit mask for air trap upper level sensor. -#define FPGA_FLUIDLEAK_STATE_MASK 0x0040 ///< Bit mask for fluid leak detector. -#define FPGA_BLOODLEAK_STATE_MASK 0x0040 ///< Bit mask for blood leak detector. +#define FPGA_FLUID_LEAK_STATE_MASK 0x0040 ///< Bit mask for fluid leak detector. +#define FPGA_BLOOD_LEAK_STATE_MASK 0x1000 ///< Bit mask for blood leak detector. +#define FPGA_BLOOD_LEAK_ZERO_STATE_MASK 0x2000 ///< Bit mask for blood leak detector zero. + #define FPGA_ADA_INPUT_STATUS_MASK 0x0001 ///< Bit mask for arterial air bubble detector input status. #define FPGA_ADV_INPUT_STATUS_MASK 0x0002 ///< Bit mask for venous air bubble detector input status. -#define FPGA_BLOOD_LEAK_STATUS_MASK 0x1000 ///< Bit mask for blood leak detector status. // FPGA Sensors Record #pragma pack(push,1) @@ -1456,7 +1457,7 @@ *************************************************************************/ BOOL getFPGABloodLeakDetectorStatus( void ) { - U16 const status = fpgaSensorReadings.fpgaGPIO & FPGA_BLOOD_LEAK_STATUS_MASK; + U16 const status = fpgaSensorReadings.fpgaGPIO & FPGA_BLOOD_LEAK_STATE_MASK; return ( 0 == status ? FALSE : TRUE ); } @@ -1511,7 +1512,7 @@ *************************************************************************/ BOOL noFPGAFluidLeakDetected( void ) { - U16 noFluidLeakDetected = fpgaSensorReadings.fpgaGPIO & FPGA_FLUIDLEAK_STATE_MASK; + U16 noFluidLeakDetected = fpgaSensorReadings.fpgaGPIO & FPGA_FLUID_LEAK_STATE_MASK; return ( 0 == noFluidLeakDetected ? FALSE : TRUE ); } @@ -1526,7 +1527,7 @@ *************************************************************************/ BOOL noFPGABloodLeakDetected( void ) { - U16 noBloodLeakDetected = fpgaSensorReadings.fpgaGPIO & FPGA_BLOODLEAK_STATE_MASK; + U16 noBloodLeakDetected = fpgaSensorReadings.fpgaGPIO & FPGA_BLOOD_LEAK_STATE_MASK; return ( 0 == noBloodLeakDetected ? FALSE : TRUE ); }