Index: dialin/dg/dialysate_fill.py =================================================================== diff -u -r821d2c94ccc6542a7733a9453e59b751bfd0ef75 -r027f3117a013daf7e8db48efdf05dfdd3f20079e --- dialin/dg/dialysate_fill.py (.../dialysate_fill.py) (revision 821d2c94ccc6542a7733a9453e59b751bfd0ef75) +++ dialin/dg/dialysate_fill.py (.../dialysate_fill.py) (revision 027f3117a013daf7e8db48efdf05dfdd3f20079e) @@ -63,7 +63,6 @@ self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_fill_mode_monitor_sync) - def get_fill_mode_data(self): """ Gets the current concentrate pump data value @@ -103,16 +102,16 @@ message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0] self.dg_fill_mode_timestamp = timestamp - def cmd_used_acid_volume_override(self, volume: float) -> int: + def cmd_used_acid_volume_override(self, volume: float, reset: int = NO_RESET) -> int: """ Constructs and sends the used acid volume override command @param volume: float - desired used acid volume to override + @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise """ - - reset_byte_array = integer_to_bytearray(NO_RESET) + reset_byte_array = integer_to_bytearray(reset) volume_byte_array = float_to_bytearray(volume) payload = reset_byte_array + volume_byte_array @@ -134,16 +133,16 @@ self.logger.error("Timeout!!!!") return False - def cmd_used_bicarb_volume_override(self, volume: float) -> int: + def cmd_used_bicarb_volume_override(self, volume: float, reset: int = NO_RESET) -> int: """ Constructs and sends the used bicarb volume override command @param volume: float - desired used acid volume to override + @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise """ - - reset_byte_array = integer_to_bytearray(NO_RESET) + reset_byte_array = integer_to_bytearray(reset) volume_byte_array = float_to_bytearray(volume) payload = reset_byte_array + volume_byte_array