Index: dialin/hd/treatment.py =================================================================== diff -u -r39161a1bac7146d23417909b66c313c9a020969f -re088c9d243995b1a184252bd9638cdb574fce0d8 --- dialin/hd/treatment.py (.../treatment.py) (revision 39161a1bac7146d23417909b66c313c9a020969f) +++ dialin/hd/treatment.py (.../treatment.py) (revision e088c9d243995b1a184252bd9638cdb574fce0d8) @@ -119,6 +119,7 @@ self.blood_prime_state = 0 self.treatment_end_state = 0 self.treatment_stop_state = 0 + self.dialysis_state = 0 # saline bolus status self.saline_bolus_max_vol = 0 self.saline_bolus_cum_vol = 0.0 @@ -233,6 +234,14 @@ """ return self.treatment_stop_state + def get_dialysis_state(self): + """ + Gets the current treatment dialysis state + + @return: The current treatment dialysis state ID + """ + return self.dialysis_state + def get_saline_bolus_max_volume(self): """ Returns maximum volume (in mL) saline that can be delivered to a patient @@ -315,7 +324,8 @@ "treatment_recirculate_state", "blood_prime_state", "treatment_end_state", - "treatment_stop_state" + "treatment_stop_state", + "dialysis_state" ]) def _handler_treatment_state_sync(self, message): """ @@ -344,6 +354,8 @@ message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8])) txs = struct.unpack('i', bytearray( 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])) self.treatment_state = tst[0] self.treatment_uf_state = ufs[0] @@ -354,6 +366,7 @@ self.blood_prime_state = bpr[0] self.treatment_end_state = txe[0] self.treatment_stop_state = txs[0] + self.dialysis_state = dia[0] @_publish([ "saline_bolus_max_vol",