Index: firmware/App/Services/FPGA.c =================================================================== diff -u -r27a68f930508638f2eb6265ebb381c8918cbc37b -r208ceefa8e8b1cc30feb93be771ced6d313e6995 --- firmware/App/Services/FPGA.c (.../FPGA.c) (revision 27a68f930508638f2eb6265ebb381c8918cbc37b) +++ firmware/App/Services/FPGA.c (.../FPGA.c) (revision 208ceefa8e8b1cc30feb93be771ced6d313e6995) @@ -229,15 +229,19 @@ U08 BLeakCounter; ///< Reg 427. Blood leak counter. U08 PBoErrorCount; ///< Reg 428. PBo error count. U08 bloodLeakZeroedStatus; ///< Reg 429. Blood leak and sensor zeored status. - U16 bloodDetectSetPoint; ///< Reg 430. Blood leak stored set point value. - U16 bloodDetectLevel; ///< Reg 432. Blood leak detection stored level value. - U16 bloodStCount; ///< Reg 434. Blood leak St Count. - U16 bloodLEDIntensity; ///< Reg 436. Blood leak LED intensity. - U16 bloodRdCounter; ///< Reg 438. Blood leak register counter. + U16 bloodLeakDetectSetPoint; ///< Reg 430. Blood leak stored set point value. + U16 bloodLeakDetectLevel; ///< Reg 432. Blood leak detection stored level value. + U16 bloodLeakStCount; ///< Reg 434. Blood leak St Count. + U16 bloodLeakLEDIntensity; ///< Reg 436. Blood leak LED intensity. + U16 bloodLeakRdCounter; ///< Reg 438. Blood leak register counter. U16 arterialPressure; ///< Reg 440. Arterial pressure sensor. U16 arterialPressureTemperature; ///< Reg 442. Arterial pressure sensor temperature. U08 arterialPressureReadCount; ///< Reg 444. Arterial pressure sensor read count. U08 arterialPressureErrorCount; ///< Reg 445. Arterial pressure sensor error count. + U08 bloodLeakTxFIFOCount; ///< Reg 446. Blood leak transmit FIFO count. + U08 bloodLeakRxFIFOCount; ///< Reg 447. Blood leak receive FIFO count. + U08 bloodLeakRxErrorCount; ///< Reg 448. Blood leak receive error count. + U08 bloodLeakRxFIFODataOut; ///< Reg 449. Blood leak receive FIFO data out. } FPGA_SENSORS_T; /// Record structure for FPGA continuous priority writes. @@ -2118,7 +2122,7 @@ *************************************************************************/ U16 getFPGABloodLeakDetectSetPoint( void ) { - return fpgaSensorReadings.bloodDetectSetPoint; + return fpgaSensorReadings.bloodLeakDetectSetPoint; } /*********************************************************************//** @@ -2130,7 +2134,7 @@ *************************************************************************/ U16 getFPGABloodLeakDetectLevel( void ) { - return fpgaSensorReadings.bloodDetectLevel; + return fpgaSensorReadings.bloodLeakDetectLevel; } /*********************************************************************//** @@ -2142,7 +2146,7 @@ *************************************************************************/ U16 getFPGABloodLeakStCount( void ) { - return fpgaSensorReadings.bloodStCount; + return fpgaSensorReadings.bloodLeakStCount; } /*********************************************************************//** @@ -2154,7 +2158,7 @@ *************************************************************************/ U16 getFPGABloodLeakLEDIntensity( void ) { - return fpgaSensorReadings.bloodLEDIntensity; + return fpgaSensorReadings.bloodLeakLEDIntensity; } /*********************************************************************//** @@ -2167,11 +2171,63 @@ *************************************************************************/ U16 getFPGABloodLeakRegisterCounter( void ) { - return fpgaSensorReadings.bloodRdCounter; + return fpgaSensorReadings.bloodLeakRdCounter; } /*********************************************************************//** * @brief + * The getFPGABloodLeakTxFIFOCount function returns the blood leak transmit + * FIFO count. + * @details Inputs: none + * @details Outputs: none + * @return fpgaSensorReadings.bloodLeakTxFIFOCount + *************************************************************************/ +U08 getFPGABloodLeakTxFIFOCount( void ) +{ + return fpgaSensorReadings.bloodLeakTxFIFOCount; +} + +/*********************************************************************//** + * @brief + * The getFPGABloodLeakRxFIFOCount function returns the blood leak receive + * FIFO count. + * @details Inputs: none + * @details Outputs: none + * @return fpgaSensorReadings.bloodLeakRxFIFOCount + *************************************************************************/ +U08 getFPGABloodLeakRxFIFOCount( void ) +{ + return fpgaSensorReadings.bloodLeakRxFIFOCount; +} + +/*********************************************************************//** + * @brief + * The getFPGABloodLeakRxErrorCount function returns the blood leak receive + * error count. + * @details Inputs: none + * @details Outputs: none + * @return fpgaSensorReadings.bloodLeakRxErrorCount + *************************************************************************/ +U08 getFPGABloodLeakRxErrorCount( void ) +{ + return fpgaSensorReadings.bloodLeakRxErrorCount; +} + +/*********************************************************************//** + * @brief + * The getFPGABloodLeakRxFIFODataOut function returns the blood leak receive + * FIFO data out. + * @details Inputs: none + * @details Outputs: none + * @return fpgaSensorReadings.bloodLeakRxFIFODataOut + *************************************************************************/ +U08 getFPGABloodLeakRxFIFODataOut( void ) +{ + return fpgaSensorReadings.bloodLeakRxFIFODataOut; +} + +/*********************************************************************//** + * @brief * The noFPGABubbleDetected function returns TRUE if no air bubble has been * detected and FALSE if an air bubble has been detected. * @details Inputs: fpgaSensorReadings