Index: dialin/hd/alarms.py =================================================================== diff -u -r5f99b746f44410e1f973a50392f3ad31ccc24d96 -r91f56d736fe041733eab3692a350ee72272c90b9 --- dialin/hd/alarms.py (.../alarms.py) (revision 5f99b746f44410e1f973a50392f3ad31ccc24d96) +++ dialin/hd/alarms.py (.../alarms.py) (revision 91f56d736fe041733eab3692a350ee72272c90b9) @@ -181,8 +181,8 @@ Alarms Silenced = result & 512 Alarm Lamp On = result & 1024 TBD = result & 2048 - TBD = result & 4096 - TBD = result & 8192 + Blood Recirc = result & 4096 + Dialysate Recirc = result & 8192 No Minimize = result & 16384 Condition Detected = result & 32768 @@ -294,6 +294,22 @@ """ return (self.alarms_flags & 1024) > 0 + def get_alarm_flag_no_blood_recirculation(self) -> bool: + """ + Gets the alarm flag no blood recirculation. + + @return: (bool) Alarm lamp on (T/F) + """ + return (self.alarms_flags & 4096) > 0 + + def get_alarm_flag_no_dialysate_recirculation(self) -> bool: + """ + Gets the alarm flag no dialysate recirculation. + + @return: (bool) Alarm lamp on (T/F) + """ + return (self.alarms_flags & 8192) > 0 + def get_alarm_flag_no_minimize(self) -> bool: """ Gets the alarm flag no minimize. Index: dialin/hd/pretreatment.py =================================================================== diff -u -r5f99b746f44410e1f973a50392f3ad31ccc24d96 -r91f56d736fe041733eab3692a350ee72272c90b9 --- dialin/hd/pretreatment.py (.../pretreatment.py) (revision 5f99b746f44410e1f973a50392f3ad31ccc24d96) +++ dialin/hd/pretreatment.py (.../pretreatment.py) (revision 91f56d736fe041733eab3692a350ee72272c90b9) @@ -269,14 +269,6 @@ self.pre_treatment_reservoir_state = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11]))[0] - self.pre_treatment_submode = pt_submode - self.pre_treatment_sample_water_state = pt_sw_state - self.pre_treatment_consumable_self_test_state = pt_consumable_st_state - self.pre_treatment_no_cart_self_test_state = pt_no_cart_st_state - self.pre_treatment_dry_self_test_state = pt_dry_st_state - self.pre_treatment_prime_state = pt_prime_state - self.pre_treatment_recirc_state = pt_recirc_state - @publish([ "no_cart_self_test_timeout", "no_cart_self_test_time_countdown"