Index: firmware/App/Services/FpgaDD.c =================================================================== diff -u -r97324225f3a465c46b9cbfe4083814b0eb5576a6 -red2e81c8f4618d08b2842d47b4897c5990f5cb76 --- firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision 97324225f3a465c46b9cbfe4083814b0eb5576a6) +++ firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision ed2e81c8f4618d08b2842d47b4897c5990f5cb76) @@ -112,6 +112,9 @@ #define FPGA_D12_PUMP_ERROR_BIT 0x01 ///< Fresh dialysate pump error bit mask. #define FPGA_D48_PUMP_ERROR_BIT 0x02 ///< Spent dialysate pump error bit mask. #define FPGA_FLOATER_LEVEL_BIT 0x0F ///< Floater level bit mask(D6 and P25). +#define FPGA_D46_LEVEL_BIT 0x01 ///< D46 conductive level sensor bit mask. +#define FPGA_D63_LEVEL_BIT 0x02 ///< D63 conductive level sensor bit mask. +#define FPGA_D98_LEVEL_BIT 0x04 ///< D98 conductive level sensor bit mask. #define FPGA_D5_HEATER_CNTRL_BIT 0x01 ///< FPGA GIO D5 heater control bit mask #define FPGA_D5_HEATER_PWM_ENABLE_BIT 0x02 ///< FPGA D5 PWM based heater control bit mask @@ -3072,7 +3075,7 @@ #if 1 // Remove when Beta 1.9 is obsolete if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE ) { - return fpgaSensorReadings.fpgaConductiveLevelStatus; + return ( fpgaSensorReadings.fpgaConductiveLevelStatus & FPGA_D63_LEVEL_BIT ); } else { @@ -3096,7 +3099,7 @@ #if 1 // Remove when Beta 1.9 is obsolete if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE ) { - return fpgaSensorReadings.fpgaConductiveLevelStatus; + return ( fpgaSensorReadings.fpgaConductiveLevelStatus & FPGA_D98_LEVEL_BIT ); } else { @@ -3120,7 +3123,7 @@ #if 1 // Remove when Beta 1.9 is obsolete if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE ) { - return fpgaSensorReadings.fpgaConductiveLevelStatus; + return ( fpgaSensorReadings.fpgaConductiveLevelStatus & FPGA_D46_LEVEL_BIT ); } else {