Index: firmware/App/Controllers/PresOccl.c =================================================================== diff -u -r38a89cb53b4ed2e467f51d41e30d43010fdd23e3 -r1c628bfd5d6414b74b8cbd083f66839888a8236b --- firmware/App/Controllers/PresOccl.c (.../PresOccl.c) (revision 38a89cb53b4ed2e467f51d41e30d43010fdd23e3) +++ firmware/App/Controllers/PresOccl.c (.../PresOccl.c) (revision 1c628bfd5d6414b74b8cbd083f66839888a8236b) @@ -118,20 +118,24 @@ static F32 shortFilteredArterialPressure; ///< Measured arterial pressure after short (1 s) filter. static F32 shortFilteredVenousPressure; ///< Measured venous pressure after short (1 s) filter. +#ifndef DISABLE_PRESSURE_CHECKS static U32 bloodPumpOcclusionAfterCartridgeInstall; ///< Measured blood pump occlusion reading taken after cartridge install. static U32 dialInPumpOcclusionAfterCartridgeInstall; ///< Measured dialysate inlet pump occlusion reading taken after cartridge install. static U32 dialOutPumpOcclusionAfterCartridgeInstall; ///< Measured dialysate outlet pump occlusion reading taken after cartridge install. +#endif static U32 emptySalineBagCtr = 0; ///< Timer counter for empty bag detection. static U08 lastArterialPressureReadCtr; ///< Previous arterial pressure sensor read count. static U08 lastVenousPressureReadCtr; ///< Previous venous pressure sensor read count. +#ifndef DISABLE_PRESSURE_CHECKS static U08 lastBPOcclReadCtr; ///< Previous BP occlusion sensor read count. static U08 lastDPiOcclReadCtr; ///< Previous DPi occlusion sensor read count. static U08 lastDPoOcclReadCtr; ///< Previous DPo occlusion sensor read count. static U08 lastBPErrorCtr; ///< Previous BP error count. static U08 lastDPIErrorCtr; ///< Previous DPi error count. static U08 lastDPOErrorCtr; ///< Previous DPo error count. +#endif static F32 artPressureReadingsLong[ SIZE_OF_LONG_ART_ROLLING_AVG ]; ///< Holds flow samples for long arterial pressure rolling average. static U32 artPressureReadingsLongIdx = 0; ///< Index for next sample in rolling average array. @@ -190,20 +194,24 @@ lastArterialPressureReadCtr = 0; lastVenousPressureReadCtr = 0; +#ifndef DISABLE_PRESSURE_CHECKS lastBPOcclReadCtr = 0; lastDPiOcclReadCtr = 0; lastDPoOcclReadCtr = 0; lastBPErrorCtr = 0; lastDPIErrorCtr = 0; lastDPOErrorCtr = 0; +#endif longFilteredArterialPressure = 0.0; shortFilteredArterialPressure = 0.0; shortFilteredVenousPressure = 0.0; +#ifndef DISABLE_PRESSURE_CHECKS bloodPumpOcclusionAfterCartridgeInstall = 0; dialInPumpOcclusionAfterCartridgeInstall = 0; dialOutPumpOcclusionAfterCartridgeInstall = 0; +#endif } /*********************************************************************//** @@ -287,9 +295,11 @@ *************************************************************************/ void setOcclusionInstallLevels( void ) { +#ifndef DISABLE_PRESSURE_CHECKS bloodPumpOcclusionAfterCartridgeInstall = getMeasuredBloodPumpOcclusion(); dialInPumpOcclusionAfterCartridgeInstall = getMeasuredDialInPumpOcclusion(); dialOutPumpOcclusionAfterCartridgeInstall = getMeasuredDialOutPumpOcclusion(); +#endif } /*********************************************************************//** @@ -478,13 +488,15 @@ dialInPumpOcclusion.data = (U32)getFPGADialInPumpOcclusion(); dialOutPumpOcclusion.data = (U32)getFPGADialOutPumpOcclusion(); +#ifndef DISABLE_PRESSURE_CHECKS // Record occlusion read and error counters for next time around lastBPOcclReadCtr = bpReadCtr; lastDPiOcclReadCtr = dpiReadCtr; lastDPoOcclReadCtr = dpoReadCtr; lastBPErrorCtr = bpErrorCtr; lastDPIErrorCtr = dpiErrorCtr; lastDPOErrorCtr = dpoErrorCtr; +#endif } /*********************************************************************//**