Index: firmware/App/Services/FPGA.c =================================================================== diff -u -r6982379266891326c9d45aecd7d54ad5c85ea69f -rdee324600666944baf72278ea33b8775b87a0a0e --- firmware/App/Services/FPGA.c (.../FPGA.c) (revision 6982379266891326c9d45aecd7d54ad5c85ea69f) +++ firmware/App/Services/FPGA.c (.../FPGA.c) (revision dee324600666944baf72278ea33b8775b87a0a0e) @@ -2005,34 +2005,100 @@ fpgaActuatorSetPoints.fpgaSensorTest &= ~FPGA_BLOOD_LEAK_SELF_TEST_CMD; } +/*********************************************************************//** + * @brief + * The getFPGABloodLeakZeroStatusCounter function returns the blood leak + * zero status counter + * @details Inputs: none + * @details Outputs: none + * @return fpgaSensorReadings.ZLeakCounter + *************************************************************************/ U08 getFPGABloodLeakZeroStatusCounter( void ) { return fpgaSensorReadings.ZLeakCounter; } + +/*********************************************************************//** + * @brief + * The getFPGABloodLeakCounter function returns the blood leak counter. + * @details Inputs: none + * @details Outputs: none + * @return fpgaSensorReadings.BLeakCounter + *************************************************************************/ U08 getFPGABloodLeakCounter( void ) { return fpgaSensorReadings.BLeakCounter; } + +/*********************************************************************//** + * @brief + * The getFPGABloodLeakZeroedStatus function returns the blood leak zeroed status. + * @details Inputs: none + * @details Outputs: none + * @return fpgaSensorReadings.bloodLeakZeroedStatus + *************************************************************************/ U08 getFPGABloodLeakZeroedStatus( void ) { return fpgaSensorReadings.bloodLeakZeroedStatus; } + +/*********************************************************************//** + * @brief + * The getFPGABloodLeakDetectSetPoint function returns the blood leak detect + * set point. + * @details Inputs: none + * @details Outputs: none + * @return fpgaSensorReadings.bloodDetectSetPoint + *************************************************************************/ U16 getFPGABloodLeakDetectSetPoint( void ) { return fpgaSensorReadings.bloodDetectSetPoint; } + +/*********************************************************************//** + * @brief + * The getFPGABloodLeakDetectLevel function returns the blood leak detect level. + * @details Inputs: none + * @details Outputs: none + * @return fpgaSensorReadings.bloodDetectLevel + *************************************************************************/ U16 getFPGABloodLeakDetectLevel( void ) { return fpgaSensorReadings.bloodDetectLevel; } + +/*********************************************************************//** + * @brief + * The getFPGABloodLeakStCount function returns the blood leak st count. + * @details Inputs: none + * @details Outputs: none + * @return fpgaSensorReadings.bloodStCount + *************************************************************************/ U16 getFPGABloodLeakStCount( void ) { return fpgaSensorReadings.bloodStCount; } + +/*********************************************************************//** + * @brief + * The getFPGABloodLeakLEDIntensity function returns the blood leak LED intensity. + * @details Inputs: none + * @details Outputs: none + * @return fpgaSensorReadings.bloodLEDIntensity + *************************************************************************/ U16 getFPGABloodLeakLEDIntensity( void ) { return fpgaSensorReadings.bloodLEDIntensity; } + +/*********************************************************************//** + * @brief + * The getFPGABloodLeakRegisterCounter function returns the blood leak register + * counter. + * @details Inputs: none + * @details Outputs: none + * @return fpgaSensorReadings.bloodRdCounter + *************************************************************************/ U16 getFPGABloodLeakRegisterCounter( void ) { return fpgaSensorReadings.bloodRdCounter; @@ -2050,12 +2116,8 @@ { U16 noFPGABubbleDetected = 0; - if ( bubble == ADA ) + if ( bubble == ADV ) { - noFPGABubbleDetected = fpgaSensorReadings.fpgaGPIO & FPGA_ADA_BUBBLE_STATUS_MASK; - } - else if ( bubble == ADV ) - { noFPGABubbleDetected = fpgaSensorReadings.fpgaGPIO & FPGA_ADV_BUBBLE_STATUS_MASK; } else @@ -2076,12 +2138,8 @@ *************************************************************************/ void setFPGABubbleSelfTest( U32 bubble ) { - if ( bubble == ADA ) + if ( bubble == ADV ) { - fpgaActuatorSetPoints.fpgaSensorTest |= FPGA_ADA_BUBBLE_SELF_TEST_CMD; - } - else if ( bubble == ADV ) - { fpgaActuatorSetPoints.fpgaSensorTest |= FPGA_ADV_BUBBLE_SELF_TEST_CMD; } } @@ -2096,12 +2154,8 @@ *************************************************************************/ void clearFPGABubbleSelfTest( U32 bubble ) { - if ( bubble == ADA ) + if ( bubble == ADV ) { - fpgaActuatorSetPoints.fpgaSensorTest &= ~FPGA_ADA_BUBBLE_SELF_TEST_CMD; - } - else if ( bubble == ADV ) - { fpgaActuatorSetPoints.fpgaSensorTest &= ~FPGA_ADV_BUBBLE_SELF_TEST_CMD; } else