Index: firmware/App/Services/FPGA.c =================================================================== diff -u -r9864b14f76782f1e68bf266dcd843451748715a0 -r07a5add2dff254f7be3699e4efac2b99d3554847 --- firmware/App/Services/FPGA.c (.../FPGA.c) (revision 9864b14f76782f1e68bf266dcd843451748715a0) +++ firmware/App/Services/FPGA.c (.../FPGA.c) (revision 07a5add2dff254f7be3699e4efac2b99d3554847) @@ -914,30 +914,30 @@ } /************************************************************************* - * @brief getFPGABloodOcclusion - * The getFPGABloodOcclusion function gets the latest blood occlusion reading. + * @brief getFPGABloodPumpOcclusion + * The getFPGABloodPumpOcclusion function gets the latest blood occlusion reading. * @details * Inputs : fpgaSensorReadings * Outputs : none * @param none * @return last blood occlusion reading *************************************************************************/ -F32 getFPGABloodOcclusion( void ) +U16 getFPGABloodPumpOcclusion( void ) { return fpgaSensorReadings.bloodOcclusionData; } /************************************************************************* - * @brief getFPGADialysateInletOcclusion - * The getFPGADialysateInletOcclusion function gets the latest dialysate \n + * @brief getFPGADialInPumpOcclusion + * The getFPGADialInPumpOcclusion function gets the latest dialysate \n * inlet occlusion reading. * @details * Inputs : fpgaSensorReadings * Outputs : none * @param none * @return last dialysate inlet occlusion reading *************************************************************************/ -F32 getFPGADialysateInletOcclusion( void ) +U16 getFPGADialInPumpOcclusion( void ) { #ifdef DEBUG_ENABLED { @@ -955,16 +955,16 @@ } /************************************************************************* - * @brief getFPGADialysateOutletOcclusion - * The getFPGADialysateOutletOcclusion function gets the latest dialysate \n + * @brief getFPGADialOutPumpOcclusion + * The getFPGADialOutPumpOcclusion function gets the latest dialysate \n * outlet occlusion reading. * @details * Inputs : fpgaSensorReadings * Outputs : none * @param none * @return last dialysate outlet occlusion reading *************************************************************************/ -F32 getFPGADialysateOutletOcclusion( void ) +U16 getFPGADialOutPumpOcclusion( void ) { return fpgaSensorReadings.dialysateOutOcclusionData; } @@ -978,12 +978,26 @@ * @param none * @return last arterial pressure reading *************************************************************************/ -F32 getFPGAArterialPressure( void ) +U16 getFPGAArterialPressure( void ) { return fpgaSensorReadings.arterialPressureData; } /************************************************************************* + * @brief getFPGAVenousPressure + * The getFPGAVenousPressure function gets the venous arterial pressure reading. + * @details + * Inputs : fpgaSensorReadings + * Outputs : none + * @param none + * @return last venous pressure reading + *************************************************************************/ +U16 getFPGAVenousPressure( void ) +{ + return 0; // TODO - return reading when available +} + +/************************************************************************* * @brief consumeUnexpectedData * The consumeUnexpectedData function checks to see if a byte is sitting in \n * the SCI2 received data register.