Index: firmware/App/Controllers/BloodFlow.c =================================================================== diff -u -r8cebc7f282f403c99f712d422454c15414b6fc73 -r739960711a13328f76f20accc65b9359e1feb2ac --- firmware/App/Controllers/BloodFlow.c (.../BloodFlow.c) (revision 8cebc7f282f403c99f712d422454c15414b6fc73) +++ firmware/App/Controllers/BloodFlow.c (.../BloodFlow.c) (revision 739960711a13328f76f20accc65b9359e1feb2ac) @@ -487,10 +487,6 @@ HD_OP_MODE_T opMode = getCurrentOperationMode(); U16 bpRPM = getIntADCReading( INT_ADC_BLOOD_PUMP_SPEED ); U16 bpmA = getIntADCReading( INT_ADC_BLOOD_PUMP_MOTOR_CURRENT ); - U08 fpReadCtr = getFPGABloodFlowFastPacketReadCounter(); - U08 spReadCtr = getFPGABloodFlowSlowPacketReadCounter(); - U08 flowErrorCtr = getFPGABloodFlowErrorCounter(); - U08 flowStatus = getFPGABloodFlowMeterStatus(); adcBloodPumpMCSpeedRPM.data = (F32)(SIGN_FROM_12_BIT_VALUE(bpRPM)) * BP_SPEED_ADC_TO_RPM_FACTOR; adcBloodPumpMCCurrentmA.data = (F32)(SIGN_FROM_12_BIT_VALUE(bpmA)) * BP_CURRENT_ADC_TO_MA_FACTOR; Index: firmware/App/Services/FPGA.c =================================================================== diff -u -r0237b2fc49d60b6602bac35ce43831b37f294c81 -r739960711a13328f76f20accc65b9359e1feb2ac --- firmware/App/Services/FPGA.c (.../FPGA.c) (revision 0237b2fc49d60b6602bac35ce43831b37f294c81) +++ firmware/App/Services/FPGA.c (.../FPGA.c) (revision 739960711a13328f76f20accc65b9359e1feb2ac) @@ -1246,82 +1246,6 @@ /*********************************************************************//** * @brief - * The getFPGABloodFlow function gets the latest blood flow reading. - * @details Inputs: fpgaSensorReadings - * @details Outputs: none - * @return last blood flow reading - *************************************************************************/ -F32 getFPGABloodFlow( void ) -{ - return fpgaSensorReadings.bloodFlowLast; -} - -/*********************************************************************//** - * @brief - * The getFPGABloodFlowMeterStatus function gets the blood flow meter status. - * @details Inputs: fpgaSensorReadings - * @details Outputs: none - * @return current blood flow meter status - *************************************************************************/ -U08 getFPGABloodFlowMeterStatus( void ) -{ - return fpgaSensorReadings.bloodFlowMeterDeviceStatus; -} - -/*********************************************************************//** - * @brief - * The getFPGABloodFlowFastPacketReadCounter function gets the blood - * flow meter fast packet read counter. - * @details Inputs: fpgaSensorReadings - * @details Outputs: none - * @return current blood flow meter fast packet read counter - *************************************************************************/ -U08 getFPGABloodFlowFastPacketReadCounter( void ) -{ - return fpgaSensorReadings.bloodFlowMeterDataPktCount; -} - -/*********************************************************************//** - * @brief - * The getFPGABloodFlowSlowPacketReadCounter function gets the blood - * flow meter slow packet read counter. - * @details Inputs: fpgaSensorReadings - * @details Outputs: none - * @return current blood flow meter slow packet read counter - *************************************************************************/ -U08 getFPGABloodFlowSlowPacketReadCounter( void ) -{ - return ( fpgaSensorReadings.bloodFlowMeterSlowPktCounts & MASK_OFF_NIBBLE_LSB ) >> SHIFT_BITS_BY_4; -} - -/*********************************************************************//** - * @brief - * The getFPGABloodFlowStatusPacketReadCounter function gets the blood - * flow meter status packet read counter. - * @details Inputs: fpgaSensorReadings - * @details Outputs: none - * @return current blood flow meter status packet read counter - *************************************************************************/ -U08 getFPGABloodFlowStatusPacketReadCounter( void ) -{ - return ( fpgaSensorReadings.bloodFlowMeterSlowPktCounts & MASK_OFF_NIBBLE_MSB ); -} - -/*********************************************************************//** - * @brief - * The getFPGABloodFlowErrorCounter function gets the blood flow meter - * error counter. - * @details Inputs: fpgaSensorReadings - * @details Outputs: none - * @return current blood flow meter error counter - *************************************************************************/ -U08 getFPGABloodFlowErrorCounter( void ) -{ - return fpgaSensorReadings.bloodFlowMeterErrorCount; -} - -/*********************************************************************//** - * @brief * The getFPGADialysateFlow function gets the latest dialysate flow reading. * @details Inputs: fpgaSensorReadings * @details Outputs: none Index: firmware/App/Services/FPGA.h =================================================================== diff -u -r0237b2fc49d60b6602bac35ce43831b37f294c81 -r739960711a13328f76f20accc65b9359e1feb2ac --- firmware/App/Services/FPGA.h (.../FPGA.h) (revision 0237b2fc49d60b6602bac35ce43831b37f294c81) +++ firmware/App/Services/FPGA.h (.../FPGA.h) (revision 739960711a13328f76f20accc65b9359e1feb2ac) @@ -61,13 +61,6 @@ F32 getFPGABloodFlowSignalStrength( void ); F32 getFPGADialysateFlowSignalStrength( void ); -F32 getFPGABloodFlow( void ); -U08 getFPGABloodFlowMeterStatus( void ); -U08 getFPGABloodFlowFastPacketReadCounter( void ); -U08 getFPGABloodFlowSlowPacketReadCounter( void ); -U08 getFPGABloodFlowStatusPacketReadCounter( void ); -U08 getFPGABloodFlowErrorCounter( void ); - F32 getFPGADialysateFlow( void ); U08 getFPGADialysateFlowMeterStatus( void ); U08 getFPGADialysateFlowFastPacketReadCounter( void );