Index: firmware/App/Monitors/BloodLeak.c =================================================================== diff -u -r6f961c6e113a4076ba9d5f97e078a398a8976d7c -r8ffa9372b0000d0714fa88eb9a1714eb172b9399 --- firmware/App/Monitors/BloodLeak.c (.../BloodLeak.c) (revision 6f961c6e113a4076ba9d5f97e078a398a8976d7c) +++ firmware/App/Monitors/BloodLeak.c (.../BloodLeak.c) (revision 8ffa9372b0000d0714fa88eb9a1714eb172b9399) @@ -1465,6 +1465,8 @@ data.driftInRangeStatus = bloodLeakZeroingStatus.driftInRangeStatus; data.driftUpperRangeStatus = bloodLeakZeroingStatus.driftUpperRangeStatus; + data.TEMP_REMOVE_VARIABLE = (U32)get_TEMP_REMOVE_STATUS(); + bloodLeakDataPublicationCounter = 0; broadcastData( MSG_ID_DD_BLOOD_LEAK_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( BLOOD_LEAK_DATA_T ) ); Index: firmware/App/Monitors/BloodLeak.h =================================================================== diff -u -r6f961c6e113a4076ba9d5f97e078a398a8976d7c -r8ffa9372b0000d0714fa88eb9a1714eb172b9399 --- firmware/App/Monitors/BloodLeak.h (.../BloodLeak.h) (revision 6f961c6e113a4076ba9d5f97e078a398a8976d7c) +++ firmware/App/Monitors/BloodLeak.h (.../BloodLeak.h) (revision 8ffa9372b0000d0714fa88eb9a1714eb172b9399) @@ -39,6 +39,7 @@ U32 bloodLeakTimeSinceZeroMS; ///< Blood leak detector time since last zero in milliseconds. U32 driftInRangeStatus; ///< Blood leak detector drift in range status. U32 driftUpperRangeStatus; ///< Blood leak detector drift upper range status. + U32 TEMP_REMOVE_VARIABLE; } BLOOD_LEAK_DATA_T; // ********** public function prototypes ********** Index: firmware/App/Services/FpgaDD.c =================================================================== diff -u -r4d6c6df8f990037cb66fbd0efdc4cc5a0ec31558 -r8ffa9372b0000d0714fa88eb9a1714eb172b9399 --- firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision 4d6c6df8f990037cb66fbd0efdc4cc5a0ec31558) +++ firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision 8ffa9372b0000d0714fa88eb9a1714eb172b9399) @@ -102,11 +102,14 @@ #define MAX_FPGA_COMM_FAILURES 3 ///< FPGA maximum comm failures per MAX_FPGA_COMM_FAILURES_WINDOW_MS #define MIN_POWER_ON_TIME_FOR_COMM_FAILS ( 1 * MS_PER_SECOND ) ///< Allow FPGA comm errors for first second after power-up -#define FPGA_CONDUCTIVITY_RESET_BIT 0x01 ///< Conductivity Sensor reset bit mask. -#define FPGA_CONDUCTIVITY_INIT_ENABLE_BIT 0x02 ///< Conductivity Sensor initialization enable bit mask. -#define FPGA_CONDUCTIVITY_WR_ENABLE_BIT 0x04 ///< Conductivity Sensor write enable bit mask. -#define FPGA_CONDUCTIVITY_RD_ENABLE_BIT 0x08 ///< Conductivity Sensor read enable bit mask. +#define FPGA_CONDUCTIVITY_RESET_BIT 0x01 ///< Conductivity Sensor reset bit mask. +#define FPGA_CONDUCTIVITY_INIT_ENABLE_BIT 0x02 ///< Conductivity Sensor initialization enable bit mask. +#define FPGA_CONDUCTIVITY_WR_ENABLE_BIT 0x04 ///< Conductivity Sensor write enable bit mask. +#define FPGA_CONDUCTIVITY_RD_ENABLE_BIT 0x08 ///< Conductivity Sensor read enable bit mask. +#define FPGA_D42_BLOOD_LEAK_STATUS_MASK 0x04 ///< Bit mask for blood leak detector. +#define FPGA_D42_BLOOD_LEAK_ST_BIT_INDEX 2 ///< Bit index for the blood leak self test status bit. + #pragma pack(push,1) /// FPGA header struct. typedef struct @@ -2731,11 +2734,16 @@ *************************************************************************/ U08 getFPGABloodLeakStatus( void ) { - U08 selfTestStatus = fpgaSensorReadings.fpgaD42PulseStatus; + U08 selfTestStatus = ( fpgaSensorReadings.fpgaD42PulseStatus & FPGA_D42_BLOOD_LEAK_STATUS_MASK ) >> FPGA_D42_BLOOD_LEAK_ST_BIT_INDEX; return selfTestStatus; } +U08 get_TEMP_REMOVE_STATUS( void ) +{ + return fpgaSensorReadings.fpgaD42PulseStatus; +} + /*********************************************************************//** * @brief * The setFPGABloodLeakUARTControl function sets the blood leak sensor UART Index: firmware/App/Services/FpgaDD.h =================================================================== diff -u -r4d6c6df8f990037cb66fbd0efdc4cc5a0ec31558 -r8ffa9372b0000d0714fa88eb9a1714eb172b9399 --- firmware/App/Services/FpgaDD.h (.../FpgaDD.h) (revision 4d6c6df8f990037cb66fbd0efdc4cc5a0ec31558) +++ firmware/App/Services/FpgaDD.h (.../FpgaDD.h) (revision 8ffa9372b0000d0714fa88eb9a1714eb172b9399) @@ -230,6 +230,7 @@ U16 getFPGABloodLeakRxFIFOCount( void ); U08 getFPGABloodLeakRxErrorCount( void ); U08 getFPGABloodLeakRxFIFODataOut( void ); +U08 get_TEMP_REMOVE_STATUS( void ); //*************** IOFP *******************