Index: dialin/common/hd_defs.py =================================================================== diff -u -r7abec8e644982116998b441acbd32fe52734d3f1 -r5cd84d5bb23f6205a61c7a931ee43f40aa3d4a44 --- dialin/common/hd_defs.py (.../hd_defs.py) (revision 7abec8e644982116998b441acbd32fe52734d3f1) +++ dialin/common/hd_defs.py (.../hd_defs.py) (revision 5cd84d5bb23f6205a61c7a931ee43f40aa3d4a44) @@ -438,8 +438,9 @@ @unique class BloodLeakZeroingStates(DialinEnum): BLD_ZEROING_IDLE_STATE = 0 # Blood leak zeroing idle state. - BLD_ZEROING_FLUSH_STATE = 1 # Blood leak zeroing flush state. - BLD_ZEROING_ZERO_STATE = 2 # Blood leak zeroing zero state. - BLD_ZEROING_VERIFY_ZEROING_STATE = 3 # Blood leak zeroing verify zeroing state. - BLD_ZEROING_COMPLETE_STATE = 4 # Blood leak zeroing complete state. - NUM_OF_BLD_ZEROING_STATES = 5 # Number of blood leak zeroing states. + BLD_ZEROING_FLUSH_RSRVR_2_DPI_STATE = 1 # Blood leak zeroing flush reservoir to DPi state. + BLD_ZEROING_FLUSH_DPI_2_BLD_STATE = 2 # Blood leak zeroing flush DPi to BLD state. + BLD_ZEROING_ZERO_STATE = 3 # Blood leak zeroing zero state. + BLD_ZEROING_VERIFY_ZEROING_STATE = 4 # Blood leak zeroing verify zeroing state. + BLD_ZEROING_COMPLETE_STATE = 5 # Blood leak zeroing complete state. + NUM_OF_BLD_ZEROING_STATES = 6 # Number of blood leak zeroing states. Index: dialin/hd/treatment.py =================================================================== diff -u -r23701b1b99fa209da9d0f9f8a60c555d4a8277e6 -r5cd84d5bb23f6205a61c7a931ee43f40aa3d4a44 --- dialin/hd/treatment.py (.../treatment.py) (revision 23701b1b99fa209da9d0f9f8a60c555d4a8277e6) +++ dialin/hd/treatment.py (.../treatment.py) (revision 5cd84d5bb23f6205a61c7a931ee43f40aa3d4a44) @@ -153,6 +153,7 @@ self.saline_bolus_cum_vol = 0.0 self.saline_bolus_bol_vol = 0.0 self.dialysate_inlet_pump_2_bld_flush_vol_ml = 0.0 + self.reservoir_2_dialysate_inlet_pump_flush_vol_ml = 0.0 # blood prime status self.blood_prime_tgt_vol = 0.0 self.blood_prime_cum_vol = 0.0 @@ -385,6 +386,14 @@ """ return self.dialysate_inlet_pump_2_bld_flush_vol_ml + def get_reservoir_2_dialysate_inlet_pump_flush_vol_ml(self) -> float: + """ + Returns reservoir to dialysate inlet flush volume (in mL) + + @return: Reservoir to dialysate inlet pump flush volume in milliliters + """ + return self.reservoir_2_dialysate_inlet_pump_flush_vol_ml + def get_blood_prime_target_volume(self) -> float: """ Returns blood prime target volume (in mL) @@ -596,7 +605,8 @@ "saline_bolus_max_vol", "saline_bolus_cum_vol", "saline_bolus_bol_vol", - "dialysate_inlet_pump_2_bld_flush_vol_ml" + "dialysate_inlet_pump_2_bld_flush_vol_ml", + "reservoir_2_dialysate_inlet_pump_flush_vol_ml" ]) def _handler_saline_bolus_data_sync(self, message, timestamp=0.0): """ @@ -615,11 +625,14 @@ message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])) vol = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])) + rsvr_dpi_vol = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])) self.saline_bolus_max_vol = mxm[0] self.saline_bolus_cum_vol = cum[0] self.saline_bolus_bol_vol = bol[0] self.dialysate_inlet_pump_2_bld_flush_vol_ml = vol[0] + self.reservoir_2_dialysate_inlet_pump_flush_vol_ml = rsvr_dpi_vol[0] self.hd_saline_bolus_timestamp = timestamp @publish([