Index: leahi_dialin/dd/dialysate_delivery.py =================================================================== diff -u -rf762fd31ac5b03734f000f9fcd671851581def8a -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df --- leahi_dialin/dd/dialysate_delivery.py (.../dialysate_delivery.py) (revision f762fd31ac5b03734f000f9fcd671851581def8a) +++ leahi_dialin/dd/dialysate_delivery.py (.../dialysate_delivery.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) @@ -74,7 +74,6 @@ @param can_interface: (str) CANBus interface name, e.g. "can0" @param log_level: (str) Logging level, defaults to None """ - super().__init__() self._log_manager = LogManager(log_level=log_level, log_filepath=self.__class__.__name__ + ".log") self.logger = self._log_manager.logger @@ -143,7 +142,6 @@ @publish(["msg_id_dd_debug_event", "dd_debug_events_timestamp","dd_debug_events"]) def _handler_dd_debug_event_sync(self, message, timestamp = 0.0): - payload = message['message'] message_length = payload[self._DD_DEBUG_EVENT_MSG_LEN_INDEX] temp_message = '' @@ -243,7 +241,6 @@ # @param reset: integer - 1 to reset a previous override, 0 to override # @return: 1 if successful, zero otherwise # """ - # return cmd_generic_broadcast_interval_override( # ms = ms, # reset = reset, @@ -262,7 +259,6 @@ @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 """ - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, message_id=MsgIds.MSG_ID_DD_TESTER_LOGIN_REQUEST.value, payload=list(map(int, map(ord, self.DD_LOGIN_PASSWORD)))) @@ -297,9 +293,7 @@ @param new_mode: ID of operation mode to transition to @return: 1 if successful, zero otherwise - """ - payload = integer_to_bytearray(new_mode) return cmd_generic_override( @@ -321,7 +315,6 @@ @return: None """ - return cmd_generic_override( payload = None, reset = NO_RESET, @@ -342,9 +335,7 @@ @param active: int - True to activate safety shutdown, False to deactivate @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise - """ - rst = integer_to_bytearray(reset) saf = integer_to_bytearray(active) payload = rst + saf