Index: dialin/common/alarm_defs.py =================================================================== diff -u -r443eec4467e7927d1cb9a7a72ef087fb59c1ea85 -rb325782a4c7ab9446c8c78259a5b8c8fe5bf7ef5 --- dialin/common/alarm_defs.py (.../alarm_defs.py) (revision 443eec4467e7927d1cb9a7a72ef087fb59c1ea85) +++ dialin/common/alarm_defs.py (.../alarm_defs.py) (revision b325782a4c7ab9446c8c78259a5b8c8fe5bf7ef5) @@ -301,8 +301,8 @@ ALARM_ID_HD_ACTIVE_RESERVOIR_WEIGHT_OUT_OF_RANGE = 278 ALARM_ID_DG_DIALYSATE_DRAIN_TIME_OUT = 279 ALARM_ID_DG_DRAIN_PUMP_DIRECTION_INVALID = 280 - ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME = 281 - ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME = 282 + ALARM_ID_AVAILABLE_40 = 281 + ALARM_ID_AVAILABLE_41 = 282 ALARM_ID_DG_LOAD_CELL_WEIGHT_OUT_OF_RANGE = 283 ALARM_ID_DG_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE = 284 ALARM_ID_HD_RO_PERMEATE_SAMPLE = 285 Index: dialin/common/msg_ids.py =================================================================== diff -u -r4c650c07d392c1033aaf8bea0f77647f40ff447e -rb325782a4c7ab9446c8c78259a5b8c8fe5bf7ef5 --- dialin/common/msg_ids.py (.../msg_ids.py) (revision 4c650c07d392c1033aaf8bea0f77647f40ff447e) +++ dialin/common/msg_ids.py (.../msg_ids.py) (revision b325782a4c7ab9446c8c78259a5b8c8fe5bf7ef5) @@ -476,9 +476,9 @@ MSG_ID_DG_SET_SW_CONFIG_RECORD = 0xA04B MSG_ID_DG_SEND_SW_CONFIG_RECORD = 0xA04C MSG_ID_DG_FANS_DUTY_CYCLE_OVERRIDE = 0xA04D - MSG_ID_DG_USED_ACID_VOLUME_ML_OVERRIDE = 0xA04E + MSG_ID_MSG_AVAILABLE_42 = 0xA04E MSG_ID_DG_SET_FANS_RPM_ALARM_START_TIME_OFFSET = 0xA04F - MSG_ID_DG_USED_BICARB_VOLUME_ML_OVERRIDE = 0xA050 + MSG_ID_MSG_AVAILABLE_43 = 0xA050 MSG_ID_FILL_MODE_DATA_PUBLISH_INTERVAL_OVERRIDE = 0xA051 MSG_ID_DG_GEN_IDLE_PUBLISH_INTERVAL_OVERRIDE = 0xA052 MSG_ID_DG_GET_USAGE_INFO_RECORD = 0xA053 Index: dialin/dg/dialysate_fill.py =================================================================== diff -u -ra7253ef8e885d542d22539cd1e4c608f7ce63eb5 -rb325782a4c7ab9446c8c78259a5b8c8fe5bf7ef5 --- dialin/dg/dialysate_fill.py (.../dialysate_fill.py) (revision a7253ef8e885d542d22539cd1e4c608f7ce63eb5) +++ dialin/dg/dialysate_fill.py (.../dialysate_fill.py) (revision b325782a4c7ab9446c8c78259a5b8c8fe5bf7ef5) @@ -102,68 +102,6 @@ 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, 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(reset) - volume_byte_array = float_to_bytearray(volume) - - payload = reset_byte_array + volume_byte_array - - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_DG_USED_ACID_VOLUME_ML_OVERRIDE.value, - payload=payload) - - self.logger.debug("override the used acid volume") - - # Send message - received_message = self.can_interface.send(message) - - # If there is content... - if received_message is not None: - # response payload is OK or not OK - return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] - else: - self.logger.error("Timeout!!!!") - return False - - 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(reset) - volume_byte_array = float_to_bytearray(volume) - - payload = reset_byte_array + volume_byte_array - - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_DG_USED_BICARB_VOLUME_ML_OVERRIDE.value, - payload=payload) - - self.logger.debug("override the used bicarb volume") - - # Send message - received_message = self.can_interface.send(message) - - # If there is content... - if received_message is not None: - # response payload is OK or not OK - return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] - else: - self.logger.error("Timeout!!!!") - return False - def cmd_fill_mode_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends the fill mode data broadcast interval override command