Index: firmware/App/Modes/Dialysis.h =================================================================== diff -u -r13a064292b5a36a85593f53eabae268ae2bf4bc6 -r8639aa012127798aeb8fd719dd7f93b83275f944 --- firmware/App/Modes/Dialysis.h (.../Dialysis.h) (revision 13a064292b5a36a85593f53eabae268ae2bf4bc6) +++ firmware/App/Modes/Dialysis.h (.../Dialysis.h) (revision 8639aa012127798aeb8fd719dd7f93b83275f944) @@ -36,25 +36,10 @@ // ********** public definitions ********** -#pragma pack(push,1) - -/// Payload record structure for a saline bolus data broadcast message. -typedef struct -{ - U32 tgtSalineVolumeMl; ///< Target saline volume in mL. - F32 cumSalineVolumeMl; ///< Cumulative saline volume in mL. - F32 bolSalineVolumeMl; ///< Bolus saline volume in mL. - F32 bloodLeakZeroingDPi2BLDFlushVolumeML; ///< Blood leak zeroing DPi to BLD flush volume in mL. - F32 bloodLeakZeroingRsrvr2DPiFlushVolumeML; ///< Blood leak zeroing reservoir to DPi flush volume in mL. - U32 bloodLeakZeroingNeededAfterRsrvrSwitch; ///< Blood leak zeroing needed after reservoir switch. -} SALINE_BOLUS_DATA_PAYLOAD_T; - -#pragma pack(pop) - // ********** public function prototypes ********** void initDialysis( void ); -void resetSalineBolus( void ); +void resetUF( void ); void transitionToDialysis( void ); void execDialysis( void ); @@ -63,17 +48,12 @@ void stopDialysis( void ); void startHeparinPump( void ); -void signalStartSalineBolus( void ); -void signalAbortSalineBolus( void ); - DIALYSIS_STATE_T getDialysisState( void ); UF_STATE_T getUltrafiltrationState( void ); -SALINE_BOLUS_STATE_T getSalineBolusState( void ); BLOOD_LEAK_ZEROING_STATE_T getBloodLeakZeroingState( void ); F32 getUltrafiltrationVolumeCollected( void ); F32 getUltrafiltrationReferenceVolume( void ); -F32 getTotalSalineBolusVolumeDelivered( void ); BOOL pauseUF( void ); BOOL resumeUF( void );