Index: dialin/dg/chemical_disinfect.py =================================================================== diff -u -r7ea4b936cef531b2cde9053ae58b7119a3bf0e6c -r837d2551fdf0ffbbf96870de746a0d4864f17d84 --- dialin/dg/chemical_disinfect.py (.../chemical_disinfect.py) (revision 7ea4b936cef531b2cde9053ae58b7119a3bf0e6c) +++ dialin/dg/chemical_disinfect.py (.../chemical_disinfect.py) (revision 837d2551fdf0ffbbf96870de746a0d4864f17d84) @@ -64,6 +64,26 @@ self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_chemical_disinfect_to_ui_sync) + def clear_chem_disinfect_info(self) -> None: + """ + Clears public class properties that are updated by the handler. + Specifically properties updated by the DG broadcast message + MSG_ID_DG_CHEM_DISINFECT_DATA. + + @returns none + """ + + self.chemical_disinfect_state = 0 + self.overall_elapsed_time = 0 + self.state_elapsed_time = 0 + self.cancellation_mode = 0 + self.r1_level = 0 + self.r2_level = 0 + self.target_post_rinse_count = 0 + self.current_post_rinse_count = 0 + self.chemical_disinfect_ui_state = 0 + + @publish(["chemical_disinfect_elapsed_time", "chemical_disinfect_target_time"]) def _handler_chemical_disinfect_to_ui_sync(self, message): """ Index: dialin/dg/flush.py =================================================================== diff -u -r7316136f3e2aa7c299f6a3a4a48dab8cbaf0e555 -r837d2551fdf0ffbbf96870de746a0d4864f17d84 --- dialin/dg/flush.py (.../flush.py) (revision 7316136f3e2aa7c299f6a3a4a48dab8cbaf0e555) +++ dialin/dg/flush.py (.../flush.py) (revision 837d2551fdf0ffbbf96870de746a0d4864f17d84) @@ -44,14 +44,17 @@ msg_id = MsgIds.MSG_ID_DG_FLUSH_DATA.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_flush_sync) - def clear_flush_state(self) -> None: + def clear_flush_info(self) -> None: """ - Clears the flush state locally. + Clears public class properties that are updated by the handler. + Specifically properties updated by the DG broadcast message + MSG_ID_DG_FLUSH_DATA. - @param none - @returns none + @returns : none """ self.flush_state = DGFlushStates.DG_FLUSH_STATE_START.value + self.overall_elapsed_time = 0 + self.state_elapsed_time = 0 @publish(["flush_state", "overall_elapsed_time", "state_elapsed_time", "flush_drain_line_volume"]) def _handler_flush_sync(self, message: dict) -> None: Index: dialin/dg/heat_disinfect.py =================================================================== diff -u -r3a70bfb451b74106348c064c34f19934aadd9119 -r837d2551fdf0ffbbf96870de746a0d4864f17d84 --- dialin/dg/heat_disinfect.py (.../heat_disinfect.py) (revision 3a70bfb451b74106348c064c34f19934aadd9119) +++ dialin/dg/heat_disinfect.py (.../heat_disinfect.py) (revision 837d2551fdf0ffbbf96870de746a0d4864f17d84) @@ -89,6 +89,24 @@ self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_heat_disinfect_to_ui_sync) + def clear_heat_disinfect_info(self) -> None: + """ + Clears public class properties that are updated by the handler. + Specifically properties updated by the DG broadcast message + MSG_ID_DG_HEAT_DISINFECT_DATA. + + @returns none + """ + + self.heat_disinfect_state = 0 + self.overall_elapsed_time = 0 + self.state_elapsed_time = 0 + self.cancellation_mode = 0 + self.r1_level = 0 + self.r2_level = 0 + self.heat_disinfect_ui_state = 0 + + @publish(["heat_disinfect_target_time", "heat_disinfect_count_down_time"]) def _handler_heat_disinfect_to_ui_sync(self, message): """ Index: dialin/hd/alarms.py =================================================================== diff -u -r91f56d736fe041733eab3692a350ee72272c90b9 -r837d2551fdf0ffbbf96870de746a0d4864f17d84 --- dialin/hd/alarms.py (.../alarms.py) (revision 91f56d736fe041733eab3692a350ee72272c90b9) +++ dialin/hd/alarms.py (.../alarms.py) (revision 837d2551fdf0ffbbf96870de746a0d4864f17d84) @@ -163,28 +163,28 @@ """ return self.alarms_escalates_in - def get_alarms_flags(self): # TODO - update flags to latest + def get_alarms_flags(self): """ Gets the alarms flags Extract each flag from the flags int using bit-masking. E.g. - System Fault = result & 1 - Stop = result & 2 - No Clear = result & 4 - No Resume = result & 8 - No Rinseback = result & 16 - No End Treatment = result & 32 - No New Treatment = result & 64 - User Must ACK = result & 128 - Alarms to Escalate = result & 256 - Alarms Silenced = result & 512 - Alarm Lamp On = result & 1024 - TBD = result & 2048 - Blood Recirc = result & 4096 - Dialysate Recirc = result & 8192 - No Minimize = result & 16384 - Condition Detected = result & 32768 + System Fault = result & 1 + Stop = result & 2 + No Clear = result & 4 + No Resume = result & 8 + No Rinseback = result & 16 + No End Treatment = result & 32 + No New Treatment = result & 64 + User Must ACK = result & 128 + Alarms to Escalate = result & 256 + Alarms Silenced = result & 512 + Alarm Lamp On = result & 1024 + TBD = result & 2048 + No Blood Recirc = result & 4096 + No Dialysate Recirc = result & 8192 + No Minimize = result & 16384 + Condition Detected = result & 32768 @return: (int) The alarms flags value """