Index: dialin/dg/dialysate_generator.py =================================================================== diff -u -r1b2e845397cd3f595eaaf743567f09742c737a6d -r1ab15a50a984c98b85eb63b7dd843fda51f4a412 --- dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 1b2e845397cd3f595eaaf743567f09742c737a6d) +++ dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 1ab15a50a984c98b85eb63b7dd843fda51f4a412) @@ -236,11 +236,12 @@ self.dg_operation_mode = mode[0] self.dg_operation_sub_mode = smode[0] - def cmd_log_in_to_dg(self): + def cmd_log_in_to_dg(self, resend: bool = False): """ Constructs and sends a login command via CAN bus. Login required before \n other commands can be sent to the DG. + @param resend: (bool) if False (default), try to login once. Otherwise, tries to login indefinitely @return: 1 if logged in, 0 if log in failed """ @@ -251,7 +252,7 @@ self.logger.info("Logging in to the DG...") # Send message - received_message = self.can_interface.send(message) + received_message = self.can_interface.send(message, resend=resend) if received_message is not None: if received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] == 1: Index: dialin/hd/alarms.py =================================================================== diff -u -r18c04cbcd10619250868cec39470a2b29c86121b -r1ab15a50a984c98b85eb63b7dd843fda51f4a412 --- dialin/hd/alarms.py (.../alarms.py) (revision 18c04cbcd10619250868cec39470a2b29c86121b) +++ dialin/hd/alarms.py (.../alarms.py) (revision 1ab15a50a984c98b85eb63b7dd843fda51f4a412) @@ -185,14 +185,6 @@ """ return self.alarms_flags - def get_alarm_ids(self): - """ - Returns a dictionary of the alarm short name and the corresponding id - - @return: OrderedDict of the alarm ids - """ - return self.ids - @_publish(["alarms_state", "alarm_top", "alarms_silence_expires_in", "alarms_escalates_in", "alarms_flags"]) def _handler_alarms_status_sync(self, message): """