Index: dialin/hd/treatment.py =================================================================== diff -u -r9dee83286969ac19c09f6879394494e551663cb5 -rc45a42475147641810dd252aefcd2c7872f13c7f --- dialin/hd/treatment.py (.../treatment.py) (revision 9dee83286969ac19c09f6879394494e551663cb5) +++ dialin/hd/treatment.py (.../treatment.py) (revision c45a42475147641810dd252aefcd2c7872f13c7f) @@ -80,6 +80,13 @@ SALINE_BOLUS_STATE_IN_PROGRESS = 2 # A saline bolus delivery is in progress SALINE_BOLUS_STATE_MAX_DELIVERED = 3 # Maximum saline bolus volume reached + # Dialyzer Re-Prime states + DIALYZER_REPRIME_STATE_DIALYSATE_PUMPS_OFF = 0 # Turn off dialysate pumps and wait for them to stop + DIALYZER_REPRIME_STATE_PURGE_PRIOR_1 = 1 # Purge air from an interrupted reprime + DIALYZER_REPRIME_STATE_PURGE_PRIOR_2 = 2 # Purge air from an interrupted reprime + DIALYZER_REPRIME_STATE_REPRIME = 3 # Remove air from dialyzer + DIALYZER_REPRIME_STATE_PURGE_LINES = 4 # Purge air from lines after repriming dialyzer + def __init__(self, can_interface, logger: Logger): """ HDTreatment constructor @@ -140,6 +147,7 @@ self.treatment_end_state = 0 self.treatment_stop_state = 0 self.dialysis_state = 0 + self.dialyzer_reprime_state = 0 # saline bolus status self.saline_bolus_max_vol = 0 self.saline_bolus_cum_vol = 0.0 @@ -327,6 +335,14 @@ """ return self.dialysis_state + def get_dialyzer_reprime_state(self) -> int: + """ + Gets the current treatment dialyzer re-prime state + + @return: The current treatment dialyzer re-prime state ID + """ + return self.dialyzer_reprime_state + def get_saline_bolus_max_volume(self) -> int: """ Returns maximum volume (in mL) saline that can be delivered to a patient @@ -509,7 +525,8 @@ "blood_prime_state", "treatment_end_state", "treatment_stop_state", - "dialysis_state" + "dialysis_state", + "dialyzer_reprime_state" ]) def _handler_treatment_state_sync(self, message, timestamp=0.0): """ @@ -540,6 +557,8 @@ message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9])) dia = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10])) + drp = struct.unpack('i', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11])) self.treatment_state = tst[0] self.treatment_uf_state = ufs[0] @@ -551,6 +570,7 @@ self.treatment_end_state = txe[0] self.treatment_stop_state = txs[0] self.dialysis_state = dia[0] + self.dialyzer_reprime_state = drp[0] self.hd_treatment_state_timestamp = timestamp @publish([ Index: dialin/ui/dg_simulator.py =================================================================== diff -u -r9dee83286969ac19c09f6879394494e551663cb5 -rc45a42475147641810dd252aefcd2c7872f13c7f --- dialin/ui/dg_simulator.py (.../dg_simulator.py) (revision 9dee83286969ac19c09f6879394494e551663cb5) +++ dialin/ui/dg_simulator.py (.../dg_simulator.py) (revision c45a42475147641810dd252aefcd2c7872f13c7f) @@ -7,8 +7,8 @@ # # @file dg_simulator.py # -# @author (last) Micahel Garthwaite -# @date (last) 08-Mar-2023 +# @author (last) Dara Navaei +# @date (last) 16-Mar-2023 # @author (original) Peter Lucia # @date (original) 16-Mar-2021 # Index: tests/dg_tests.py =================================================================== diff -u -r0a1976149ea9be0e1593e76d4bd242dfa1a69f7f -rc45a42475147641810dd252aefcd2c7872f13c7f --- tests/dg_tests.py (.../dg_tests.py) (revision 0a1976149ea9be0e1593e76d4bd242dfa1a69f7f) +++ tests/dg_tests.py (.../dg_tests.py) (revision c45a42475147641810dd252aefcd2c7872f13c7f) @@ -8,7 +8,7 @@ # @file dg_tests.py # # @author (last) Dara Navaei -# @date (last) 03-Feb-2023 +# @date (last) 16-Mar-2023 # @author (original) Dara Navaei # @date (original) 16-Jan-2022 # Index: tests/hd_nvm_scripts.py =================================================================== diff -u -r0a1976149ea9be0e1593e76d4bd242dfa1a69f7f -rc45a42475147641810dd252aefcd2c7872f13c7f --- tests/hd_nvm_scripts.py (.../hd_nvm_scripts.py) (revision 0a1976149ea9be0e1593e76d4bd242dfa1a69f7f) +++ tests/hd_nvm_scripts.py (.../hd_nvm_scripts.py) (revision c45a42475147641810dd252aefcd2c7872f13c7f) @@ -8,7 +8,7 @@ # @file hd_nvm_scripts.py # # @author (last) Dara Navaei -# @date (last) 21-Dec-2022 +# @date (last) 16-Mar-2023 # @author (original) Dara Navaei # @date (original) 10-Feb-2022 #