Index: dialin/dg/dialysate_generator.py =================================================================== diff -u -ra2d44432a913537ca0627cd7dde7dcb1154f2156 -r98f33dd32881796730218a2b07595015da946466 --- dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision a2d44432a913537ca0627cd7dde7dcb1154f2156) +++ dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 98f33dd32881796730218a2b07595015da946466) @@ -136,6 +136,7 @@ self.dg_operation_mode = self.DG_OP_MODE_INIT_POST self.dg_operation_sub_mode = 0 self.dg_logged_in = False + self.dg_set_logged_in_status(False) # Create command groups self.accel = DGAccelerometer(self.can_interface, self.logger) @@ -206,6 +207,15 @@ """ return self.dg_logged_in + @_publish(["dg_logged_in"]) + def dg_set_logged_in_status(self, logged_in:bool=False): + """ + Callback for DG logged in status change. + @param logged_in boolean logged in status for DG + @return: none + """ + self.dg_logged_in = logged_in + @_publish(["dg_version", "fpga_version"]) def _handler_dg_version(self, message): """ @@ -280,7 +290,7 @@ if received_message is not None: if received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] == 1: self.logger.info("Successfully logged in to the DG.") - self.dg_logged_in = True + self.dg_set_logged_in_status(True) else: self.logger.error("Log In Failed.") return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] @@ -348,4 +358,5 @@ # Send message self.can_interface.send(message, 0) self.logger.debug("Sent request to DG to reset...") - self.dg_logged_in = False + self.dg_set_logged_in_status(False) + return True Index: dialin/hd/hemodialysis_device.py =================================================================== diff -u -ra2d44432a913537ca0627cd7dde7dcb1154f2156 -r98f33dd32881796730218a2b07595015da946466 --- dialin/hd/hemodialysis_device.py (.../hemodialysis_device.py) (revision a2d44432a913537ca0627cd7dde7dcb1154f2156) +++ dialin/hd/hemodialysis_device.py (.../hemodialysis_device.py) (revision 98f33dd32881796730218a2b07595015da946466) @@ -89,6 +89,7 @@ self.hd_operation_mode = HDOpModes.MODE_INIT.value self.hd_operation_sub_mode = 0 self.hd_logged_in = False + self.hd_set_logged_in_status(False) # Create command groups self.accel = HDAccelerometer(self.can_interface, self.logger) @@ -128,6 +129,15 @@ """ return self.hd_logged_in + @_publish(["hd_logged_in"]) + def hd_set_logged_in_status(self, logged_in:bool=False): + """ + Callback for HD logged in status change. + @param logged_in boolean logged in status for HD + @return: none + """ + self.hd_logged_in = logged_in + @_publish(["hd_operation_mode"]) def _handler_hd_op_mode_sync(self, message): """ @@ -166,7 +176,7 @@ if received_message is not None: if received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] == 1: self.logger.debug("Success: Logged In") - self.hd_logged_in = True + self.hd_set_logged_in_status(True) else: self.logger.debug("Failure: Log In Failed.") return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] @@ -307,4 +317,5 @@ # Send message self.can_interface.send(message, 0) self.logger.debug("Sent request to HD to reset...") - self.hd_logged_in = False + self.hd_set_logged_in_status(False) + return True